From c08d1123eda171b844b90d515b7fba73626bf5c4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-4672LME\\Xu Tengfei" <tengfei.xu@le-it.com.cn>
Date: Fri, 24 Dec 2021 15:45:35 +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

---
 utils/k3cloud/service/PLN_PLANORDER.go   | 5 +++--
 utils/k3cloud/service/PUR_Requisition.go | 2 +-
 utils/time.go                            | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/utils/k3cloud/service/PLN_PLANORDER.go b/utils/k3cloud/service/PLN_PLANORDER.go
index c3d29f6..248468b 100644
--- a/utils/k3cloud/service/PLN_PLANORDER.go
+++ b/utils/k3cloud/service/PLN_PLANORDER.go
@@ -89,6 +89,7 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 	if articleDemand.PlanDate.Restore().Before(time.Now()) {
 		articleDemand.PlanDate = grmi.Date(time.Now())
 	}
+	saturday := grmi.Date(utils2.WeekDaySaturdayZeroTs(articleDemand.PlanDate.Restore()))
 	request := request2.SaveRequest{
 		IsDeleteEntry:         true,
 		IsVerifyBaseDataField: false,
@@ -119,10 +120,10 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 				FNumber: article.UomId,
 			},
 			FPlanStartDate:  articleDemand.PlanDate.ToString(),
-			FPlanFinishDate: utils2.WeekDaySaturdayZeroTs(articleDemand.PlanDate.Restore()).String(),
+			FPlanFinishDate:saturday.ToString(),
 			FFirmQty:        int(articleDemand.PlanQty),
 			FFirmStartDate:  articleDemand.PlanDate.ToString(),
-			FFirmFinishDate: utils2.WeekDaySaturdayZeroTs(articleDemand.PlanDate.Restore()).String(),
+			FFirmFinishDate: saturday.ToString(),
 			FInStockOrgID: _struct.FNumber{
 				FNumber: utils2.K3Obj.FUseOrgNo,
 			},
diff --git a/utils/k3cloud/service/PUR_Requisition.go b/utils/k3cloud/service/PUR_Requisition.go
index 8fa43a2..dc334f9 100644
--- a/utils/k3cloud/service/PUR_Requisition.go
+++ b/utils/k3cloud/service/PUR_Requisition.go
@@ -78,7 +78,7 @@ func (_this *PUR_Requisition_Service) Save(PlantNr int, UserId string, articleDe
 		return err
 	}
 	//周一
-	articleDemand.DemandDate = grmi.Date(utils2.WeekDaySundayZeroTs(articleDemand.DemandDate.Restore()))
+	articleDemand.DemandDate = grmi.Date(utils2.WeekDayMondayZeroTs(articleDemand.DemandDate.Restore()))
 	//当前周调整
 	if articleDemand.DemandDate.Restore().Before(time.Now()) {
 		articleDemand.DemandDate = grmi.Date(time.Now())
diff --git a/utils/time.go b/utils/time.go
index a8ddd3a..842932c 100644
--- a/utils/time.go
+++ b/utils/time.go
@@ -519,10 +519,11 @@ func WeekDayMondayZeroTs(now time.Time) time.Time {
 }
 
 func WeekDaySaturdayZeroTs(now time.Time) time.Time {
-	offset := int(time.Saturday - now.Weekday())
+	offset := int(time.Monday - now.Weekday())
 	if offset > 0 {
 		offset = -6
 	}
+	offset += 5
 
 	weekStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
 	return weekStart