From 76fd77597ccddec285b2c3f0b2b7f94fd75bea59 Mon Sep 17 00:00:00 2001 From: "DESKTOP-4672LME\\Xu Tengfei" Date: Wed, 5 Jan 2022 15:04:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/ap/implments/Balance.service.impl.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 } -- 2.30.1.windows.1 From 654371f93842757691afe2f8ef1975fe76d6a9ea Mon Sep 17 00:00:00 2001 From: "DESKTOP-4672LME\\Xu Tengfei" Date: Sat, 8 Jan 2022 14:34:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E9=87=8F0=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/erp/erp.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/erp/erp.go b/services/erp/erp.go index 38a427a..953735d 100644 --- a/services/erp/erp.go +++ b/services/erp/erp.go @@ -556,6 +556,9 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro if isIn2 { Qty = finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[6], "")+"]"+"["+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) @@ -685,6 +688,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) @@ -767,6 +773,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) -- 2.30.1.windows.1