From ec77356de73fc4d4b0792636d7cba77f6ceb975b Mon Sep 17 00:00:00 2001 From: "DESKTOP-4672LME\\Xu Tengfei" Date: Tue, 28 Dec 2021 16:38:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/implments/ArticleStock.service.impl.go | 8 ++++---- services/erp/erp.go | 9 +++++++++ task/importBalance/main.go | 17 +++++++++++++++++ task/k3cloud.go | 17 +++++++++++++---- 4 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 task/importBalance/main.go diff --git a/services/base/implments/ArticleStock.service.impl.go b/services/base/implments/ArticleStock.service.impl.go index 3984bf6..45cc6fd 100644 --- a/services/base/implments/ArticleStock.service.impl.go +++ b/services/base/implments/ArticleStock.service.impl.go @@ -357,7 +357,7 @@ func (impl *ArticleStockServiceImplement) Erp(user *global.User, urlParameters m session := engine.NewSession() defer session.Close() dao := dal.NewArticleStockDAO(session, user.PlantNr, user.UserId) - dao.DeleteWhere([]grmi.Predicate{}) + dao.DeleteWhere([]grmi.Predicate{meta.ArticleStock_PlantNr.NewPredicate(grmi.Equal, user.PlantNr)}) impl_Balance := implments.NewBalanceServiceImplement() //刷新数据 @@ -371,9 +371,11 @@ func (impl *ArticleStockServiceImplement) Erp(user *global.User, urlParameters m erp.GetQiChuQty(model.PlantNr, "system", &alldata_Article) // 在制需求 erp.GetZhaizhiQty(model.PlantNr, "system", &alldata_Article) + + // 在制周 erp.GetZhaizhiWeekQty(model.PlantNr, "system", &alldata_Article) - erp.GetChaigouQty(model.PlantNr, "system", &alldata_Article) + //erp.GetChaigouQty(model.PlantNr, "system", &alldata_Article) //// 期初库存 //err := erp.GetArticleDemandErpQty(user.PlantNr, user.UserId, &alldata_Article) //if err != nil { @@ -388,8 +390,6 @@ func (impl *ArticleStockServiceImplement) Erp(user *global.User, urlParameters m // 独立需求 erp.GetDuliQty(model.PlantNr, "system", &alldata_Article) - - //erp.GetWeiWaiQty(user.PlantNr, user.UserId, &alldata_Article) predicates, err := condition.BuildPredicates(urlParameters) diff --git a/services/erp/erp.go b/services/erp/erp.go index 32f8c4d..1ba305b 100644 --- a/services/erp/erp.go +++ b/services/erp/erp.go @@ -7,6 +7,7 @@ import ( dal_base "leit.com/LAPP_CHEERSSON_BACKEND/dao/base" "leit.com/LAPP_CHEERSSON_BACKEND/db" "leit.com/LAPP_CHEERSSON_BACKEND/grmi" + meta "leit.com/LAPP_CHEERSSON_BACKEND/meta/base" model "leit.com/LAPP_CHEERSSON_BACKEND/models/base" "leit.com/LAPP_CHEERSSON_BACKEND/utils" utilService "leit.com/LAPP_CHEERSSON_BACKEND/utils/k3cloud/service" @@ -79,6 +80,7 @@ func GetQiChuQty(PlantNr int, UserId string, alldata_Article *[]model.Article) { //var ArticleStockList []model_base.ArticleStock dao_ArticleStock := dal_base.NewArticleStockDAO(session, PlantNr, UserId) + //查询可用状态 _stockStatus := utilService.StockStatusInit().StockStatusSearch("", "") _stockStatusIds := "" @@ -420,6 +422,9 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro } dao_SalesOrder := dal_base.NewSalesOrderDAO(session, PlantNr, UserId) + dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_SalesOrderId.NewPredicate(grmi.Equal,"DD")}) + + //dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId) //articleDemandList, err := dao_ArticleDemand.Select([]grmi.Predicate{}, nil) //if err != nil { @@ -645,6 +650,8 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error //dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId) //dao_ArticleStock := dal_base.NewArticleStockDAO(session, PlantNr, UserId) dao_SalesOrder := dal_base.NewSalesOrderDAO(session, PlantNr, UserId) + dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_SalesOrderId.NewPredicate(grmi.Equal,"DL")}) + //articleDemandList, err := dao_ArticleDemand.Select([]grmi.Predicate{}, nil) //if err != nil { // _ = session.Rollback() @@ -719,6 +726,8 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er } dao_SalesOrder := dal_base.NewSalesOrderDAO(session, PlantNr, UserId) + dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_SalesOrderId.NewPredicate(grmi.Equal,"ZZ")}) + //dao_ArticleStock := dal_base.NewArticleStockDAO(session, PlantNr, UserId) //dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId) //articleDemandList, err := dao_ArticleDemand.Select([]grmi.Predicate{}, nil) diff --git a/task/importBalance/main.go b/task/importBalance/main.go new file mode 100644 index 0000000..3a55a34 --- /dev/null +++ b/task/importBalance/main.go @@ -0,0 +1,17 @@ +package main + +import ( + "fmt" + "leit.com/LAPP_CHEERSSON_BACKEND/task" +) + +func main() { + err := task.EtlTaskInit() + if err != nil { + fmt.Println(err) + return + } + task.ImportBalance() + fmt.Println("OK") + return +} diff --git a/task/k3cloud.go b/task/k3cloud.go index 94acc8e..d1b2e49 100644 --- a/task/k3cloud.go +++ b/task/k3cloud.go @@ -3,7 +3,10 @@ package task import ( "fmt" "github.com/go-xorm/xorm" + dal "leit.com/LAPP_CHEERSSON_BACKEND/dao/base" "leit.com/LAPP_CHEERSSON_BACKEND/db" + "leit.com/LAPP_CHEERSSON_BACKEND/grmi" + meta "leit.com/LAPP_CHEERSSON_BACKEND/meta/base" model "leit.com/LAPP_CHEERSSON_BACKEND/models/base" svrAp "leit.com/LAPP_CHEERSSON_BACKEND/services/ap" "leit.com/LAPP_CHEERSSON_BACKEND/services/ap/implments" @@ -262,10 +265,16 @@ func ImportEmpinfo() []Empinfo { //导入库存 func ImportBalance() { - //impl_Balance := implments.NewBalanceServiceImplement() - //alldata_Article := impl_Balance.GetGlobalArticleDataNew() - //erp.GetQiChuQty(model.PlantNr, "system", &alldata_Article) - //erp.GetZhaizhiQty(model.PlantNr, "system", &alldata_Article) + engine := db.Eloquent.Master() + session := engine.NewSession() + defer session.Close() + dao := dal.NewArticleStockDAO(session,model.PlantNr, "system") + dao.DeleteWhere([]grmi.Predicate{meta.ArticleStock_PlantNr.NewPredicate(grmi.Equal, model.PlantNr)}) + + impl_Balance := implments.NewBalanceServiceImplement() + alldata_Article := impl_Balance.GetGlobalArticleDataNew() + erp.GetQiChuQty(model.PlantNr, "system", &alldata_Article) + erp.GetZhaizhiQty(model.PlantNr, "system", &alldata_Article) //erp.GetChaigouiQty(model.PlantNr, "system", &alldata_Article) }