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] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=AD=98=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=89=8D?= =?UTF-8?q?=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 }