diff --git a/db/db.go b/db/db.go index 438a2ce..c71f537 100644 --- a/db/db.go +++ b/db/db.go @@ -100,7 +100,7 @@ func InitDb() error { if err != nil { return err } - Eloquent.ShowSQL(true) + //Eloquent.ShowSQL(true) return nil } diff --git a/services/ods/implments/ArtRouteOdsLst.service.impl.go b/services/ods/implments/ArtRouteOdsLst.service.impl.go index f500c3f..93d62e4 100644 --- a/services/ods/implments/ArtRouteOdsLst.service.impl.go +++ b/services/ods/implments/ArtRouteOdsLst.service.impl.go @@ -5,15 +5,12 @@ package implments import ( basedal "LAPP_ACURA_MOM_BACKEND/dao/base" dal "LAPP_ACURA_MOM_BACKEND/dao/ods" + omdal "LAPP_ACURA_MOM_BACKEND/dao/om" "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/ods" - bmodel "LAPP_ACURA_MOM_BACKEND/models/base" model "LAPP_ACURA_MOM_BACKEND/models/ods" - "LAPP_ACURA_MOM_BACKEND/utils" - "strings" ) /****************************************************************************** @@ -222,32 +219,18 @@ func (impl *ArtRouteOdsLstServiceImplement) SelectOneByWorkPlaceId(user *global. defer session.Close() dao := dal.NewArtRouteOdsLstDAO(session, user.PlantNr, user.UserId) - /**** 校验条码 *****/ - bdal := basedal.NewLabelParserHeadDAO(session, user.PlantNr, user.UserId) - data, err := bdal.SelectOne("Barcode") + //获取物料id + omDao := omdal.NewSerialOrderDAO(session, user.PlantNr, user.UserId) + + resultSeri, err := omDao.SelectOne(orderId) if err != nil { return nil, err } - var artId string - if utils.ValueIsEmpty(data.Split) { - lstdao := basedal.NewLabelParserDetailLstDAO(session, user.PlantNr, user.UserId) - list, err := lstdao.Select([]grmi.Predicate{ - bmeta.LabelParserDetailLst_ParserId.NewPredicate(grmi.Equal, "Barcode"), - }, nil) - if err != nil { - return nil, err - } - data.Valst = list - if len(orderId) < data.Length { - return nil, grmi.NewBusinessError("序列订单错误!") - } - codeInfos := bmodel.ParseBarcode(orderId, data.Valst) - artId = codeInfos["artId"] - } else { - artIds := strings.Split(orderId, data.Split) - artId = artIds[0] + if resultSeri == nil{ + return nil, grmi.NewBusinessError("序列订单不存在!") } + artId := resultSeri.ArtId //根据工位编号查询工位Id placeDao := basedal.NewWorkPlaceDAO(session, user.PlantNr, user.UserId) @@ -467,30 +450,18 @@ func (impl *ArtRouteOdsLstServiceImplement) SelectByArtId(user *global.User, ord session := engine.NewSession() defer session.Close() - bdal := basedal.NewLabelParserHeadDAO(session, user.PlantNr, user.UserId) - data, err := bdal.SelectOne("Barcode") + //获取物料id + omDao := omdal.NewSerialOrderDAO(session, user.PlantNr, user.UserId) + + resultSeri, err := omDao.SelectOne(orderId) if err != nil { return nil, err } - var artId string - if utils.ValueIsEmpty(data.Split) { - lstdao := basedal.NewLabelParserDetailLstDAO(session, user.PlantNr, user.UserId) - list, err := lstdao.Select([]grmi.Predicate{ - bmeta.LabelParserDetailLst_ParserId.NewPredicate(grmi.Equal, "Barcode"), - }, nil) - if err != nil { - return nil, err - } - data.Valst = list - if len(orderId) < data.Length { - return nil, grmi.NewBusinessError("序列订单错误!") - } - codeInfos := bmodel.ParseBarcode(orderId, data.Valst) - artId = codeInfos["artId"] - } else { - artIds := strings.Split(orderId, data.Split) - artId = artIds[0] + + if resultSeri == nil{ + return nil, grmi.NewBusinessError("序列订单不存在!") } + artId := resultSeri.ArtId dao := dal.NewArtRouteOdsLstDAO(session, user.PlantNr, user.UserId) result, err := dao.SelectByArtId(artId) if err != nil { diff --git a/services/qm/View.service.go b/services/qm/View.service.go index 7937ee6..f788e4c 100644 --- a/services/qm/View.service.go +++ b/services/qm/View.service.go @@ -3,7 +3,6 @@ package qm import ( - "LAPP_ACURA_MOM_BACKEND/container" "LAPP_ACURA_MOM_BACKEND/global" model "LAPP_ACURA_MOM_BACKEND/models/qm" "LAPP_ACURA_MOM_BACKEND/services/qm/implments" @@ -194,7 +193,7 @@ type ViewService interface { * @Date : 2021-03-18 * ******************************************************************************/ - ViewsOfArticle(*container.RequestContext, string) ([]model.View, error) + ViewsOfArticle(*global.User, string) ([]model.View, error) } /****************************************************************************** diff --git a/services/qm/implments/DefectRecord.service.impl.go b/services/qm/implments/DefectRecord.service.impl.go index 6fda5a1..de0c066 100644 --- a/services/qm/implments/DefectRecord.service.impl.go +++ b/services/qm/implments/DefectRecord.service.impl.go @@ -3,21 +3,16 @@ package implments import ( - basedal "LAPP_ACURA_MOM_BACKEND/dao/base" omdal "LAPP_ACURA_MOM_BACKEND/dao/om" dal "LAPP_ACURA_MOM_BACKEND/dao/qm" "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/qm" common "LAPP_ACURA_MOM_BACKEND/models/base" model "LAPP_ACURA_MOM_BACKEND/models/qm" - "LAPP_ACURA_MOM_BACKEND/utils" - "fmt" "strconv" - "strings" "time" ) @@ -255,31 +250,18 @@ func (impl *DefectRecordServiceImplement) Insert(user *global.User, entities mod } orderId := entities.SerialorderId - bdal := basedal.NewLabelParserHeadDAO(session, user.PlantNr, user.UserId) + //获取物料id + omDao := omdal.NewSerialOrderDAO(session, user.PlantNr, user.UserId) - result, err := bdal.SelectOne("Barcode") + result, err := omDao.SelectOne(orderId) if err != nil { return err } - var artId string - if utils.ValueIsEmpty(result.Split) { - lstdao := basedal.NewLabelParserDetailLstDAO(session, user.PlantNr, user.UserId) - list, err := lstdao.Select([]grmi.Predicate{ - bmeta.LabelParserDetailLst_ParserId.NewPredicate(grmi.Equal, "Barcode"), - }, nil) - if err != nil { - return err - } - result.Valst = list - if len(orderId) < result.Length { - return grmi.NewBusinessError("序列订单错误!") - } - codeInfos := common.ParseBarcode(orderId, result.Valst) - artId = codeInfos["artId"] - } else { - artIds := strings.Split(orderId, result.Split) - artId = artIds[0] + if result == nil { + return grmi.NewBusinessError("序列订单不存在!") } + artId := result.ArtId + if count <= 0 { //判断是否是修复 if OrderInfo != nil && OrderInfo.Status == common.CHECK_STATUS_RUNNING { diff --git a/services/qm/implments/View.service.impl.go b/services/qm/implments/View.service.impl.go index 8133f60..d36b856 100644 --- a/services/qm/implments/View.service.impl.go +++ b/services/qm/implments/View.service.impl.go @@ -5,20 +5,15 @@ package implments import ( "LAPP_ACURA_MOM_BACKEND/container" dalOfBase "LAPP_ACURA_MOM_BACKEND/dao/base" + omdal "LAPP_ACURA_MOM_BACKEND/dao/om" dal "LAPP_ACURA_MOM_BACKEND/dao/qm" "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/qm" - common "LAPP_ACURA_MOM_BACKEND/models/base" model "LAPP_ACURA_MOM_BACKEND/models/qm" - "LAPP_ACURA_MOM_BACKEND/utils" - - basedal "LAPP_ACURA_MOM_BACKEND/dao/base" "fmt" "github.com/go-xorm/xorm" - "strings" ) const ( @@ -594,39 +589,28 @@ func (impl *ViewServiceImplement) Update(user *global.User, entities *[]model.Vi * @Reference LAPP_ACURA_MOM_BACKEND/services/qm/ViewService.ViewsOfArticle * ******************************************************************************/ -func (impl *ViewServiceImplement) ViewsOfArticle(context *container.RequestContext, orderId string) ([]model.View, error) { +func (impl *ViewServiceImplement) ViewsOfArticle(user *global.User, orderId string) ([]model.View, error) { - grmi.Log(impl.session.User(), "/C:/Users/Wei Chenglei/source/repos/GAAS_BackEnd/services/qm/implments/QM_View.service.impl.go", "ViewsOfArticle", "查询与指定Article关联的视图") + grmi.Log(user, "/C:/Users/Wei Chenglei/source/repos/GAAS_BackEnd/services/qm/implments/QM_View.service.impl.go", "ViewsOfArticle", "查询与指定Article关联的视图") - //截取物料id - bdal := basedal.NewLabelParserHeadDAO(context.Session(), impl.session.User().PlantNr, impl.session.User().UserId) + engine := db.Eloquent.Master() + session := engine.NewSession() + defer session.Close() + //获取物料id + omDao := omdal.NewSerialOrderDAO(session, user.PlantNr, user.UserId) - result, err := bdal.SelectOne("Barcode") + result, err := omDao.SelectOne(orderId) if err != nil { return nil, err } - var artId string - if utils.ValueIsEmpty(result.Split) { - lstdao := basedal.NewLabelParserDetailLstDAO(context.Session(), impl.session.User().PlantNr, impl.session.User().UserId) - list, err := lstdao.Select([]grmi.Predicate{ - bmeta.LabelParserDetailLst_ParserId.NewPredicate(grmi.Equal, "Barcode"), - }, nil) - if err != nil { - return nil, err - } - result.Valst = list - if len(orderId) < result.Length { - return nil, grmi.NewBusinessError("序列订单错误!") - } - codeInfos := common.ParseBarcode(orderId, result.Valst) - artId = codeInfos["artId"] - } else { - artIds := strings.Split(orderId, result.Split) - artId = artIds[0] + if result == nil { + return nil, grmi.NewBusinessError("序列订单不存在!") } + artId := result.ArtId + // 获取Article - articleDAO := dalOfBase.NewArticleDAO(context.Session(), impl.session.User().PlantNr, impl.session.User().UserId) + articleDAO := dalOfBase.NewArticleDAO(session, user.PlantNr, user.UserId) article, err := articleDAO.SelectOne(artId) if err != nil { return nil, err @@ -635,7 +619,7 @@ func (impl *ViewServiceImplement) ViewsOfArticle(context *container.RequestConte return nil, grmi.NewBusinessError("不存在指定Article!") } // 获取Article和视图的关联 - artViewDAO := dal.NewArtViewDAO(context.Session(), impl.session.User().PlantNr, impl.session.User().UserId) + artViewDAO := dal.NewArtViewDAO(session, user.PlantNr, user.UserId) artViews, err := artViewDAO.Select([]grmi.Predicate{meta.ArtView_ArtId.NewPredicate(grmi.Equal, article.ArtId)}, nil) if err != nil { return nil, err @@ -646,7 +630,7 @@ func (impl *ViewServiceImplement) ViewsOfArticle(context *container.RequestConte viewIds[i] = artView.ViewId } // 获取视图 - viewDAO := dal.NewViewDAO(context.Session(), impl.session.User().PlantNr, impl.session.User().UserId) + viewDAO := dal.NewViewDAO(session, user.PlantNr, user.UserId) views, err := viewDAO.Select([]grmi.Predicate{meta.View_ViewId.NewPredicate(grmi.Include, viewIds...)}, nil) if err != nil { return nil, err @@ -657,7 +641,7 @@ func (impl *ViewServiceImplement) ViewsOfArticle(context *container.RequestConte viewMapping[view.ViewId] = &views[index] } // 获取视图区域 - viewValstDAO := dal.NewViewValstDAO(context.Session(), impl.session.User().PlantNr, impl.session.User().UserId) + viewValstDAO := dal.NewViewValstDAO(session, user.PlantNr, user.UserId) areas, err := viewValstDAO.Select([]grmi.Predicate{meta.ViewValst_ViewId.NewPredicate(grmi.Include, viewIds...)}, nil) if err != nil { return nil, err @@ -670,7 +654,7 @@ func (impl *ViewServiceImplement) ViewsOfArticle(context *container.RequestConte } } // 获取视图缺陷分组关联 - viewDefectGrplstDAO := dal.NewViewDefectGrplstDAO(context.Session(), impl.session.User().PlantNr, impl.session.User().UserId) + viewDefectGrplstDAO := dal.NewViewDefectGrplstDAO(session, user.PlantNr, user.UserId) viewGroups, err := viewDefectGrplstDAO.Select([]grmi.Predicate{meta.ViewDefectGrplst_ViewId.NewPredicate(grmi.Include, viewIds...)}, nil) if err != nil { return nil, err @@ -688,7 +672,7 @@ func (impl *ViewServiceImplement) ViewsOfArticle(context *container.RequestConte group2ViewMapping[viewGroup.DefectGrpId] = append(viewIds, viewGroup.ViewId) } // 获取缺陷缺陷分组 - defectGrpDAO := dal.NewDefectGrpDAO(context.Session(), impl.session.User().PlantNr, impl.session.User().UserId) + defectGrpDAO := dal.NewDefectGrpDAO(session, user.PlantNr, user.UserId) groups, err := defectGrpDAO.Select([]grmi.Predicate{meta.DefectGrp_DefectGrpId.NewPredicate(grmi.Include, groupIds...)}, nil) if err != nil { return nil, err @@ -700,7 +684,7 @@ func (impl *ViewServiceImplement) ViewsOfArticle(context *container.RequestConte groupMapping[group.DefectGrpId] = &groups[index] } // 获取缺陷分组关联 - defectGrpReasonLstDAO := dal.NewDefectGrpReasonLstDAO(context.Session(), impl.session.User().PlantNr, impl.session.User().UserId) + defectGrpReasonLstDAO := dal.NewDefectGrpReasonLstDAO(session, user.PlantNr, user.UserId) groupReasons, err := defectGrpReasonLstDAO.Select([]grmi.Predicate{meta.DefectGrpReasonLst_DefectGrpId.NewPredicate(grmi.Include, groupIds...)}, nil) if err != nil { return nil, err @@ -718,7 +702,7 @@ func (impl *ViewServiceImplement) ViewsOfArticle(context *container.RequestConte reason2GroupMapping[groupReason.DefectReasonId] = append(groupIds, groupReason.DefectGrpId) } // 获取缺陷原因 - defectReasonDAO := dal.NewDefectReasonDAO(context.Session(), impl.session.User().PlantNr, impl.session.User().UserId) + defectReasonDAO := dal.NewDefectReasonDAO(session, user.PlantNr, user.UserId) reasons, err := defectReasonDAO.Select([]grmi.Predicate{meta.DefectReason_DefectReasonId.NewPredicate(grmi.Include, reasonIds...)}, nil) if err != nil { return nil, err diff --git a/web/controllers/qm/View.rest.go b/web/controllers/qm/View.rest.go index 12440cb..fef5cd7 100644 --- a/web/controllers/qm/View.rest.go +++ b/web/controllers/qm/View.rest.go @@ -188,6 +188,47 @@ func RegisterSelectOneView(party router.Party, path string, method func(*global. }) } + +/****************************************************************************** + * + * @Function Name : RegisterViewsOfArticle + *----------------------------------------------------------------------------- + * + * @Description : 为一个查找单条View的方法注册路由 + * + * @Function Parameters : 路由分组 + * + * @Function Parameters : 路径 + * + * @Function Parameters : 实际处理请求的方法 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-03-18 22:49:12 + * + ******************************************************************************/ +func RegisterViewsOfArticle(party router.Party, path string, method func(*global.User, string) ([]model.View, error)) { + + party.Post(path+"/{orderId:string}", func(ctx iris.Context) { + user, ok := jwts.ParseToken(ctx) + if !ok { + return + } + + viewId := ctx.Params().GetString("orderId") + result, err := method(user, viewId) + if err != nil { + supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil) + return + } + if result == nil { + supports.Error(ctx, iris.StatusNotFound, supports.NotFound, nil) + return + } + supports.Ok(ctx, supports.OptionSuccess, result) + }) +} + /****************************************************************************** * * @Function Name : RegisterUpdateOneView diff --git a/web/controllers/qm/qm.go b/web/controllers/qm/qm.go index d056f9e..c2d027a 100644 --- a/web/controllers/qm/qm.go +++ b/web/controllers/qm/qm.go @@ -61,6 +61,8 @@ func RegisterRoutes() { RegisterSelectView(view, "/query", serviceOfView.Select) // View查询一条 RegisterSelectOneView(view, "/get", serviceOfView.SelectOne) + // View查询一条 + RegisterViewsOfArticle(view, "/viewsofarticle", serviceOfView.ViewsOfArticle) // View修改一条 RegisterUpdateOneView(view, "/updateone", serviceOfView.UpdateOne) // View修改多条 diff --git a/web/routes/routes.go b/web/routes/routes.go index 22c7c3e..b2ec4d4 100644 --- a/web/routes/routes.go +++ b/web/routes/routes.go @@ -16,6 +16,7 @@ import ( _ "LAPP_ACURA_MOM_BACKEND/web/controllers/pln" _ "LAPP_ACURA_MOM_BACKEND/web/controllers/pm" _ "LAPP_ACURA_MOM_BACKEND/web/controllers/qm" + _ "LAPP_ACURA_MOM_BACKEND/web/controllers/ods" "LAPP_ACURA_MOM_BACKEND/web/middleware" "LAPP_ACURA_MOM_BACKEND/web/middleware/cors" "github.com/kataras/iris/v12"