From 678668ad6f3ea8ecbb3af8b921eac963b7ebc78a Mon Sep 17 00:00:00 2001 From: zhangxin Date: Fri, 15 Oct 2021 17:36:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=96=B0=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=B5=81=E6=B0=B4=E5=8F=B7?= =?UTF-8?q?=E5=8F=8A=E7=94=A8=E6=88=B7=E8=8E=B7=E5=8F=96plantnr=E5=92=8Cus?= =?UTF-8?q?erid=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../implments/ArtDemandHead.service.impl.go | 7 ++-- .../log/implments/PackOrder.service.impl.go | 37 ++++++++---------- .../implments/VendorUserLst.service.impl.go | 39 +++++++++++++------ services/om/DemandHeadFromDB.service.go | 17 +------- .../om/implments/DemandHead.service.impl.go | 9 ++--- 5 files changed, 53 insertions(+), 56 deletions(-) diff --git a/services/log/implments/ArtDemandHead.service.impl.go b/services/log/implments/ArtDemandHead.service.impl.go index 507bf8b..5bee4b1 100644 --- a/services/log/implments/ArtDemandHead.service.impl.go +++ b/services/log/implments/ArtDemandHead.service.impl.go @@ -7,13 +7,13 @@ import ( baseDal "LAPP_ACURA_MOM_BACKEND/dao/base" dal "LAPP_ACURA_MOM_BACKEND/dao/log" "LAPP_ACURA_MOM_BACKEND/db" + "LAPP_ACURA_MOM_BACKEND/global" "LAPP_ACURA_MOM_BACKEND/grmi" "LAPP_ACURA_MOM_BACKEND/infra/logger" meta "LAPP_ACURA_MOM_BACKEND/meta/log" baseModel "LAPP_ACURA_MOM_BACKEND/models/base" model "LAPP_ACURA_MOM_BACKEND/models/log" "LAPP_ACURA_MOM_BACKEND/utils" - "LAPP_ACURA_MOM_BACKEND/global" "fmt" "github.com/360EntSecGroup-Skylar/excelize/v2" json "github.com/json-iterator/go" @@ -142,6 +142,7 @@ func (impl *ArtDemandHeadServiceImplement) InsertOne(user *global.User, entity * session := engine.NewSession() defer session.Close() dao := dal.NewArtDemandHeadDAO(session, user.PlantNr, user.UserId) + snrDao := baseDal.NewSnrDAO(session, user.PlantNr, user.UserId) record, err := dao.SelectOne(entity.ArtId, entity.DemandId) if err != nil { return err @@ -149,9 +150,7 @@ func (impl *ArtDemandHeadServiceImplement) InsertOne(user *global.User, entity * if record != nil { return grmi.NewBusinessError("已经存在相同主键的记录!") } - snr := new(models.Snrtab) - snr.Finr = user.PlantNr - demandId, err := snr.GetNextSnr("Demand") + demandId, err := snrDao.GetNextSnr("Demand") if err != nil { return err } diff --git a/services/log/implments/PackOrder.service.impl.go b/services/log/implments/PackOrder.service.impl.go index 6d9d3a4..eb17f17 100644 --- a/services/log/implments/PackOrder.service.impl.go +++ b/services/log/implments/PackOrder.service.impl.go @@ -14,12 +14,12 @@ import ( //medal "LAPP_ACURA_MOM_BACKEND/dao/me" dal "LAPP_ACURA_MOM_BACKEND/dao/log" "LAPP_ACURA_MOM_BACKEND/db" + "LAPP_ACURA_MOM_BACKEND/global" "LAPP_ACURA_MOM_BACKEND/grmi" bmeta "LAPP_ACURA_MOM_BACKEND/meta/base" meta "LAPP_ACURA_MOM_BACKEND/meta/log" bmodel "LAPP_ACURA_MOM_BACKEND/models/base" model "LAPP_ACURA_MOM_BACKEND/models/log" - "LAPP_ACURA_MOM_BACKEND/global" "github.com/go-xorm/xorm" "time" ) @@ -448,7 +448,7 @@ func (impl *PackOrderServiceImplement) Update(user *global.User, entities *[]mod ******************************************************************************/ func (self *PackOrderServiceImplement) ClosePackOrder(context *container.RequestContext, packOrderId string, poses []int) error { - packOrderDAO := dal.NewPackOrderDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) + packOrderDAO := dal.NewPackOrderDAO(context.Session(), self.session.User().PlantNr, self.session.User().UserId) order, err := packOrderDAO.SelectOne(packOrderId) if err != nil { return err @@ -460,7 +460,7 @@ func (self *PackOrderServiceImplement) ClosePackOrder(context *container.Request return grmi.NewBusinessError("包装单尚未激活!") } order.Status = 80 - packOrderItemlstDAO := dal.NewPackOrderItemlstDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) + packOrderItemlstDAO := dal.NewPackOrderItemlstDAO(context.Session(), self.session.User().PlantNr, self.session.User().UserId) predicates, err := ConditionOfItemsOfPackOrder.BuildPredicates(map[string]string{ meta.PackOrderItemlst_PackOrderId.UrlParameterName: order.PackOrderId, }) @@ -511,7 +511,7 @@ func (self *PackOrderServiceImplement) ClosePackOrder(context *container.Request func (self *PackOrderServiceImplement) OpenPackOrder(context *container.RequestContext, orderId string) ([]model.PackTemplate, error) { /**** 校验条码 *****/ - bdal := basedal.NewLabelParserHeadDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) + bdal := basedal.NewLabelParserHeadDAO(context.Session(), self.session.User().PlantNr, self.session.User().UserId) data, err := bdal.SelectOne("Barcode") if err != nil { return nil, err @@ -519,7 +519,7 @@ func (self *PackOrderServiceImplement) OpenPackOrder(context *container.RequestC var artId string if utils.ValueIsEmpty(data.Split) { - lstdao := basedal.NewLabelParserDetailLstDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) + lstdao := basedal.NewLabelParserDetailLstDAO(context.Session(), self.session.User().PlantNr, self.session.User().UserId) list, err := lstdao.Select([]grmi.Predicate{ bmeta.LabelParserDetailLst_ParserId.NewPredicate(grmi.Equal, "Barcode"), }, nil) @@ -537,7 +537,7 @@ func (self *PackOrderServiceImplement) OpenPackOrder(context *container.RequestC artId = artIds[0] } - articleDAO := base.NewArticleDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) + articleDAO := base.NewArticleDAO(context.Session(), self.session.User().PlantNr, self.session.User().UserId) article, err := articleDAO.SelectOne(artId) if err != nil { return nil, err @@ -545,7 +545,7 @@ func (self *PackOrderServiceImplement) OpenPackOrder(context *container.RequestC if article == nil { return nil, grmi.NewBusinessError("没有在数据库中找到扫码内容对应的信息!") } - packTemplateDAO := dal.NewPackTemplateDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) + packTemplateDAO := dal.NewPackTemplateDAO(context.Session(), self.session.User().PlantNr, self.session.User().UserId) predicates, err := ConditionOfItemsOfPackOrderTemplate.BuildPredicates(map[string]string{}) if err != nil { return nil, err @@ -575,7 +575,7 @@ func (self *PackOrderServiceImplement) OpenPackOrder(context *container.RequestC ******************************************************************************/ func (self *PackOrderServiceImplement) OpenPackOrderWithTemplate(context *container.RequestContext, artId string, packTemplateId string) error { - articleDAO := base.NewArticleDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) + articleDAO := base.NewArticleDAO(context.Session(), self.session.User().PlantNr, self.session.User().UserId) article, err := articleDAO.SelectOne(artId) if err != nil { return err @@ -583,7 +583,7 @@ func (self *PackOrderServiceImplement) OpenPackOrderWithTemplate(context *contai if article == nil { return grmi.NewBusinessError("没有在数据库中找到扫码内容对应的信息!") } - packTemplateDAO := dal.NewPackTemplateDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) + packTemplateDAO := dal.NewPackTemplateDAO(context.Session(), self.session.User().PlantNr, self.session.User().UserId) packTemplate, err := packTemplateDAO.SelectOne(packTemplateId) if err != nil { return err @@ -684,13 +684,14 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *global.User, orde defer session.Close() /**** 校验条码 *****/ bdal := basedal.NewLabelParserHeadDAO(session, user.PlantNr, user.UserId) + snrDao := basedal.NewSnrDAO(session, user.PlantNr, user.UserId) data, err := bdal.SelectOne("Barcode") if err != nil { return nil, err } var artId string if utils.ValueIsEmpty(data.Split) { - lstdao := basedal.NewLabelParserDetailLstDAO(session, self.session.User().Pid, self.session.User().Userid) + lstdao := basedal.NewLabelParserDetailLstDAO(session, self.session.User().PlantNr, self.session.User().UserId) list, err := lstdao.Select([]grmi.Predicate{ bmeta.LabelParserDetailLst_ParserId.NewPredicate(grmi.Equal, "Barcode"), }, nil) @@ -785,9 +786,7 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *global.User, orde } //生成流水号 packTemplate := packTemplants[0] - snr := new(models.Snrtab) - snr.Finr = user.PlantNr - packOrderId, err := snr.GetNextSnr("PackOrder") + packOrderId, err := snrDao.GetNextSnr("PackOrder") if err != nil { packsession.Rollback() return nil, grmi.NewBusinessError("生成包装流水号失败!") @@ -956,13 +955,14 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *global.User, orderI /**** 校验条码 *****/ bdal := basedal.NewLabelParserHeadDAO(session, user.PlantNr, user.UserId) + snrDao := basedal.NewSnrDAO(session, user.PlantNr, user.UserId) data, err := bdal.SelectOne("Barcode") if err != nil { return nil, err } var artId string if utils.ValueIsEmpty(data.Split) { - lstdao := basedal.NewLabelParserDetailLstDAO(session, self.session.User().Pid, self.session.User().Userid) + lstdao := basedal.NewLabelParserDetailLstDAO(session, self.session.User().PlantNr, self.session.User().UserId) list, err := lstdao.Select([]grmi.Predicate{ bmeta.LabelParserDetailLst_ParserId.NewPredicate(grmi.Equal, "Barcode"), }, nil) @@ -1027,9 +1027,7 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *global.User, orderI } //生成流水号 packTemplate := packTemplants[0] - snr := new(models.Snrtab) - snr.Finr = user.PlantNr - packOrderId, err := snr.GetNextSnr("PackOrder") + packOrderId, err := snrDao.GetNextSnr("PackOrder") if err != nil { packsession.Rollback() return nil, grmi.NewBusinessError("生成包装流水号失败!") @@ -1111,6 +1109,7 @@ func (self *PackOrderServiceImplement) CreatePackOrderByTemplate(user *global.Us defer session.Close() articleDAO := base.NewArticleDAO(session, user.PlantNr, user.UserId) + snrDao := basedal.NewSnrDAO(session, user.PlantNr, user.UserId) article, err := articleDAO.SelectOne(packTemplate.MaterialId) if err != nil { return err @@ -1122,9 +1121,7 @@ func (self *PackOrderServiceImplement) CreatePackOrderByTemplate(user *global.Us //查询项目定义 //medal.NewProjectDAO(session, user.PlantNr, user.UserId) //生成流水号 - snr := new(models.Snrtab) - snr.Finr = user.PlantNr - packOrderId, err := snr.GetNextSnr("PackOrder") + packOrderId, err := snrDao.GetNextSnr("PackOrder") if err != nil { return grmi.NewBusinessError("生成包装流水号失败!") } diff --git a/services/log/implments/VendorUserLst.service.impl.go b/services/log/implments/VendorUserLst.service.impl.go index 3c0564b..76c0c01 100644 --- a/services/log/implments/VendorUserLst.service.impl.go +++ b/services/log/implments/VendorUserLst.service.impl.go @@ -3,12 +3,13 @@ package implments import ( + baseDal "LAPP_ACURA_MOM_BACKEND/dao/base" dal "LAPP_ACURA_MOM_BACKEND/dao/log" "LAPP_ACURA_MOM_BACKEND/db" + "LAPP_ACURA_MOM_BACKEND/global" "LAPP_ACURA_MOM_BACKEND/grmi" meta "LAPP_ACURA_MOM_BACKEND/meta/log" model "LAPP_ACURA_MOM_BACKEND/models/log" - "LAPP_ACURA_MOM_BACKEND/global" ) /****************************************************************************** @@ -97,6 +98,7 @@ func (impl *VendorUserLstServiceImplement) InsertOne(user *global.User, entity * session := engine.NewSession() defer session.Close() vendorDao := dal.NewVendorDAO(session, user.PlantNr, user.UserId) + userDao := baseDal.NewUserDAO(session, user.PlantNr, user.UserId) vendor, err := vendorDao.SelectOne(entity.VendorId) if err != nil { return err @@ -104,13 +106,20 @@ func (impl *VendorUserLstServiceImplement) InsertOne(user *global.User, entity * if vendor == nil { return grmi.NewBusinessError("不存在对应的供应商，请查看") } - var userTab models.Usertab - userTab.Userid = entity.UserId - userTab.Pid = user.PlantNr - _, err = userTab.Get() + //var userTab models.Usertab + //userTab.Userid = entity.UserId + //userTab.Pid = user.PlantNr + //_, err = userTab.Get() + //if err != nil { + // return err + //} + userData, err := userDao.SelectOne(entity.UserId) if err != nil { return err } + if userData == nil { + return grmi.NewBusinessError("不存在对应的用户") + } dao := dal.NewVendorUserLstDAO(session, user.PlantNr, user.UserId) record, err := dao.SelectOne(entity.VendorId, entity.UserId) if err != nil { @@ -225,6 +234,7 @@ func (impl *VendorUserLstServiceImplement) Insert(user *global.User, insertItem return err } dao := dal.NewVendorUserLstDAO(session, user.PlantNr, user.UserId) + userDao := baseDal.NewUserDAO(session, user.PlantNr, user.UserId) vendorDao := dal.NewVendorDAO(session, user.PlantNr, user.UserId) entities := make([]model.VendorUserLst, len(insertItem.Records)) @@ -236,15 +246,22 @@ func (impl *VendorUserLstServiceImplement) Insert(user *global.User, insertItem if vendor == nil { return grmi.NewBusinessError("不存在对应的供应商，请查看") } - var userTab models.Usertab - userTab.Userid = entity.UserId - userTab.Pid = user.PlantNr - user, err := userTab.Get() + //var userTab models.Usertab + //userTab.Userid = entity.UserId + //userTab.Pid = user.PlantNr + //user, err := userTab.Get() + //if err != nil { + // return err + //} + //if user.PlantNr == 0 { + // return grmi.NewBusinessError("不存在对应的用户，请查看") + //} + userData, err := userDao.SelectOne(entity.UserId) if err != nil { return err } - if user.PlantNr == 0 { - return grmi.NewBusinessError("不存在对应的用户，请查看") + if userData == nil { + return grmi.NewBusinessError("不存在对应的用户") } if entity.VendorId != insertItem.VendorId { return grmi.NewBusinessError("插入的数据与设置的vendorId不相符") diff --git a/services/om/DemandHeadFromDB.service.go b/services/om/DemandHeadFromDB.service.go index 85d946d..10b953e 100644 --- a/services/om/DemandHeadFromDB.service.go +++ b/services/om/DemandHeadFromDB.service.go @@ -3,9 +3,9 @@ package om import ( + "LAPP_ACURA_MOM_BACKEND/global" model "LAPP_ACURA_MOM_BACKEND/models/om" "LAPP_ACURA_MOM_BACKEND/services/om/implments" - "LAPP_ACURA_MOM_BACKEND/global" ) /****************************************************************************** @@ -173,21 +173,6 @@ type DemandHeadFromDBService interface { * ******************************************************************************/ Update(*global.User, *[]model.DemandHeadFromDB) error - /****************************************************************************** - * - * @Function Name : CreateParseTask - *----------------------------------------------------------------------------- - * - * @Description : 创建从数据库解析portal数据的任务 - * - * @Function Parameters : plantNr - * - * @Author : zhangxin - * - * @Date : 2021-05-18 - * - ******************************************************************************/ - CreateParseTask(int, string) } /****************************************************************************** diff --git a/services/om/implments/DemandHead.service.impl.go b/services/om/implments/DemandHead.service.impl.go index 009fd5c..f9ebc3d 100644 --- a/services/om/implments/DemandHead.service.impl.go +++ b/services/om/implments/DemandHead.service.impl.go @@ -7,12 +7,12 @@ import ( meDal "LAPP_ACURA_MOM_BACKEND/dao/me" dal "LAPP_ACURA_MOM_BACKEND/dao/om" "LAPP_ACURA_MOM_BACKEND/db" + "LAPP_ACURA_MOM_BACKEND/global" "LAPP_ACURA_MOM_BACKEND/grmi" meta "LAPP_ACURA_MOM_BACKEND/meta/om" baseModel "LAPP_ACURA_MOM_BACKEND/models/base" model "LAPP_ACURA_MOM_BACKEND/models/om" "LAPP_ACURA_MOM_BACKEND/utils" - "LAPP_ACURA_MOM_BACKEND/global" "github.com/360EntSecGroup-Skylar/excelize" "strconv" "strings" @@ -812,6 +812,7 @@ func (impl *DemandHeadServiceImplement) SaveIntervalDataFromExcel(user *global.U workOrderQtyDao := dal.NewWorkOrderQtyDAO(session, user.PlantNr, user.UserId) artDao := baseDal.NewArticleDAO(session, user.PlantNr, user.UserId) projectDao := meDal.NewProjectDAO(session, user.PlantNr, user.UserId) + snrDao := baseDal.NewSnrDAO(session, user.PlantNr, user.UserId) project, err := projectDao.SelectOne(baseModel.ProjectId) if err != nil { _ = session.Rollback() @@ -860,9 +861,7 @@ func (impl *DemandHeadServiceImplement) SaveIntervalDataFromExcel(user *global.U } } } - snr := new(models.Snrtab) - snr.Finr = user.PlantNr - workOrderId, err := snr.GetNextSnrWithSession(session, project.WorkOrderSnr) + workOrderId, err := snrDao.GetNextSnr(project.WorkOrderSnr) if err != nil { _ = session.Rollback() return grmi.NewBusinessError("获取工单流水号失败,错误:" + err.Error()) @@ -870,7 +869,7 @@ func (impl *DemandHeadServiceImplement) SaveIntervalDataFromExcel(user *global.U workOrder := model.WorkOrder{ WorkOrderId: workOrderId, ArtId: article.ArtId, - CustArtId: article.CustArtId, + CustArtId: article.CustArtId, OrderType: baseModel.ODER_TYPE_INTERVAL, OrderInfo: article.Descr1, PlanResourceGroupId: article.PlanResourceGroupId,