From ac57081031dab4c5124e1a1d1d5475b366155837 Mon Sep 17 00:00:00 2001
From: "DESKTOP-4672LME\\Xu Tengfei" <tengfei.xu@le-it.com.cn>
Date: Fri, 24 Dec 2021 10:13:18 +0800
Subject: [PATCH] =?UTF-8?q?erp=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/db.go                                 |  2 +-
 utils/k3cloud/base/curl.go               |  7 +++++++
 utils/k3cloud/service/PLN_PLANORDER.go   |  7 +++++--
 utils/k3cloud/service/PUR_Requisition.go |  9 ++++++++-
 utils/time.go                            | 10 ++++++++++
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/db/db.go b/db/db.go
index 1050af2..5b5921f 100644
--- a/db/db.go
+++ b/db/db.go
@@ -100,7 +100,7 @@ func InitDb() error {
 	if err != nil {
 		return err
 	}
-	//Eloquent.ShowSQL(true)
+	Eloquent.ShowSQL(false)
 	return nil
 }
 
diff --git a/utils/k3cloud/base/curl.go b/utils/k3cloud/base/curl.go
index fb500c8..978630f 100644
--- a/utils/k3cloud/base/curl.go
+++ b/utils/k3cloud/base/curl.go
@@ -102,6 +102,13 @@ func (self *Browser) PostJson(requestUrl string, params map[string]interface{})
 	respCks := response.Cookies()
 	self.cookies = append(self.cookies, respCks...)
 	data, err := ioutil.ReadAll(response.Body)
+
+	result := string(data)
+	fmt.Println(result)
+	is := strings.Contains(result, "\"ErrorCode\":500,\"")
+	if is{
+		return nil, err
+	}
 	return data, err
 }
 
diff --git a/utils/k3cloud/service/PLN_PLANORDER.go b/utils/k3cloud/service/PLN_PLANORDER.go
index 87704b1..16dd60c 100644
--- a/utils/k3cloud/service/PLN_PLANORDER.go
+++ b/utils/k3cloud/service/PLN_PLANORDER.go
@@ -83,6 +83,9 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 	if err != nil || article == nil {
 		return "", err
 	}
+	//周一
+	articleDemand.PlanDate = grmi.Date(utils2.WeekDaySundayZeroTs(articleDemand.PlanDate.Restore()))
+	//当前周调整
 	if articleDemand.PlanDate.Restore().Before(time.Now()) {
 		articleDemand.PlanDate = grmi.Date(time.Now())
 	}
@@ -116,10 +119,10 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 				FNumber: article.UomId,
 			},
 			FPlanStartDate:  articleDemand.PlanDate.ToString(),
-			FPlanFinishDate: articleDemand.PlanDate.ToString(),
+			FPlanFinishDate: utils2.WeekDaySundayZeroTs(articleDemand.PlanDate.Restore()).String(),
 			FFirmQty:        int(articleDemand.PlanQty),
 			FFirmStartDate:  articleDemand.PlanDate.ToString(),
-			FFirmFinishDate: articleDemand.PlanDate.ToString(),
+			FFirmFinishDate: utils2.WeekDaySundayZeroTs(articleDemand.PlanDate.Restore()).String(),
 			FInStockOrgID: _struct.FNumber{
 				FNumber: utils2.K3Obj.FUseOrgNo,
 			},
diff --git a/utils/k3cloud/service/PUR_Requisition.go b/utils/k3cloud/service/PUR_Requisition.go
index 3c126df..8fa43a2 100644
--- a/utils/k3cloud/service/PUR_Requisition.go
+++ b/utils/k3cloud/service/PUR_Requisition.go
@@ -3,10 +3,12 @@ package service
 import (
 	dal_base "leit.com/LAPP_CHEERSSON_BACKEND/dao/base"
 	"leit.com/LAPP_CHEERSSON_BACKEND/db"
+	"leit.com/LAPP_CHEERSSON_BACKEND/grmi"
 	model "leit.com/LAPP_CHEERSSON_BACKEND/models/ap"
 	utils2 "leit.com/LAPP_CHEERSSON_BACKEND/utils"
 	"leit.com/LAPP_CHEERSSON_BACKEND/utils/k3cloud/struct/PUR_Requisition"
 	request2 "leit.com/LAPP_CHEERSSON_BACKEND/utils/k3cloud/struct/request"
+	"time"
 )
 /**
 供应链 -》 采购管理 ——》采购申请单
@@ -75,7 +77,12 @@ func (_this *PUR_Requisition_Service) Save(PlantNr int, UserId string, articleDe
 	if err != nil || article == nil{
 		return err
 	}
-
+	//周一
+	articleDemand.DemandDate = grmi.Date(utils2.WeekDaySundayZeroTs(articleDemand.DemandDate.Restore()))
+	//当前周调整
+	if articleDemand.DemandDate.Restore().Before(time.Now()) {
+		articleDemand.DemandDate = grmi.Date(time.Now())
+	}
 	var entityList []PUR_Requisition.FEntity
 	entity := PUR_Requisition.FEntity{
 		FRequireOrgID: PUR_Requisition.FRequireOrgID{
diff --git a/utils/time.go b/utils/time.go
index 5f46ad7..7ce6b41 100644
--- a/utils/time.go
+++ b/utils/time.go
@@ -517,3 +517,13 @@ func WeekDayMondayZeroTs(now time.Time) time.Time {
 	weekStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
 	return weekStart
 }
+
+func WeekDaySundayZeroTs(now time.Time) time.Time {
+	offset := int(time.Sunday - now.Weekday())
+	if offset > 0 {
+		offset = -6
+	}
+
+	weekStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	return weekStart
+}
\ No newline at end of file