From 2e3d5f41ae2880e22f049ade18220645550ac3be Mon Sep 17 00:00:00 2001 From: yehongyang Date: Sat, 8 Jan 2022 16:35:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/erp/erp.go | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/services/erp/erp.go b/services/erp/erp.go index 2b4a2bd..4a1e25e 100644 --- a/services/erp/erp.go +++ b/services/erp/erp.go @@ -431,7 +431,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro FilerString := "" FilerString += "FDocumentStatus = 'C'" - sFilerString := FilerString + " and FCloseStatus='A' and FMrpCloseStatus='A' and FChangeFlag IN('D','N','C','')" + sFilerString := FilerString + " and FCloseStatus='A' and FMrpCloseStatus='A' and FChangeFlag IN('D','N','C','') and FRemainOutQty>0" dataList := utilService.SaleOrderInit_Dingdanxuqiu().SaleOrderSearch(sFilerString, "") dataList2 := utilService.SAL_XORDERInit_Dingdanxuqiu().SAL_XORDERSearch(FilerString, "") @@ -555,16 +555,20 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro if isIn2 { Qty = finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[7], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"] } - if Qty == 0{ + if Qty == 0 { continue } OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) - + timeNow := time.Now() + if OriginTime.Before(timeNow) { + OriginTime = timeNow + } Time := utils.WeekDayMondayZeroTs(OriginTime) OrderId := "DD" + "_" + billNoOrigin + "_" + rowId //fmt.Println(OrderId) Time = utils.WeekDayMondayZeroTs(Time) + SalesOrder := model.SalesOrder{ PlantNr: PlantNr, OrderId: OrderId, @@ -687,10 +691,14 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error for _, info := range dataList { ArtId := info[0].(string) Qty := info[1].(float64) - if Qty == 0{ + if Qty == 0 { continue } OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) + timeNow := time.Now() + if OriginTime.Before(timeNow) { + OriginTime = timeNow + } Time := utils.WeekDayMondayZeroTs(OriginTime) billNoOrigin := info[3].(string) rowId := info[4].(string) @@ -698,6 +706,7 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error OrderId := "DL" + "_" + billNoOrigin + "_" + rowId //fmt.Println(OrderId) //Time = utils.WeekDayMondayZeroTs(Time) + SalesOrder := model.SalesOrder{ PlantNr: PlantNr, OrderId: OrderId, @@ -772,16 +781,20 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er //fmt.Println(info) ArtId := info[0].(string) Qty := info[1].(float64) - if Qty == 0{ + if Qty == 0 { continue } OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) billNoOrigin := info[3].(string) rowId := info[4].(string) - + timeNow := time.Now() + if OriginTime.Before(timeNow) { + OriginTime = timeNow + } OrderId := "ZZ" + "_" + billNoOrigin + "_" + rowId //fmt.Println(OrderId) Time := utils.WeekDayMondayZeroTs(OriginTime) + SalesOrder := model.SalesOrder{ PlantNr: PlantNr, OrderId: OrderId,