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):
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: # 产生半成品编号