Merge pull request '包装数量修改' (#90) from feature_log into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/90
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>

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("不存在指定记录!")