From a0fbea5fba5fe458dbed13cd404f06035155cb8d Mon Sep 17 00:00:00 2001 From: "DESKTOP-4672LME\\Xu Tengfei" Date: Mon, 3 Jan 2022 09:57:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/ap/ArticleStockLevel.model.go | 2 ++ .../ap/implments/ArticleStockLevel.service.impl.go | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/models/ap/ArticleStockLevel.model.go b/models/ap/ArticleStockLevel.model.go index ea694b5..7aa3813 100644 --- a/models/ap/ArticleStockLevel.model.go +++ b/models/ap/ArticleStockLevel.model.go @@ -32,6 +32,8 @@ type ArticleStockLevel struct { LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"AP_ArticleStockLevel-LastModify"` LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"AP_ArticleStockLevel-LastUser"` CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"AP_ArticleStockLevel-CreateTime"` + + MainResourceId string `xorm:"-" json:"AP_ArticleStockLevel-MainResourceId"` //主要资源ID } /****************************************************************************** diff --git a/services/ap/implments/ArticleStockLevel.service.impl.go b/services/ap/implments/ArticleStockLevel.service.impl.go index e709e18..d833682 100644 --- a/services/ap/implments/ArticleStockLevel.service.impl.go +++ b/services/ap/implments/ArticleStockLevel.service.impl.go @@ -296,6 +296,17 @@ func (impl *ArticleStockLevelServiceImplement) SelectAndPaging(user *global.User if err != nil { return grmi.EmptyPagingResult, err } + + dao_Resource := dal.NewArticleResourceDAO(session, user.PlantNr, user.UserId) + articleStockLevelSlice := result.Records.([]model.ArticleStockLevel) + for _, info := range articleStockLevelSlice{ + resource, err := dao_Resource.SelectOne(info.ArtId) + if err != nil || resource == nil { + continue + } + info.MainResourceId = resource.ResourceId + } + result.Records = articleStockLevelSlice return result, nil } -- 2.30.1.windows.1 From 22de8c584202cf61396b212c1c224cad71e1fb56 Mon Sep 17 00:00:00 2001 From: "DESKTOP-4672LME\\Xu Tengfei" Date: Mon, 3 Jan 2022 20:08:21 +0800 Subject: [PATCH 2/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 | 11 ++++++----- services/erp/erp.go | 17 ++++++++++------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/services/ap/implments/Balance.service.impl.go b/services/ap/implments/Balance.service.impl.go index cceedc9..20f2ef2 100644 --- a/services/ap/implments/Balance.service.impl.go +++ b/services/ap/implments/Balance.service.impl.go @@ -3809,6 +3809,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error } Time := utils.WeekDayMondayZeroTs(info.RecieveTime.Restore()) + OrginTime := info.ExpectedDeliveryDate isAdd := false var AddTime time.Time ArticleTime := utils.WeekDayMondayZeroTs(beforeList[index].DemandDate.Restore()) @@ -3818,7 +3819,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error isAdd = true } - if isAdd && AddTime.Before(Time) && !ArticleTime.Before(Time) || Time == ArticleTime { + if isAdd && !AddTime.After(OrginTime.Restore()) && !ArticleTime.Before(OrginTime.Restore()) || Time == ArticleTime { beforeList[index].IndependentDemandQty += DLQty } } @@ -3853,7 +3854,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error } else { isInMap[beforeList[index].ArtId] += 1 } - + OrginTime := info.ExpectedDeliveryDate Time := utils.WeekDayMondayZeroTs(info.RecieveTime.Restore()) isAdd := false var AddTime time.Time @@ -3864,7 +3865,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error isAdd = true } - if isAdd && AddTime.Before(Time) && !ArticleTime.Before(Time) || Time == ArticleTime { + if isAdd && !AddTime.After(OrginTime.Restore()) && !ArticleTime.Before(OrginTime.Restore()) || Time == ArticleTime { beforeList[index].WipQty += ZZQty } @@ -3890,7 +3891,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error isInMap[beforeList[index].ArtId] += 1 } //articleDemandList[index].OrderQty = 0 - + OrginTime := info.ExpectedDeliveryDate Time := utils.WeekDayMondayZeroTs(info.RecieveTime.Restore()) isAdd := false var AddTime time.Time @@ -3901,7 +3902,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error isAdd = true } - if isAdd && AddTime.Before(Time) && !ArticleTime.Before(Time) || Time == ArticleTime { + if isAdd && !AddTime.After(OrginTime.Restore()) && !ArticleTime.Before(OrginTime.Restore()) || Time == ArticleTime { beforeList[index].OrderQty += DDQty } diff --git a/services/erp/erp.go b/services/erp/erp.go index 0b16950..38a427a 100644 --- a/services/erp/erp.go +++ b/services/erp/erp.go @@ -556,9 +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], "")+"]"] } - Time, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) + OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) - Time = utils.WeekDayMondayZeroTs(Time) + Time := utils.WeekDayMondayZeroTs(OriginTime) OrderId := "DD"+"_"+billNoOrigin+"_"+rowId //fmt.Println(OrderId) @@ -569,6 +569,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro ArtId: ArtId, //Descr: articleInfo.Descr1, //FMaterialId: FMaterialId, + ExpectedDeliveryDate: grmi.Date(OriginTime), RecieveTime: grmi.DateTime(Time), PlanQty: Qty, ProductType: "DD", @@ -684,20 +685,21 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error for _, info := range dataList{ ArtId := info[0].(string) Qty := info[1].(float64) - Time, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) - Time = utils.WeekDayMondayZeroTs(Time) + OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) + Time := utils.WeekDayMondayZeroTs(OriginTime) billNoOrigin := info[3].(string) rowId := info[4].(string) OrderId := "DL"+"_"+billNoOrigin+"_"+rowId //fmt.Println(OrderId) - Time = utils.WeekDayMondayZeroTs(Time) + //Time = utils.WeekDayMondayZeroTs(Time) SalesOrder := model.SalesOrder{ PlantNr: PlantNr, OrderId: OrderId, ArtId: ArtId, //Descr: articleInfo.Descr1, //FMaterialId: FMaterialId, + ExpectedDeliveryDate: grmi.Date(OriginTime), RecieveTime: grmi.DateTime(Time), PlanQty: Qty, ProductType: "DL", @@ -765,19 +767,20 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er //fmt.Println(info) ArtId := info[0].(string) Qty := info[1].(float64) - Time, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) + OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) billNoOrigin := info[3].(string) rowId := info[4].(string) OrderId := "ZZ"+"_"+billNoOrigin+"_"+rowId //fmt.Println(OrderId) - Time = utils.WeekDayMondayZeroTs(Time) + Time := utils.WeekDayMondayZeroTs(OriginTime) SalesOrder := model.SalesOrder{ PlantNr: PlantNr, OrderId: OrderId, ArtId: ArtId, //Descr: articleInfo.Descr1, //FMaterialId: FMaterialId, + ExpectedDeliveryDate: grmi.Date(OriginTime), RecieveTime: grmi.DateTime(Time), PlanQty: Qty, ProductType: "ZZ", -- 2.30.1.windows.1