diff --git a/services/ap/implments/Balance.service.impl.go b/services/ap/implments/Balance.service.impl.go index 050288b..7deb520 100644 --- a/services/ap/implments/Balance.service.impl.go +++ b/services/ap/implments/Balance.service.impl.go @@ -3955,8 +3955,8 @@ func (impl *BalanceServiceImplement) GetGlobalArticleDataNew() []model_base.Arti session := engine.NewSession() defer session.Close() - alldata_ArticleDemand = make([]model.ArticleDemand, 0) - session.Table("AP_ArticleDemand").Find(&alldata_ArticleDemand) + alldata_Article = make([]model_base.Article, 0) + session.Table("Article").Find(&alldata_Article) return alldata_Article } diff --git a/services/erp/erp.go b/services/erp/erp.go index 34f37eb..2b4a2bd 100644 --- a/services/erp/erp.go +++ b/services/erp/erp.go @@ -555,6 +555,9 @@ 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{ + continue + } OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) Time := utils.WeekDayMondayZeroTs(OriginTime) @@ -684,6 +687,9 @@ 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{ + continue + } OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) Time := utils.WeekDayMondayZeroTs(OriginTime) billNoOrigin := info[3].(string) @@ -766,6 +772,9 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er //fmt.Println(info) ArtId := info[0].(string) Qty := info[1].(float64) + 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)