质检功能添加

bound/filter.py

@@ -170,6 +170,18 @@ class BoundBatchFilter(FilterSet):
 
               'date', 'date__gt', 'date__gte', 'date__lt', 'date__lte', 'date__range', 'date__in', 
               'time', 'time__gt', 'time__gte', 'time__lt', 'time__lte', 'time__range', 'time__in', 'isnull', 'in', 'range'],
+              'check_status' : ['exact', 'gt', 'gte', 'lt', 'lte', 'icontains','range'],
+              'check_user' : ['icontains', 'exact'],
+              'check_time' : ['exact', 'gt', 'gte', 'lt', 'lte',
+             'year', 'year__gt', 'year__gte', 'year__lt', 'year__lte', 'year__range', 'year__in', 
+             'month','month__gt','month__gte','month__lt','month__lte','month__range','month__in', 
+             'day', 'day__gt', 'day__gte', 'day__lt', 'day__lte', 'day__range', 'day__in',
+              'week_day', 'week_day__gt', 'week_day__gte', 'week_day__lt', 'week_day__lte', 'week_day__range', 'week_day__in', 
+              'hour', 'hour__gt', 'hour__gte', 'hour__lt', 'hour__lte', 'hour__range', 'hour__in',
+
+              'date', 'date__gt', 'date__gte', 'date__lt', 'date__lte', 'date__range', 'date__in', 
+              'time', 'time__gt', 'time__gte', 'time__lt', 'time__lte', 'time__range', 'time__in', 'isnull', 'in', 'range'],
+
 
         }
     

container/migrations/0025_alter_containerdetaillogmodel_log_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.2 on 2025-07-17 10:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('container', '0024_alter_containerdetaillogmodel_new_goods_out_qty_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='containerdetaillogmodel',
+            name='log_type',
+            field=models.CharField(choices=[('create', '创建'), ('update', '更新'), ('delete', '删除'), ('out', '出库'), ('cancel_out', '取消出库'), ('status_change', '状态变更')], max_length=20, verbose_name='日志类型'),
+        ),
+    ]

erp/filter.py

@@ -1,6 +1,6 @@
 from django_filters import FilterSet
 from .models import InboundBill, MaterialDetail ,OutboundBill ,OutMaterialDetail
-
+from django_filters import rest_framework as filters
 class OutboundBillFilter(FilterSet):
     class Meta:
         model = OutboundBill
@@ -44,7 +44,14 @@ class InboundBillFilter(FilterSet):
             "save_status" : ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
         }
 
-class MaterialDetailFilter(FilterSet):
+class MaterialDetailFilter(filters.FilterSet):
+    # 修正字段引用为正确的 number 字段
+    bound_billId_code__icontains = filters.CharFilter(
+        field_name='bound_billId__number',  # 使用正确的字段名
+        lookup_expr='icontains',            # 匹配 URL 参数的后缀
+        label='入库单代码'
+    )
+    
     class Meta:
         model = MaterialDetail
         fields = {
@@ -52,6 +59,8 @@ class MaterialDetailFilter(FilterSet):
             "bound_billId": ['exact'],
             "entryIds": ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
             "production_batch": ['exact', 'icontains'],
+            "material_goods_code": ['exact', 'icontains'],
+            "material_batch_order": ['exact', 'icontains'],
             "goods_code": ['exact', 'icontains'],
             "goods_name": ['exact', 'icontains'],
             "goods_std": ['exact', 'icontains'],
@@ -63,6 +72,7 @@ class MaterialDetailFilter(FilterSet):
             "create_time": ['exact', 'gt', 'gte', 'lt', 'lte', 'range'],
             "update_time": ['exact', 'gt', 'gte', 'lt', 'lte', 'range'],
             "is_delete": ['exact'],
+            "status": ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
         }
 
 class OutMaterialDetailFilter(FilterSet):

erp/serializers.py

@@ -88,10 +88,16 @@ class MaterialDetailSerializer(serializers.ModelSerializer):
     """
     物料明细序列化器
     """
+    bound_billId_code = serializers.SerializerMethodField()
     class Meta:
         model = MaterialDetail
-        exclude = ['id', 'note']
-        read_only_fields = ['entryIds', 'production_batch', 'goods_code', 'goods_name', 'goods_std', 'goods_weight', 'plan_qty', 'goods_total_weight', 'goods_unit', 'note']
+        fields = '__all__'
+    def get_bound_billId_code(self, obj):
+        """
+        物料明细编码
+        """
+        return f"{obj.bound_billId.number}"
+
 class OutMaterialDetailSerializer(serializers.ModelSerializer):
     """
     物料明细序列化器

erp/urls.py

@@ -39,6 +39,10 @@ urlpatterns = [
         'get': 'retrieve',
 
     }), name="Materials_1"),
+    path('materials/check/', views.Materials.as_view({
+        'put': 'check_status',
+    }), name="check_status_1"),
+
 
     path('outmaterials/', views.OutMaterials.as_view({"get": "list"}),name="OutMaterials"),
     re_path(r'^outmaterials/(?P<pk>\d+)/$', views.OutMaterials.as_view({

erp/views.py

@@ -1300,6 +1300,8 @@ class BatchUpdate(APIView):
                             
                             
                             instance.save()
+                            materials_instance = Materials()
+                            materials_instance._check_status_operation(instance)
                             bill_obj.save()
                             success_count += 1
                         except Exception as e:
@@ -2048,6 +2050,7 @@ class Materials(viewsets.ModelViewSet):
             Response a data list（get）
         list:
             Response a data list（all）
+        
     """
     # authentication_classes = []  # 禁用所有认证类
     # permission_classes = [AllowAny]  # 允许任意访问
@@ -2080,6 +2083,60 @@ class Materials(viewsets.ModelViewSet):
         else:
             return self.http_method_not_allowed(request=self.request)   
 
+    def _check_status_operation(self, material_obj):
+        return_data = {}
+        return_data['status'] = material_obj.status
+    
+        if material_obj.status == 0:
+            return_data['message'] = '未质检，请等待'
+        elif material_obj.status == 1:
+            if material_obj.material_goods_code == '' or material_obj.material_batch_order == '':
+                return_data['message'] = 'erp已质检,但是批次信息未填写，请手动检查，并将批次状态设置为已质检'
+                material_goods_code_divded= material_obj.production_batch.split('-')
+                if len(material_goods_code_divded) == 2:
+                    material_obj.material_goods_code = material_goods_code_divded[0]
+                    material_obj.material_batch_order = material_goods_code_divded[1]
+                    if len(material_obj.material_batch_order) == 7:
+                        material_obj.material_batch_order = '20'+material_obj.material_batch_order[0:6]
+                    material_obj.save()
+                    return_data['message'] = 'erp已质检,但是批次信息未填写，已自动填写，请手动检查，并将批次状态设置为已质检'
+                    from bound.models import BoundBatchModel
+                    batch_obj = BoundBatchModel.objects.filter(goods_code=material_obj.material_goods_code, bound_batch_order=material_obj.material_batch_order).first()
+                    if not batch_obj:
+                        return_data['message'] = 'erp已质检,但是批次信息未填写，已自动填写，请手动检查，并将批次状态设置为已质检,但是WMS未找到该批次，请手动检查，并将批次状态设置为已质检'
+                    else :    
+                        batch_obj.check_status = 1
+                        batch_obj.save()
+                        return_data['message'] = 'erp已质检,但是批次信息未填写，已自动填写，请手动检查，并将批次状态设置为已质检,已自动将批次状态设置为已质检'
+            else:
+                from bound.models import BoundBatchModel
+                batch_obj = BoundBatchModel.objects.filter(goods_code=material_obj.material_goods_code, bound_batch_order=material_obj.material_batch_order).first()
+                if not batch_obj:
+                    return_data['message'] = 'erp已质检,但是WMS未找到该批次，请手动检查，并将批次状态设置为已质检'
+                else :    
+                    batch_obj.check_status = 1
+                    batch_obj.save()
+                    return_data['message'] = '已质检，请确认'
+        return return_data
+
+    def check_status(self,request):
+
+        id = request.data.get('id', None)
+   
+        if id is None:
+            return Response({'message': '参数错误', 'data': None, 'code': 400}, status=status.HTTP_200_OK)
+        else:
+            material_obj = MaterialDetail.objects.filter(id=id).first()
+            if material_obj:
+                return_data = self._check_status_operation(material_obj)
+                return Response({'message': '操作成功', 'data': return_data, 'code': 200}, status=status.HTTP_200_OK)
+            else:
+                return Response({'message': '数据不存在', 'data': None, 'code': 400}, status=status.HTTP_200_OK)
+
+
+
+
+
 class OutMaterials(viewsets.ModelViewSet):
     """
         retrieve:

templates/dist/spa/css/14.61bf61e6.css

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

templates/dist/spa/css/18.3fd341e9.css

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

templates/dist/spa/css/21.eed22a1c.css

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

templates/dist/spa/css/7.0f1870f4.css

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

templates/dist/spa/css/chunk-common.0afca41f.css

@@ -1 +0,0 @@
-[data-v-112dd91a] .q-field__label{margin-top:8px;align-self:center}[data-v-112dd91a] .q-field__control-container{padding-left:50px;margin-top:-5px}[data-v-112dd91a] .q-table .q-editable:hover{background-color:#f0f8ff;cursor:pointer}[data-v-112dd91a] .q-field__native{padding:5px 8px}[data-v-112dd91a] .q-table tr.editing{background-color:#e8f5e9!important}

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

@@ -0,0 +1 @@
+[data-v-83418d0a] .q-field__label{margin-top:8px;align-self:center}[data-v-83418d0a] .q-field__control-container{padding-left:50px;margin-top:-5px}[data-v-83418d0a] .q-table .q-editable:hover{background-color:#f0f8ff;cursor:pointer}[data-v-83418d0a] .q-field__native{padding:5px 8px}[data-v-83418d0a] .q-table tr.editing{background-color:#e8f5e9!important}