From 39986927d40a854182702ff35f0af76b6a11145d Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 13 Jan 2022 16:57:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=8F=AF=E4=B8=8D=E8=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wpm/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py index bf90ce3..95a9e2d 100644 --- a/hb_server/apps/wpm/serializers.py +++ b/hb_server/apps/wpm/serializers.py @@ -423,7 +423,7 @@ class WproductPutInSerializer(serializers.Serializer): class WproductPutInsSerializer(serializers.Serializer): warehouse = serializers.PrimaryKeyRelatedField(queryset=WareHouse.objects.all(), label="仓库ID") wproducts = serializers.PrimaryKeyRelatedField(queryset=WProduct.objects.all(), label='半成品ID', many=True) - remark = serializers.CharField(label="入库备注", required =False) + remark = serializers.CharField(label="入库备注", required =False, allow_null=True) class OperationEquipListSerializer(serializers.Serializer): From 3d0a0a5c2f5c5bf4d3be3f7965d8058c8e90700a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 13 Jan 2022 17:03:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=B9=E5=B1=82?= =?UTF-8?q?=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wpm/services.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hb_server/apps/wpm/services.py b/hb_server/apps/wpm/services.py index 641be72..3734106 100644 --- a/hb_server/apps/wpm/services.py +++ b/hb_server/apps/wpm/services.py @@ -53,6 +53,9 @@ class WpmServies(object): elif wproduct.act_state == WProduct.WPR_ACT_STATE_TOTEST and wproduct.material.type == Material.MA_TYPE_GOOD: # 成品检验 wproduct.act_state = WProduct.WPR_ACT_STATE_TOFINALTEST + + elif wproduct.act_state == WProduct.WPR_ACT_STATE_TOTEST and wproduct.step.type == Step.STEP_TYPE_COMB: # 夹层检验 + wproduct.act_state = WProduct.WPR_ACT_STATE_TOCOMBTEST else: wproduct.act_state = WProduct.WPR_ACT_STATE_OK if wproduct.number is None: # 产生半成品编号