From 731efc2d4b7e369cb4db4ef1c9e079d7e03e5acb Mon Sep 17 00:00:00 2001
From: louwenzhi <Wenzhi.lou@le-it.com.cn>
Date: Mon, 22 Nov 2021 16:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/implments/PackOrder.service.impl.go   | 63 ++++++++++++-------
 web/middleware/jwts/jwts.go                   |  2 +-
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/services/log/implments/PackOrder.service.impl.go b/services/log/implments/PackOrder.service.impl.go
index e0c7eae..ba65563 100644
--- a/services/log/implments/PackOrder.service.impl.go
+++ b/services/log/implments/PackOrder.service.impl.go
@@ -888,24 +888,33 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
 			packsession.Rollback()
 			return nil, grmi.NewBusinessError("更新包装项失败!")
 		}
+
+		pdao := dal.NewPackOrderDAO(packsession, user.Pid, user.Userid)
+
+		pack, err := pdao.SelectOne(packOrderId)
+		if err != nil {
+			packsession.Rollback()
+			return nil, err
+		}
+		if pack == nil {
+			packsession.Rollback()
+			return nil, grmi.NewBusinessError("不存在指定记录!")
+		}
+		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 {
 			//满足关包
-			pdao := dal.NewPackOrderDAO(packsession, user.Pid, user.Userid)
-
-			pack, err := pdao.SelectOne(packOrderId)
-			if err != nil {
-				packsession.Rollback()
-				return nil, err
-			}
-			if pack == nil {
-				packsession.Rollback()
-				return nil, grmi.NewBusinessError("不存在指定记录!")
-			}
 			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,26 +1316,32 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab,
 		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("不存在指定记录!")
+	}
+	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
 		//满足关包
-		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("不存在指定记录!")
-		}
 		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()
diff --git a/web/middleware/jwts/jwts.go b/web/middleware/jwts/jwts.go
index 7774ffc..ed2200b 100644
--- a/web/middleware/jwts/jwts.go
+++ b/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,
 	}