From 4a6d326454dc140940dd0cc7cec474b6f7977d5b Mon Sep 17 00:00:00 2001 From: "DESKTOP-4672LME\\Xu Tengfei" Date: Mon, 3 Jan 2022 21:17:31 +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/ArticleStockLevel.service.impl.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/ap/implments/ArticleStockLevel.service.impl.go b/services/ap/implments/ArticleStockLevel.service.impl.go index d833682..cef573d 100644 --- a/services/ap/implments/ArticleStockLevel.service.impl.go +++ b/services/ap/implments/ArticleStockLevel.service.impl.go @@ -299,12 +299,12 @@ func (impl *ArticleStockLevelServiceImplement) SelectAndPaging(user *global.User dao_Resource := dal.NewArticleResourceDAO(session, user.PlantNr, user.UserId) articleStockLevelSlice := result.Records.([]model.ArticleStockLevel) - for _, info := range articleStockLevelSlice{ + for index, info := range articleStockLevelSlice{ resource, err := dao_Resource.SelectOne(info.ArtId) if err != nil || resource == nil { continue } - info.MainResourceId = resource.ResourceId + articleStockLevelSlice[index].MainResourceId = resource.ResourceId } result.Records = articleStockLevelSlice return result, nil From 5bf3fba1977b187d6c2ced5764df50dd97959cc7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-4672LME\\Xu Tengfei" Date: Mon, 3 Jan 2022 22:05:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=93=E5=89=8D=E7=BD=AE=E6=9C=9F?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/ap/implments/Balance.service.impl.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/ap/implments/Balance.service.impl.go b/services/ap/implments/Balance.service.impl.go index 20f2ef2..050288b 100644 --- a/services/ap/implments/Balance.service.impl.go +++ b/services/ap/implments/Balance.service.impl.go @@ -3678,11 +3678,11 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error } } - //需求周期 + mps策略表偏离天数 > 当前时间+ 并且 需求周期 < (当前时间+吸收期+最大覆盖周期) - weekTimeNow := utils.WeekDayMondayZeroTs(timeNow) + //需求周期 + mps策略表偏离天数 > 当前时间+ 并且 需求周期 < (当前时间+吸收期+最大覆盖周期) 考虑前置期过期订单 + firstTime := timeNow.Add(-time.Duration(mpsSettingOne.SalesOrderFetchLeadTimeByDay*24) * time.Hour) nowdemandWeek := utils.WeekDayMondayZeroTs(salesOrder.RecieveTime.Restore()) //weekTimeDemand := utils.WeekDayMondayZeroTs(demandWeek.Add(time.Duration(frontday*24*7) * time.Hour)) - if weekTimeNow.After(nowdemandWeek) { + if firstTime.After(salesOrder.ExpectedDeliveryDate.Restore()) { continue }