From 789cfd13b086874904778c7c3e281fa7b44f7e8a Mon Sep 17 00:00:00 2001
From: "DESKTOP-4672LME\\Xu Tengfei" <tengfei.xu@le-it.com.cn>
Date: Wed, 29 Dec 2021 19:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/ap/implments/Balance.service.impl.go | 74 ++++++++++---------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/services/ap/implments/Balance.service.impl.go b/services/ap/implments/Balance.service.impl.go
index a8018c0..c1b6183 100644
--- a/services/ap/implments/Balance.service.impl.go
+++ b/services/ap/implments/Balance.service.impl.go
@@ -2990,32 +2990,34 @@ func (impl *BalanceServiceImplement) PublishMpsPlan(user *global.User, version s
 		}
 
 		//todo mpsSetting.UseCustDemandLockToggle
-		if mpsSetting.UseCustDemandLockToggle {
-			var customerIdLi []string
-			var customerLi []model_base.Customer
-			for _, CustArt := range alldata_CustArtlst{
-				if articleDemand.ArtId == CustArt.ArtId{
-					customerIdLi = append(customerIdLi, CustArt.CustomerId)
-				}
-			}
-			for _, customer := range customerIdLi {
-				for _, custInfo := range alldata_Customer{
-					if custInfo.CustomerId == customer{
-						customerLi = append(customerLi, custInfo)
+		if lockWeeks == 0{
+			if mpsSetting.UseCustDemandLockToggle {
+				var customerIdLi []string
+				var customerLi []model_base.Customer
+				for _, CustArt := range alldata_CustArtlst{
+					if articleDemand.ArtId == CustArt.ArtId{
+						customerIdLi = append(customerIdLi, CustArt.CustomerId)
 					}
 				}
-			}
-			for _, customer := range customerLi{
-				if customer.LockWeeks > lockWeeks {
-					lockWeeks = customer.LockWeeks
+				for _, customer := range customerIdLi {
+					for _, custInfo := range alldata_Customer{
+						if custInfo.CustomerId == customer{
+							customerLi = append(customerLi, custInfo)
+						}
+					}
+				}
+				for _, customer := range customerLi{
+					if customer.LockWeeks > lockWeeks {
+						lockWeeks = customer.LockWeeks
+					}
 				}
-			}
 
-			if lockWeeks == 0{
+				if lockWeeks == 0{
+					lockWeeks = mpsSetting.DefaultLockWeeks
+				}
+			}else{
 				lockWeeks = mpsSetting.DefaultLockWeeks
 			}
-		}else{
-			lockWeeks = mpsSetting.DefaultLockWeeks
 		}
 
 		if lockWeeks == 0 {
@@ -3430,31 +3432,33 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error
 		}
 
 		//todo
-		if mpsSettingOne.UseCustDemandLockToggle {
-
-			for _, customer := range customerLi{
-				if customer.LockWeeks > lockWeeks {
-					lockWeeks = customer.LockWeeks
+		if lockWeeks == 0{
+			if mpsSettingOne.UseCustDemandLockToggle {
+				for _, customer := range customerLi{
+					if customer.LockWeeks > lockWeeks {
+						lockWeeks = customer.LockWeeks
+					}
 				}
-			}
 
-			if lockWeeks == 0{
+				if lockWeeks == 0{
+					lockWeeks = mpsSettingOne.DefaultLockWeeks
+				}
+			}else{
 				lockWeeks = mpsSettingOne.DefaultLockWeeks
 			}
-		}else{
-			lockWeeks = mpsSettingOne.DefaultLockWeeks
 		}
 
+
 		if lockWeeks == 0 {
 			return grmi.NewBusinessError( "未获取到吸收期:"+ info.ArtId)
 		}
 
-		var custArticleList []model.CustArtlst
-		for _, custArticle := range alldata_CustArtlst{
-			if custArticle.ArtId == info.ArtId{
-				custArticleList = append(custArticleList, custArticle)
-			}
-		}
+		//var custArticleList []model.CustArtlst
+		//for _, custArticle := range alldata_CustArtlst{
+		//	if custArticle.ArtId == info.ArtId{
+		//		custArticleList = append(custArticleList, custArticle)
+		//	}
+		//}
 
 					if mpsSettingOne.UseFixedStockCoverToggle {
 						MinCoverPeriod = mpsSettingOne.DefaultMinCoverPeriod