Browse Source

界面更新

flower_bs 1 week ago
parent
commit
f1a11cb570
100 changed files with 81 additions and 47 deletions
  1. 1 1
      container/models.py
  2. 1 1
      container/urls.py
  3. 15 0
      container/views.py
  4. 17 0
      reportcenter/migrations/0006_alter_bigscreenmodel_options.py
  5. 1 1
      reportcenter/models.py
  6. 0 1
      templates/dist/spa/css/25.4b9e275f.css
  7. 1 0
      templates/dist/spa/css/25.98f0278c.css
  8. 1 0
      templates/dist/spa/css/26.1bb0db04.css
  9. 0 1
      templates/dist/spa/css/26.e3a9ceb7.css
  10. 0 1
      templates/dist/spa/css/32.97f5bf6a.css
  11. 1 0
      templates/dist/spa/css/32.cdb5039a.css
  12. 1 0
      templates/dist/spa/css/33.4cad196b.css
  13. 0 0
      templates/dist/spa/css/34.9478c981.css
  14. 0 0
      templates/dist/spa/css/35.c4652654.css
  15. 0 0
      templates/dist/spa/css/36.7a23b7fb.css
  16. 0 0
      templates/dist/spa/css/37.0faa4aeb.css
  17. 1 1
      templates/dist/spa/index.html
  18. 0 1
      templates/dist/spa/js/25.3f04ad0f.js
  19. BIN
      templates/dist/spa/js/25.3f04ad0f.js.gz
  20. 1 0
      templates/dist/spa/js/25.7f53c5f7.js
  21. BIN
      templates/dist/spa/js/25.7f53c5f7.js.gz
  22. 0 1
      templates/dist/spa/js/26.463d394c.js
  23. BIN
      templates/dist/spa/js/26.463d394c.js.gz
  24. 1 0
      templates/dist/spa/js/26.9c5994ba.js
  25. BIN
      templates/dist/spa/js/26.9c5994ba.js.gz
  26. 1 0
      templates/dist/spa/js/31.7870b735.js
  27. BIN
      templates/dist/spa/js/31.7870b735.js.gz
  28. 0 1
      templates/dist/spa/js/31.c01e2730.js
  29. BIN
      templates/dist/spa/js/31.c01e2730.js.gz
  30. 0 1
      templates/dist/spa/js/32.6d7d38d9.js
  31. BIN
      templates/dist/spa/js/32.6d7d38d9.js.gz
  32. 1 0
      templates/dist/spa/js/32.c084dcec.js
  33. BIN
      templates/dist/spa/js/32.c084dcec.js.gz
  34. 1 0
      templates/dist/spa/js/33.95204aa3.js
  35. BIN
      templates/dist/spa/js/33.95204aa3.js.gz
  36. 1 1
      templates/dist/spa/js/33.582bafbf.js
  37. 1 1
      templates/dist/spa/js/34.52e22bdd.js
  38. 1 1
      templates/dist/spa/js/35.fbd1389a.js
  39. 1 1
      templates/dist/spa/js/36.d269610c.js
  40. 1 1
      templates/dist/spa/js/37.0c0b2657.js
  41. BIN
      templates/dist/spa/js/37.0c0b2657.js.gz
  42. 1 1
      templates/dist/spa/js/38.b84759ff.js
  43. BIN
      templates/dist/spa/js/40.22bca0c6.js.gz
  44. 1 1
      templates/dist/spa/js/39.c6477800.js
  45. 1 1
      templates/dist/spa/js/40.22bca0c6.js
  46. BIN
      templates/dist/spa/js/41.1e952a05.js.gz
  47. BIN
      templates/dist/spa/js/42.03f5406c.js.gz
  48. 1 1
      templates/dist/spa/js/41.29ea686a.js
  49. BIN
      templates/dist/spa/js/43.1ec1fedb.js.gz
  50. 1 1
      templates/dist/spa/js/42.03f5406c.js
  51. BIN
      templates/dist/spa/js/43.d3fddc8e.js.gz
  52. BIN
      templates/dist/spa/js/44.5e09deab.js.gz
  53. 1 1
      templates/dist/spa/js/43.1ec1fedb.js
  54. BIN
      templates/dist/spa/js/44.7f6d36cb.js.gz
  55. 1 1
      templates/dist/spa/js/44.5e09deab.js
  56. BIN
      templates/dist/spa/js/45.b3a8ad9b.js.gz
  57. BIN
      templates/dist/spa/js/46.408414be.js.gz
  58. 1 1
      templates/dist/spa/js/45.59155605.js
  59. BIN
      templates/dist/spa/js/45.59155605.js.gz
  60. BIN
      templates/dist/spa/js/47.0931567b.js.gz
  61. 1 1
      templates/dist/spa/js/46.408414be.js
  62. BIN
      templates/dist/spa/js/47.89908208.js.gz
  63. 1 1
      templates/dist/spa/js/47.0931567b.js
  64. BIN
      templates/dist/spa/js/48.9be46088.js.gz
  65. BIN
      templates/dist/spa/js/48.fe528de4.js.gz
  66. 1 1
      templates/dist/spa/js/48.fe528de4.js
  67. BIN
      templates/dist/spa/js/49.30dac62f.js.gz
  68. BIN
      templates/dist/spa/js/49.7e0f1b37.js.gz
  69. 1 1
      templates/dist/spa/js/49.7e0f1b37.js
  70. BIN
      templates/dist/spa/js/50.2ffd5e54.js.gz
  71. BIN
      templates/dist/spa/js/50.e3e1c4f7.js.gz
  72. BIN
      templates/dist/spa/js/51.05e57eac.js.gz
  73. 1 1
      templates/dist/spa/js/50.e3e1c4f7.js
  74. BIN
      templates/dist/spa/js/51.b7a98797.js.gz
  75. BIN
      templates/dist/spa/js/52.6306581f.js.gz
  76. 1 1
      templates/dist/spa/js/51.05e57eac.js
  77. BIN
      templates/dist/spa/js/52.f6d23b7b.js.gz
  78. 1 1
      templates/dist/spa/js/52.6306581f.js
  79. BIN
      templates/dist/spa/js/53.58546587.js.gz
  80. BIN
      templates/dist/spa/js/53.b0e4038c.js.gz
  81. 1 1
      templates/dist/spa/js/53.b0e4038c.js
  82. BIN
      templates/dist/spa/js/54.2ec8c91b.js.gz
  83. 1 1
      templates/dist/spa/js/54.b941570b.js
  84. 1 1
      templates/dist/spa/js/55.86478f47.js
  85. 1 1
      templates/dist/spa/js/56.8b8bb38e.js
  86. 1 1
      templates/dist/spa/js/57.b9ee0631.js
  87. 1 1
      templates/dist/spa/js/58.2f5f6576.js
  88. 1 1
      templates/dist/spa/js/59.8ba6d077.js
  89. 1 1
      templates/dist/spa/js/60.2be88230.js
  90. BIN
      templates/dist/spa/js/62.b4375113.js.gz
  91. 1 1
      templates/dist/spa/js/61.17037996.js
  92. 1 1
      templates/dist/spa/js/62.b4375113.js
  93. BIN
      templates/dist/spa/js/63.d20f3e27.js.gz
  94. 1 1
      templates/dist/spa/js/63.9c96d6e6.js
  95. 1 1
      templates/dist/spa/js/64.0f01244b.js
  96. 1 1
      templates/dist/spa/js/65.ee452dd2.js
  97. 1 1
      templates/dist/spa/js/66.2ca3a8cc.js
  98. 1 1
      templates/dist/spa/js/67.d16c085c.js
  99. 1 1
      templates/dist/spa/js/68.a96a1112.js
  100. 0 0
      templates/dist/spa/js/69.9660d108.js

+ 1 - 1
container/models.py

@@ -462,7 +462,7 @@ def create_material_history( instance, update):
 
 
 
 
 # 简化的信号处理器
 # 简化的信号处理器
-@receiver(post_save, sender=ContainerDetailLogModel)
+# @receiver(post_save, sender=ContainerDetailLogModel)
 def handle_container_detail_log(sender, instance, created, **kwargs):
 def handle_container_detail_log(sender, instance, created, **kwargs):
     """创建托盘日志后立即关联到批次日志"""
     """创建托盘日志后立即关联到批次日志"""
     if created:
     if created:

+ 1 - 1
container/urls.py

@@ -8,7 +8,7 @@ re_path(r'^list/(?P<pk>\d+)/$', views.ContainerListViewSet.as_view({
     'put': 'update',
     'put': 'update',
     'patch': 'partial_update',
     'patch': 'partial_update',
 }), name="ContainerList_1"),
 }), name="ContainerList_1"),
-
+path(r'check/', views.ContainerListViewSet.as_view({"get": "check_container_postion"}), name="ContainerList"),
 path(r'detail/', views.ContainerDetailViewSet.as_view( {"get": "list","post": "create"}), name="ContainerDetail"),
 path(r'detail/', views.ContainerDetailViewSet.as_view( {"get": "list","post": "create"}), name="ContainerDetail"),
 re_path(r'^detail/(?P<pk>\d+)/$', views.ContainerDetailViewSet.as_view({
 re_path(r'^detail/(?P<pk>\d+)/$', views.ContainerDetailViewSet.as_view({
     'get': 'retrieve',
     'get': 'retrieve',

+ 15 - 0
container/views.py

@@ -237,6 +237,21 @@ class ContainerListViewSet(viewsets.ModelViewSet):
         serializer.save()
         serializer.save()
         headers = self.get_success_headers(serializer.data)
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=200, headers=headers)
         return Response(serializer.data, status=200, headers=headers)
+    
+
+    def check_container_postion(self, request, *args, **kwargs):
+        # 获取查询集
+        container_list = ContainerListModel.objects.exclude(current_location=F('target_location'))
+        
+        # 手动应用分页
+        page = self.paginate_queryset(container_list)
+        if page is not None:
+            serializer = ContainerListGetSerializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+        
+        # 如果没有分页,返回完整结果(不推荐)
+        serializer = ContainerListGetSerializer(container_list, many=True)
+        return Response(serializer.data, status=200)
 
 
 # wcs任务视图
 # wcs任务视图
 class WCSTaskViewSet(viewsets.ModelViewSet):
 class WCSTaskViewSet(viewsets.ModelViewSet):

+ 17 - 0
reportcenter/migrations/0006_alter_bigscreenmodel_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.1.2 on 2025-09-11 21:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reportcenter', '0005_bigscreenmodel_bigscreenmodel_unique_day_in_out'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='bigscreenmodel',
+            options={'ordering': ['-id'], 'verbose_name': 'Big Screen', 'verbose_name_plural': 'Big Screen'},
+        ),
+    ]

+ 1 - 1
reportcenter/models.py

@@ -52,7 +52,7 @@ class bigScreenModel(models.Model):
         db_table = 'bigscreen'
         db_table = 'bigscreen'
         verbose_name = 'Big Screen'
         verbose_name = 'Big Screen'
         verbose_name_plural = "Big Screen"
         verbose_name_plural = "Big Screen"
-        ordering = ['id']
+        ordering = ['-id']
         constraints = [
         constraints = [
         models.UniqueConstraint(
         models.UniqueConstraint(
                 fields=[
                 fields=[

+ 0 - 1
templates/dist/spa/css/25.4b9e275f.css

@@ -1 +0,0 @@
-.q-date__calendar-item--selected[data-v-14be086a]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-14be086a]{background-color:rgba(25,118,210,0.1)}[data-v-14be086a] .q-field__label{margin-top:8px;align-self:center}[data-v-14be086a] .q-field__control-container{padding-left:50px;margin-top:-5px}

+ 1 - 0
templates/dist/spa/css/25.98f0278c.css

@@ -0,0 +1 @@
+.q-date__calendar-item--selected[data-v-fbdc73a4]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-fbdc73a4]{background-color:rgba(25,118,210,0.1)}[data-v-fbdc73a4] .q-field__label{margin-top:8px;align-self:center}[data-v-fbdc73a4] .q-field__control-container{padding-left:50px;margin-top:-5px}

+ 1 - 0
templates/dist/spa/css/26.1bb0db04.css

@@ -0,0 +1 @@
+.q-date__calendar-item--selected[data-v-307ba426]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-307ba426]{background-color:rgba(25,118,210,0.1)}[data-v-307ba426] .q-field__label{margin-top:8px;align-self:center}[data-v-307ba426] .q-field__control-container{padding-left:50px;margin-top:-5px}

+ 0 - 1
templates/dist/spa/css/26.e3a9ceb7.css

@@ -1 +0,0 @@
-.q-date__calendar-item--selected[data-v-7fd21ee6]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-7fd21ee6]{background-color:rgba(25,118,210,0.1)}[data-v-7fd21ee6] .q-field__label{margin-top:8px;align-self:center}[data-v-7fd21ee6] .q-field__control-container{padding-left:50px;margin-top:-5px}

+ 0 - 1
templates/dist/spa/css/32.97f5bf6a.css

@@ -1 +0,0 @@
-.q-date__calendar-item--selected[data-v-c4bb9d72]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-c4bb9d72]{background-color:rgba(25,118,210,0.1)}

+ 1 - 0
templates/dist/spa/css/32.cdb5039a.css

@@ -0,0 +1 @@
+.q-date__calendar-item--selected[data-v-0e5da179]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-0e5da179]{background-color:rgba(25,118,210,0.1)}

+ 1 - 0
templates/dist/spa/css/33.4cad196b.css

@@ -0,0 +1 @@
+.q-date__calendar-item--selected[data-v-9cd534ee]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-9cd534ee]{background-color:rgba(25,118,210,0.1)}

templates/dist/spa/css/33.9478c981.css → templates/dist/spa/css/34.9478c981.css


templates/dist/spa/css/34.c4652654.css → templates/dist/spa/css/35.c4652654.css


templates/dist/spa/css/35.7a23b7fb.css → templates/dist/spa/css/36.7a23b7fb.css


templates/dist/spa/css/36.0faa4aeb.css → templates/dist/spa/css/37.0faa4aeb.css


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/index.html


File diff suppressed because it is too large
+ 0 - 1
templates/dist/spa/js/25.3f04ad0f.js


BIN
templates/dist/spa/js/25.3f04ad0f.js.gz


File diff suppressed because it is too large
+ 1 - 0
templates/dist/spa/js/25.7f53c5f7.js


BIN
templates/dist/spa/js/25.7f53c5f7.js.gz


File diff suppressed because it is too large
+ 0 - 1
templates/dist/spa/js/26.463d394c.js


BIN
templates/dist/spa/js/26.463d394c.js.gz


File diff suppressed because it is too large
+ 1 - 0
templates/dist/spa/js/26.9c5994ba.js


BIN
templates/dist/spa/js/26.9c5994ba.js.gz


File diff suppressed because it is too large
+ 1 - 0
templates/dist/spa/js/31.7870b735.js


BIN
templates/dist/spa/js/31.7870b735.js.gz


File diff suppressed because it is too large
+ 0 - 1
templates/dist/spa/js/31.c01e2730.js


BIN
templates/dist/spa/js/31.c01e2730.js.gz


File diff suppressed because it is too large
+ 0 - 1
templates/dist/spa/js/32.6d7d38d9.js


BIN
templates/dist/spa/js/32.6d7d38d9.js.gz


File diff suppressed because it is too large
+ 1 - 0
templates/dist/spa/js/32.c084dcec.js


BIN
templates/dist/spa/js/32.c084dcec.js.gz


File diff suppressed because it is too large
+ 1 - 0
templates/dist/spa/js/33.95204aa3.js


BIN
templates/dist/spa/js/33.95204aa3.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/33.582bafbf.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/34.52e22bdd.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/35.fbd1389a.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/36.d269610c.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/37.0c0b2657.js


BIN
templates/dist/spa/js/37.0c0b2657.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/38.b84759ff.js


BIN
templates/dist/spa/js/40.22bca0c6.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/39.c6477800.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/40.22bca0c6.js


BIN
templates/dist/spa/js/41.1e952a05.js.gz


BIN
templates/dist/spa/js/42.03f5406c.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/41.29ea686a.js


BIN
templates/dist/spa/js/43.1ec1fedb.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/42.03f5406c.js


BIN
templates/dist/spa/js/43.d3fddc8e.js.gz


BIN
templates/dist/spa/js/44.5e09deab.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/43.1ec1fedb.js


BIN
templates/dist/spa/js/44.7f6d36cb.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/44.5e09deab.js


BIN
templates/dist/spa/js/45.b3a8ad9b.js.gz


BIN
templates/dist/spa/js/46.408414be.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/45.59155605.js


BIN
templates/dist/spa/js/45.59155605.js.gz


BIN
templates/dist/spa/js/47.0931567b.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/46.408414be.js


BIN
templates/dist/spa/js/47.89908208.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/47.0931567b.js


BIN
templates/dist/spa/js/48.9be46088.js.gz


BIN
templates/dist/spa/js/48.fe528de4.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/48.fe528de4.js


BIN
templates/dist/spa/js/49.30dac62f.js.gz


BIN
templates/dist/spa/js/49.7e0f1b37.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/49.7e0f1b37.js


BIN
templates/dist/spa/js/50.2ffd5e54.js.gz


BIN
templates/dist/spa/js/50.e3e1c4f7.js.gz


BIN
templates/dist/spa/js/51.05e57eac.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/50.e3e1c4f7.js


BIN
templates/dist/spa/js/51.b7a98797.js.gz


BIN
templates/dist/spa/js/52.6306581f.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/51.05e57eac.js


BIN
templates/dist/spa/js/52.f6d23b7b.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/52.6306581f.js


BIN
templates/dist/spa/js/53.58546587.js.gz


BIN
templates/dist/spa/js/53.b0e4038c.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/53.b0e4038c.js


BIN
templates/dist/spa/js/54.2ec8c91b.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/54.b941570b.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/55.86478f47.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/56.8b8bb38e.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/57.b9ee0631.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/58.2f5f6576.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/59.8ba6d077.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/60.2be88230.js


BIN
templates/dist/spa/js/62.b4375113.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/61.17037996.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/62.b4375113.js


BIN
templates/dist/spa/js/63.d20f3e27.js.gz


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/63.9c96d6e6.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/64.0f01244b.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/65.ee452dd2.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/66.2ca3a8cc.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/67.d16c085c.js


File diff suppressed because it is too large
+ 1 - 1
templates/dist/spa/js/68.a96a1112.js


+ 0 - 0
templates/dist/spa/js/69.9660d108.js


Some files were not shown because too many files changed in this diff