From d4dd0142ff46e34cb35e9b8f7fdff5786c453d42 Mon Sep 17 00:00:00 2001
From: louwenzhi <Wenzhi.lou@le-it.com.cn>
Date: Wed, 25 Aug 2021 11:22:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/implments/PackOrder.service.impl.go   | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/services/log/implments/PackOrder.service.impl.go b/services/log/implments/PackOrder.service.impl.go
index b0cb2ea..162d735 100644
--- a/services/log/implments/PackOrder.service.impl.go
+++ b/services/log/implments/PackOrder.service.impl.go
@@ -1038,7 +1038,7 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord
 		err = packOrderDAO.InsertOne(&model.PackOrder{
 			PlantNr:        packTemplate.PlantNr,
 			PackOrderId:    packOrderId,
-			Status:         bmodel.PACK_STATUS_RUNNING,
+			Status:         bmodel.PACK_STATUS_RELEASED,
 			PackTemplateId: packTemplate.PackTemplateId,
 			PackTypeId:     packTemplate.PackTypeId,
 			MaterialId:     packTemplate.MaterialId,
@@ -1059,8 +1059,12 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord
 		packItems.PlantNr = user.Pid
 		packItems.PackOrderId = packOrderId
 		packItems.SerialOrderId = orderId
+		packItems.MaterialId = artId
 		packItems.Status = bmodel.PACK_STATUS_RUNNING
+		packItems.PlanQty = 1
 		packItems.ActQty = 1
+		packItems.Pos = 1
+		packItems.PosCode = "1"
 		err = itemlstDAO.InsertOne(packItems)
 		if err != nil {
 			packsession.Rollback()
@@ -1228,26 +1232,34 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab,
 		return "", err
 	}
 
+	//更新数量
+	pdao := dal.NewPackOrderDAO(packsession, user.Pid, user.Userid)
+
+	pack, err := pdao.SelectOne(packOrderId)
+	if err != nil {
+		packsession.Rollback()
+		return "", err
+	}
+	if pack.MaterialId != artId {
+		packsession.Rollback()
+		return "", grmi.NewBusinessError("该零件不属于此包装!")
+	}
 	//插入包装项
 	packItems := new(model.PackOrderItemlst)
 	packItems.PlantNr = user.Pid
 	packItems.PackOrderId = packOrderId
 	packItems.SerialOrderId = orderId
+	packItems.MaterialId = artId
 	packItems.Status = bmodel.PACK_STATUS_RUNNING
 	packItems.ActQty = 1
+	packItems.Pos = utils.ValueToInt(pack.ActQty, 0)
+	packItems.PosCode = utils.ValueToString(pack.ActQty, "")
 	err = itemlstDAO.InsertOne(packItems)
 	if err != nil {
 		packsession.Rollback()
 		return "", grmi.NewBusinessError("更新包装项失败!")
 	}
-	//更新数量
-	pdao := dal.NewPackOrderDAO(packsession, user.Pid, user.Userid)
 
-	pack, err := pdao.SelectOne(packOrderId)
-	if err != nil {
-		packsession.Rollback()
-		return "", err
-	}
 	if pack == nil {
 		packsession.Rollback()
 		return "", grmi.NewBusinessError("不存在指定记录!")