From 8a41c1728ef18577c96dbf199f24827c2245a224 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 18 Nov 2021 16:12:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E5=8D=8A=E6=88=90=E5=93=81=E9=A2=86?=
 =?UTF-8?q?=E6=96=99bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/mtm/serializers.py | 6 ++++++
 hb_server/apps/qm/models.py       | 6 +++++-
 hb_server/apps/wpm/models.py      | 2 ++
 hb_server/apps/wpm/views.py       | 2 +-
 hb_server/requirements.txt        | 2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py
index 3e7a46d..f9cc55d 100644
--- a/hb_server/apps/mtm/serializers.py
+++ b/hb_server/apps/mtm/serializers.py
@@ -209,6 +209,12 @@ class RecordFormDetailSerializer(serializers.ModelSerializer):
     
     def get_form_fields(self, obj):
         serializer = RecordFormFieldSerializer(instance=RecordFormField.objects.filter(form=obj, is_deleted=False), many=True)
+        vdata = serializer.data
+        if obj.type == RecordForm.RF_TYPE_TEST:
+            for i in vdata:
+                if i['need_judge']:
+                    i['is_testok'] = False
+                    i['is_teskok_robot'] = False
         return serializer.data
 
 
diff --git a/hb_server/apps/qm/models.py b/hb_server/apps/qm/models.py
index fb61f53..c2dea88 100644
--- a/hb_server/apps/qm/models.py
+++ b/hb_server/apps/qm/models.py
@@ -49,8 +49,11 @@ class TestRecord(CommonAModel):
     """
     form = models.ForeignKey('mtm.recordform', verbose_name='所用表格', on_delete=models.CASCADE)
     is_testok = models.BooleanField('是否合格', default=True)
+    is_testok_robot = models.BooleanField('自动判定的是否合格', default=True)
+    number = models.CharField('产品编号', null=True, blank=True, max_length=50)
     wproduct = models.ForeignKey('wpm.wproduct', verbose_name='关联的动态产品', on_delete=models.CASCADE, null=True, blank=True)
     material = models.ForeignKey('mtm.material', verbose_name='关联的物料状态', on_delete=models.CASCADE, null=True, blank=True)
+    subproduction_plan = models.ForeignKey('pm.subproductionplan', verbose_name='关联的生产子计划', on_delete=models.CASCADE, null=True, blank=True)
     fifo_item = models.ForeignKey('inm.fifoitem', verbose_name='关联的出入库批次', on_delete=models.CASCADE, null=True, blank=True)
     remark = models.TextField('备注', default='')
 
@@ -66,5 +69,6 @@ class TestRecordItem(BaseModel):
     field_value = models.JSONField('录入值', default=dict, blank=True)
     need_judge = models.BooleanField('是否需要判定', default=False)
     sort = models.IntegerField('排序号', default=1)
-    is_testok = models.BooleanField('是否合格', null=True, blank=True) 
+    is_testok = models.BooleanField('是否合格', null=True, blank=True)
+    is_testok_robot = models.BooleanField('自动判定的是否合格', null=True, blank=True)
     test_record = models.ForeignKey(TestRecord, verbose_name='关联的检测记录', on_delete=models.CASCADE, related_name='item_test_record')
\ No newline at end of file
diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py
index 2f0007e..80e1b0c 100644
--- a/hb_server/apps/wpm/models.py
+++ b/hb_server/apps/wpm/models.py
@@ -44,6 +44,8 @@ class WProduct(CommonAModel):
     subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE)
     production_plan = models.ForeignKey(ProductionPlan, verbose_name='关联主生产计划', on_delete=models.CASCADE)
     warehouse = models.ForeignKey(WareHouse, verbose_name='所在仓库', on_delete=models.SET_NULL, null=True, blank=True)
+    # operation = models.ForeignKey('wpm.operation', verbose_name='关联操作', 
+    #     on_delete=models.SET_NULL, null=True, blank=True, related_name='')
 
 class Operation(CommonADModel):
     """
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index cab6c45..91d205d 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -53,7 +53,7 @@ class WPlanViewSet(ListModelMixin, GenericViewSet):
                 material__type=Material.MA_TYPE_HALFGOOD, subproduction_plan=sp).select_related('material')
             return Response(SubProductionProgressSerializer(instance=spps, many=True).data)
         elif request.method=='POST':
-            serializer= PickHalfSerializer(data=request.data)
+            serializer= PickHalfSerializer(data=request.data, many=True)
             serializer.is_valid(raise_exception=True)
             vdata = serializer.data
             first_step = Step.objects.get(pk=sp.steps[0].id)
diff --git a/hb_server/requirements.txt b/hb_server/requirements.txt
index a223cbc..3d3b1be 100644
--- a/hb_server/requirements.txt
+++ b/hb_server/requirements.txt
@@ -1,5 +1,5 @@
 celery==5.1.2
-Django==3.2.6
+Django==3.2.9
 django-celery-beat==2.2.1
 django-cors-headers==3.7.0
 django-filter==2.4.0