diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index de4c8ee..b100adf 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -260,7 +260,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
         warehouse = WareHouse.objects.get(id=vdata['warehouse'])
         for i in wproducts:
             if i.act_state is not WProduct.WPR_ACT_STATE_OK:
-                raise exceptions.APIException('存在不可入库产品')
+                raise exceptions.APIException('存在不可入库半成品')
         # 聚合一下
         wproducts_a = wproducts.values('subproduction_plan', 'material', 'subproduction_plan__number').annotate(total=Count('id'))
         # 创建入库记录
@@ -269,15 +269,16 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
             is_audited=True, auditor=request.user, inout_date=timezone.now(), create_by=request.user, remark=remark)
         # 创建入库明细
         for i in wproducts_a:
+            spi = SubProductionPlan.objects.get(pk=i['subproduction_plan'])
             fifoitem = FIFOItem()
             fifoitem.is_tested = True
             fifoitem.is_testok = True
             fifoitem.warehouse = warehouse
-            fifoitem.material = i['material']
+            fifoitem.material = Material.objects.get(pk=i['material'])
             fifoitem.count = i['total']
-            fifoitem.batch = i['subproduction_plan__number']
+            fifoitem.batch = spi.number
             fifoitem.fifo = fifo
-            fifoitem.subproduction_plan = i['subproduction_plan']
+            fifoitem.subproduction_plan = spi
             fifoitem.save()
 
             wproducts_items = wproducts.filter(subproduction_plan=i['subproduction_plan'], material=i['material'])