diff --git a/services/erp/erp.go b/services/erp/erp.go index 4a1e25e..012954a 100644 --- a/services/erp/erp.go +++ b/services/erp/erp.go @@ -559,12 +559,12 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro continue } OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) + + Time := utils.WeekDayMondayZeroTs(OriginTime) timeNow := time.Now() if OriginTime.Before(timeNow) { - OriginTime = timeNow + Time = utils.WeekDayMondayZeroTs(timeNow) } - Time := utils.WeekDayMondayZeroTs(OriginTime) - OrderId := "DD" + "_" + billNoOrigin + "_" + rowId //fmt.Println(OrderId) Time = utils.WeekDayMondayZeroTs(Time) @@ -695,11 +695,12 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error continue } OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) + + Time := utils.WeekDayMondayZeroTs(OriginTime) timeNow := time.Now() if OriginTime.Before(timeNow) { - OriginTime = timeNow + Time = utils.WeekDayMondayZeroTs(timeNow) } - Time := utils.WeekDayMondayZeroTs(OriginTime) billNoOrigin := info[3].(string) rowId := info[4].(string) @@ -787,14 +788,14 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er 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) - + timeNow := time.Now() + if OriginTime.Before(timeNow) { + Time = utils.WeekDayMondayZeroTs(timeNow) + } SalesOrder := model.SalesOrder{ PlantNr: PlantNr, OrderId: OrderId,