更改错误

bin/views.py

@@ -167,21 +167,27 @@ class locationViewSet(viewsets.ModelViewSet):
                 container_ids.add(loc.active_links[0].container_id)
         
         # 批量查询容器详情及其批次状态
-        container_batch_status = defaultdict(set)
+        container_batch_status = defaultdict(dict)  # 改为字典存储，避免重复记录
         if container_ids:
             container_details = ContainerDetailModel.objects.filter(
-                container_id__in=container_ids,
-                is_delete=False
-            ).select_related('batch')
+                container_id__in=container_ids
+            ).select_related('batch').exclude(status=3)  # 排除已删除或不合格的托盘
             
             for detail in container_details:
                 if detail.batch_id:
-                    # 使用集合自动去重
-                    container_batch_status[detail.container_id].add(
-                        [detail.batch.check_status if detail.batch else "404",
-                        detail.batch.check_time if detail.batch else "no_check_time",
-                        detail.batch if detail.batch else "no_batch"]
+                    # 创建唯一标识的键
+                    status_key = (
+                        detail.batch.check_status if detail.batch else "404",
+                        detail.batch.bound_number if detail.batch else "no_batch"
                     )
+                    
+                    # 如果这个状态尚未添加过，或者需要更新
+                    if status_key not in container_batch_status[detail.container_id]:
+                        container_batch_status[detail.container_id][status_key] = (
+                            detail.batch.check_status if detail.batch else "404",
+                            detail.batch.check_time if detail.batch else "no_check_time",
+                            detail.batch.bound_number if detail.batch else "no_batch"
+                        )
         
         # 构造返回数据
         return_data = []
@@ -190,10 +196,11 @@ class locationViewSet(viewsets.ModelViewSet):
             
             if loc.active_links:
                 container_id = loc.active_links[0].container_id
-                # 将集合转换为列表
-                batch_statuses = list(container_batch_status.get(container_id, set()))
+                # 从字典中提取值并转换为列表
+                if container_id in container_batch_status:
+                    batch_statuses = list(container_batch_status[container_id].values())
             else:
-                batch_statuses = ["404"]  # 无关联容器标识
+                batch_statuses = [("404", "no_check_time", "no_batch")]
             
             # 使用Django模型自带的model_to_dict转换基础字段
             from django.forms.models import model_to_dict
@@ -204,13 +211,18 @@ class locationViewSet(viewsets.ModelViewSet):
                 "coordinate", "access_priority", "is_active"
             ])
             
-            # 添加批次状态字段
+            # 添加批次状态字段 - 存储所有信息
             location_data["batch_statuses"] = batch_statuses
             
             return_data.append(location_data)
+            data = {
+                "code": "200",
+                "msg": "Success Create",
+                "data": return_data
+            }
+        
+        return Response(data, status=200)
         
-        return Response(return_data, status=200)
-     
 
 class locationGroupViewSet(viewsets.ModelViewSet):
     """

bound/migrations/0023_alter_materialstatistics_total_quantity.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.2 on 2025-06-28 21:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bound', '0022_boundbatchmodel_check_status_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='materialstatistics',
+            name='total_quantity',
+            field=models.BigIntegerField(default=0, verbose_name='在库数量'),
+        ),
+    ]

bound/models.py

@@ -138,7 +138,7 @@ class MaterialStatistics(models.Model):
     goods_desc = models.CharField(max_length=255, verbose_name="商品描述")
     goods_std = models.CharField(default='待填写', max_length=255, verbose_name="商品标准", blank=True, null=True)
     goods_unit = models.CharField(default='待填写', max_length=255, verbose_name="商品单位")
-    total_quantity = models.BigIntegerField(default=0, verbose_name="计划数量")
+    total_quantity = models.BigIntegerField(default=0, verbose_name="在库数量")
     total_demanded_quantity = models.BigIntegerField(default=0, verbose_name="需求数量")
 
     def __str__(self):
@@ -178,6 +178,10 @@ def update_material_statistics(sender, instance, **kwargs):
     total = BoundBatchModel.objects.filter(goods_code=goods_code).aggregate(
         total=Sum('goods_in_location_qty')
     )['total'] or 0
+    # 更新物料统计的出库数目
+    total_out = BoundBatchModel.objects.filter(goods_code=goods_code).aggregate(
+        total_out=Sum('goods_out_qty')
+    )['total_out'] or 0
     stats.total_quantity = total
     stats.save()
 

logs/error.log

@@ -12760,3 +12760,82 @@ Traceback (most recent call last):
     raise TemplateDoesNotExist(", ".join(template_name_list), chain=chain)
 django.template.exceptions.TemplateDoesNotExist: dist/spa/index.html
 [2025-06-25 20:18:27,879][django.server.log_message():187] [ERROR] "GET / HTTP/1.1" 500 94463
+[2025-06-25 20:23:10,468][django.request.log_response():241] [ERROR] Internal Server Error: /bin/check/
+Traceback (most recent call last):
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\asgiref\sync.py", line 472, in thread_handler
+    raise exc_info[1]
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\django\core\handlers\exception.py", line 42, in inner
+    response = await get_response(request)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\django\core\handlers\base.py", line 253, in _get_response_async
+    response = await wrapped_callback(
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\asgiref\sync.py", line 435, in __call__
+    ret = await asyncio.wait_for(future, timeout=None)
+  File "D:\app\python3_8_10\lib\asyncio\tasks.py", line 455, in wait_for
+    return await fut
+  File "D:\app\python3_8_10\lib\concurrent\futures\thread.py", line 57, in run
+    result = self.fn(*self.args, **self.kwargs)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\asgiref\sync.py", line 476, in thread_handler
+    return func(*args, **kwargs)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\django\views\decorators\csrf.py", line 54, in wrapped_view
+    return view_func(*args, **kwargs)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\viewsets.py", line 125, in view
+    return self.dispatch(request, *args, **kwargs)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\views.py", line 509, in dispatch
+    response = self.handle_exception(exc)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\views.py", line 469, in handle_exception
+    self.raise_uncaught_exception(exc)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\views.py", line 480, in raise_uncaught_exception
+    raise exc
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\views.py", line 506, in dispatch
+    response = handler(request, *args, **kwargs)
+  File "D:\code\vue\greater_wms\.\bin\views.py", line 180, in batch_status_location
+    container_batch_status[detail.container_id].add(
+TypeError: unhashable type: 'list'
+[2025-06-25 20:40:11,102][django.request.log_response():241] [ERROR] Internal Server Error: /bin/check/
+Traceback (most recent call last):
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\django\core\handlers\exception.py", line 55, in inner
+    response = get_response(request)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\django\core\handlers\base.py", line 220, in _get_response
+    response = response.render()
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\django\template\response.py", line 114, in render
+    self.content = self.rendered_content
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\response.py", line 70, in rendered_content
+    ret = renderer.render(self.data, accepted_media_type, context)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\renderers.py", line 99, in render
+    ret = json.dumps(
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\utils\json.py", line 25, in dumps
+    return json.dumps(*args, **kwargs)
+  File "D:\app\python3_8_10\lib\json\__init__.py", line 234, in dumps
+    return cls(
+  File "D:\app\python3_8_10\lib\json\encoder.py", line 199, in encode
+    chunks = self.iterencode(o, _one_shot=True)
+  File "D:\app\python3_8_10\lib\json\encoder.py", line 257, in iterencode
+    return _iterencode(o, 0)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\utils\encoders.py", line 67, in default
+    return super().default(obj)
+  File "D:\app\python3_8_10\lib\json\encoder.py", line 179, in default
+    raise TypeError(f'Object of type {o.__class__.__name__} '
+TypeError: Object of type BoundBatchModel is not JSON serializable
+[2025-06-25 20:40:11,105][django.server.log_message():187] [ERROR] "POST /bin/check/ HTTP/1.1" 500 152413
+[2025-06-25 20:43:09,319][django.request.log_response():241] [ERROR] Internal Server Error: /bin/check/
+Traceback (most recent call last):
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\django\core\handlers\exception.py", line 55, in inner
+    response = get_response(request)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\django\core\handlers\base.py", line 197, in _get_response
+    response = wrapped_callback(request, *callback_args, **callback_kwargs)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\django\views\decorators\csrf.py", line 54, in wrapped_view
+    return view_func(*args, **kwargs)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\viewsets.py", line 125, in view
+    return self.dispatch(request, *args, **kwargs)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\views.py", line 509, in dispatch
+    response = self.handle_exception(exc)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\views.py", line 469, in handle_exception
+    self.raise_uncaught_exception(exc)
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\views.py", line 480, in raise_uncaught_exception
+    raise exc
+  File "d:\code\vue\greater_wms\.venv\lib\site-packages\rest_framework\views.py", line 506, in dispatch
+    response = handler(request, *args, **kwargs)
+  File "D:\code\vue\greater_wms\bin\views.py", line 183, in batch_status_location
+    detail.batch.batch_number if detail.batch else "no_batch",  # 改为存储批号而不是对象
+AttributeError: 'BoundBatchModel' object has no attribute 'batch_number'
+[2025-06-25 20:43:09,322][django.server.log_message():187] [ERROR] "POST /bin/check/ HTTP/1.1" 500 110604

templates/dist/spa/css/11.601677c3.css

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

templates/dist/spa/css/13.f721cf95.css

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

templates/dist/spa/css/14.e45ece1e.css

@@ -0,0 +1 @@
+.q-date__calendar-item--selected[data-v-2edd28fc]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-2edd28fc]{background-color:rgba(25,118,210,0.1)}.custom-title[data-v-2edd28fc]{font-size:0.9rem;font-weight:500}.custom-timeline[data-v-2edd28fc]{--q-timeline-color:#e0e0e0}.custom-node .q-timeline__dot[data-v-2edd28fc]{background:#485573!important;border:2px solid #5c6b8c!important}.custom-node .q-timeline__content[data-v-2edd28fc]{color:#485573}

templates/dist/spa/css/15.389bffe6.css

@@ -0,0 +1 @@
+.q-date__calendar-item--selected[data-v-50b3cab6]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-50b3cab6]{background-color:rgba(25,118,210,0.1)}.custom-title[data-v-50b3cab6]{font-size:0.9rem;font-weight:500}.custom-timeline[data-v-50b3cab6]{--q-timeline-color:#e0e0e0}.custom-node .q-timeline__dot[data-v-50b3cab6]{background:#485573!important;border:2px solid #5c6b8c!important}.custom-node .q-timeline__content[data-v-50b3cab6]{color:#485573}

templates/dist/spa/css/16.4b9e275f.css

@@ -0,0 +1 @@
+.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}

templates/dist/spa/css/17.2246dfbb.css

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

templates/dist/spa/css/18.01a9029f.css

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

templates/dist/spa/css/19.31ab8f86.css

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

templates/dist/spa/css/21.f4e6d623.css

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

templates/dist/spa/css/23.bdff6d34.css

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

templates/dist/spa/css/24.368d1e05.css

@@ -0,0 +1 @@
+.handle[data-v-248852c7]{cursor:move;padding:8px}

templates/dist/spa/css/27.0faa4aeb.css

@@ -0,0 +1 @@
+.rounded-tabs[data-v-75a33d82]{border-radius:12px 12px 0 0;background:linear-gradient(145deg,#f8f9fa,#e9ecef)}.rounded-card .q-expansion-item[data-v-75a33d82]{transition:all 0.3s ease}.rounded-card .q-expansion-item[data-v-75a33d82]:hover{background:#f8f9fa}.q-field--outlined[data-v-75a33d82] .q-field__control,.rounded-btn[data-v-75a33d82]{border-radius:2px}

templates/dist/spa/css/4.0ac6b60c.css

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

templates/dist/spa/css/5.7100e471.css

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

templates/dist/spa/css/6.eb31c91a.css

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

templates/dist/spa/css/7.f57b1220.css

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

templates/dist/spa/css/9.296f042c.css

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

templates/dist/spa/css/chunk-common.e1490f3e.css

@@ -0,0 +1 @@
+[data-v-0c2e412a] .q-field__label{margin-top:8px;align-self:center}[data-v-0c2e412a] .q-field__control-container{padding-left:50px;margin-top:-5px}