services/log/implments/PackOrder.service.impl.go

@@ -888,8 +888,7 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
 			packsession.Rollback()
 			return nil, grmi.NewBusinessError("更新包装项失败!")
 		}
-		if len(dataInfo) == 0 {
-			//满足关包
+
 		pdao := dal.NewPackOrderDAO(packsession, user.Pid, user.Userid)
 
 		pack, err := pdao.SelectOne(packOrderId)
@@ -903,9 +902,19 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
 		}
 		pack.PlantNr = user.Pid
 		pack.PackOrderId = packOrderId
+		pack.ActQty = (pack.ActQty + 1)
+		err = pdao.UpdateOne(pack)
+		if err != nil {
+			packsession.Rollback()
+			return nil, grmi.NewBusinessError("更新包装单状态失败!")
+		}
+
+		if len(dataInfo) == 0 {
+			//满足关包
+			pack.PlantNr = user.Pid
+			pack.PackOrderId = packOrderId
 			pack.Status = bmodel.PACK_STATUS_CLOSED
 			pack.CloseTime = grmi.DateTime(time.Now())
-			pack.ActQty = pack.PlanQty
 			err = pdao.UpdateOne(pack)
 			if err != nil {
 				packsession.Rollback()
@@ -1307,12 +1316,7 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab,
 		packsession.Rollback()
 		return "", grmi.NewBusinessError("更新包装项失败!")
 	}
-	isClose := false
-	if len(dataInfo) == 0 {
-		isClose = true
-		//满足关包
 	pdao := dal.NewPackOrderDAO(packsession, user.Pid, user.Userid)
-
 	pack, err := pdao.SelectOne(packOrderId)
 	if err != nil {
 		packsession.Rollback()
@@ -1324,9 +1328,20 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab,
 	}
 	pack.PlantNr = user.Pid
 	pack.PackOrderId = packOrderId
+	pack.ActQty = (pack.ActQty + 1)
+	err = pdao.UpdateOne(pack)
+	if err != nil {
+		packsession.Rollback()
+		return "", grmi.NewBusinessError("更新包装单状态失败!")
+	}
+	isClose := false
+	if len(dataInfo) == 0 {
+		isClose = true
+		//满足关包
+		pack.PlantNr = user.Pid
+		pack.PackOrderId = packOrderId
 		pack.Status = bmodel.PACK_STATUS_CLOSED
 		pack.CloseTime = grmi.DateTime(time.Now())
-		pack.ActQty = pack.PlanQty
 		err = pdao.UpdateOne(pack)
 		if err != nil {
 			packsession.Rollback()

web/middleware/jwts/jwts.go

@@ -283,7 +283,7 @@ func ConfigJWT() {
 		// 指定func用于提取请求中的token
 		Extractor: FromAuthHeader,
 		// if the token was expired, expiration error will be returned
-		Expiration:          true,
+		Expiration:          false,
 		Debug:               true,
 		EnableAuthOnOptions: false,
 	}