Merge pull request '修改bug' (#214) from feature_mps_2 into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/214

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,
 			},

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())

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