From dfaa211aecddd8fa36b52e34e1e0927ec995d45e Mon Sep 17 00:00:00 2001 From: zhangxin Date: Wed, 24 Nov 2021 11:29:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E8=BF=87artId?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94=E7=9A=84=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/base/ArticleAtcodLst.dao.go | 19 ++ .../implments/ArticleAtcodLst.dao.impl.go | 33 +++ services/base/ArticleAtcodLst.service.go | 21 ++ .../implments/ArticleAtcodLst.service.impl.go | 56 +++++ web/controllers/base/ArticleAtcodLst.rest.go | 45 ++++ web/controllers/base/base.go | 208 +++++++++++------- 6 files changed, 301 insertions(+), 81 deletions(-) diff --git a/dao/base/ArticleAtcodLst.dao.go b/dao/base/ArticleAtcodLst.dao.go index 888cc32..d1d00b0 100644 --- a/dao/base/ArticleAtcodLst.dao.go +++ b/dao/base/ArticleAtcodLst.dao.go @@ -280,6 +280,25 @@ type ArticleAtcodLstDAO interface { * ******************************************************************************/ SelectAllWithAttrValue() ([]model.ArticleWithAttrValue, error) + /****************************************************************************** + * + * @Function Name : SelectByArtId + *----------------------------------------------------------------------------- + * + * @Description : 通过artid查询所有绑定的属性 + * + * @Function Parameters : artId + * + * @Return Value : []model.ArticleWithAttrValue + * + * @Return Value : 执行时发生的错误 + * + * @Author : zhangxin + * + * @Date : 2021-11-23 + * + ******************************************************************************/ + SelectByArtId(artId string) ([]model.ArticleRelateAttribute, error) } /****************************************************************************** diff --git a/dao/base/implments/ArticleAtcodLst.dao.impl.go b/dao/base/implments/ArticleAtcodLst.dao.impl.go index 7180c2d..3722912 100644 --- a/dao/base/implments/ArticleAtcodLst.dao.impl.go +++ b/dao/base/implments/ArticleAtcodLst.dao.impl.go @@ -366,3 +366,36 @@ func (impl *ArticleAtcodLstDAOImplement) SelectAllWithAttrValue() ([]model.Artic } return result, err } + +/****************************************************************************** + * + * @Reference LAPP_ACURA_MOM_BACKEND/dao/base/ArticleAtcodLstDAOImplement.SelectByArtId + * + ******************************************************************************/ +func (impl *ArticleAtcodLstDAOImplement) SelectByArtId(artId string) ([]model.ArticleRelateAttribute, error) { + var err error + result := make([]model.ArticleRelateAttribute, 0) + valueCondition := fmt.Sprintf("%s = %s and %s = %s and %s = %s", + meta.ArticleAtcodLst_PlantNr.ColumnName, + meta.AttributeValst_PlantNr.ColumnName, + meta.ArticleAtcodLst_AttrCode.ColumnName, + meta.AttributeValst_AttrCode.ColumnName, + meta.ArticleAtcodLst_AttrValue.ColumnName, + meta.AttributeValst_AttrValue.ColumnName, + ) + codeCondition := fmt.Sprintf("%s = %s and %s = %s", + meta.ArticleAtcodLst_PlantNr.ColumnName, + meta.Attribute_PlantNr.ColumnName, + meta.ArticleAtcodLst_AttrCode.ColumnName, + meta.Attribute_AttrCode.ColumnName, + ) + where := fmt.Sprintf("%s = ? and %s = ?", + meta.ArticleAtcodLst_PlantNr.ColumnName, + meta.ArticleAtcodLst_ArtId.ColumnName) + parameters := []interface{}{impl.plantNr, artId} + err = impl.session.Table(impl.meta.TableName).Join("LEFT", meta.AttributeValst.TableName, valueCondition).Join("LEFT", meta.Attribute.TableName, codeCondition).Where(where, parameters...).Find(&result) + if err != nil { + return nil, err + } + return result, err +} diff --git a/services/base/ArticleAtcodLst.service.go b/services/base/ArticleAtcodLst.service.go index c38cc64..0fdbe6a 100644 --- a/services/base/ArticleAtcodLst.service.go +++ b/services/base/ArticleAtcodLst.service.go @@ -189,6 +189,27 @@ type ArticleAtcodLstService interface { * ******************************************************************************/ Update(*global.User, *[]model.ArticleAtcodLst) error + /****************************************************************************** + * + * @Function Name : SelectAttrCodeAndValueByArtId + *----------------------------------------------------------------------------- + * + * @Description : 通过artId查询关联的属性 + * + * @Function Parameters : 当前访问人员信息 + * + * @Function Parameters : artId + * + * @Return Value : 关联的属性 + * + * @Return Value : 执行时发生的错误 + * + * @Author : zhangxin + * + * @Date : 2021-11-23 + * + ******************************************************************************/ + SelectAttrCodeAndValueByArtId(user *global.User, artId string) (interface{}, error) } /****************************************************************************** diff --git a/services/base/implments/ArticleAtcodLst.service.impl.go b/services/base/implments/ArticleAtcodLst.service.impl.go index 3fe1370..c9532cd 100644 --- a/services/base/implments/ArticleAtcodLst.service.impl.go +++ b/services/base/implments/ArticleAtcodLst.service.impl.go @@ -331,3 +331,59 @@ func (impl *ArticleAtcodLstServiceImplement) Update(user *global.User, entities } return nil } + + +/****************************************************************************** + * + * @Reference LAPP_ACURA_MOM_BACKEND/services/base/ArticleAtcodLstService.SelectAttrCodeAndValueByArtId + * + ******************************************************************************/ +func (impl *ArticleAtcodLstServiceImplement) SelectAttrCodeAndValueByArtId(user *global.User, artId string) (interface{}, error) { + + grmi.Log(user, "/services/base/implments/ArticleAtcodLst.service.impl.go", "SelectAttrCodeAndValueByArtId", "通过artId查询关联的所有属性集") + + engine := db.Eloquent.Master() + session := engine.NewSession() + defer session.Close() + dao := dal.NewArticleAtcodLstDAO(session, user.PlantNr, user.UserId) + li, err := dao.SelectByArtId(artId) + if err != nil { + return nil, grmi.NewBusinessError("查询物料属性相关数据失败, error:" + err.Error()) + } + type AttrValue struct { + Value string `json:"value"` + ValueDesc string `json:"valueDesc"` + } + type Attribute struct { + Code int `json:"code"` + CodeDesc string `json:"CodeDesc"` + ValueLi []AttrValue `json:"valueLi"` + } + result := make([]Attribute, 0) + tempMap := make(map[int][]model.ArticleRelateAttribute) + for _, data := range li { + _, exist := tempMap[data.ArticleAtcodLst.AttrCode] + if !exist { + tempMap[data.ArticleAtcodLst.AttrCode] = make([]model.ArticleRelateAttribute, 0) + } + tempMap[data.ArticleAtcodLst.AttrCode] = append(tempMap[data.ArticleAtcodLst.AttrCode], data) + } + + for attrCode, attributeLi := range tempMap { + attrCodeData := Attribute{ + Code: attrCode, + CodeDesc: attributeLi[0].Attribute.Descr, + ValueLi: make([]AttrValue, 0), + } + for _, item := range attributeLi { + attrValueData := AttrValue{ + Value: item.ArticleAtcodLst.AttrValue, + ValueDesc: item.AttributeValst.Descr, + } + attrCodeData.ValueLi = append(attrCodeData.ValueLi, attrValueData) + } + result = append(result, attrCodeData) + } + + return result, nil +} diff --git a/web/controllers/base/ArticleAtcodLst.rest.go b/web/controllers/base/ArticleAtcodLst.rest.go index dab000c..80037a5 100644 --- a/web/controllers/base/ArticleAtcodLst.rest.go +++ b/web/controllers/base/ArticleAtcodLst.rest.go @@ -381,3 +381,48 @@ func RegisterUpdateArticleAtcodLst(party router.Party, path string, method func( RegisterMultiArticleAtcodLst(party, "PUT", path, method) } + + +/****************************************************************************** + * + * @Function Name : RegisterSelectAttrCodeAndValueByArtId + *----------------------------------------------------------------------------- + * + * @Description : 为一个通过artId查询关联的属性的方法注册路由 + * + * @Function Parameters : 路由分组 + * + * @Function Parameters : 路径 + * + * @Function Parameters : 实际处理请求的方法 + * + * @Author : zhangxin + * + * @Date : 2021-11-23 + * + ******************************************************************************/ +func RegisterSelectAttrCodeAndValueByArtId(party router.Party, path string, method func(*global.User, string) (interface{}, error)) { + + party.Get(path, func(ctx iris.Context) { + user, ok := jwts.ParseToken(ctx) + if !ok { + return + } + + artId := ctx.URLParam("artId") + if artId == "" { + supports.Error(ctx, iris.StatusBadRequest, "未获取到物料ID参数", nil) + return + } + result, err := method(user, artId) + 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) + }) +} \ No newline at end of file diff --git a/web/controllers/base/base.go b/web/controllers/base/base.go index 40123fb..08b5f7f 100644 --- a/web/controllers/base/base.go +++ b/web/controllers/base/base.go @@ -17,7 +17,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-09-09 10:59:52 + * @Date : 2021-11-23 11:13:02 * ******************************************************************************/ func RegisterRoutes() { @@ -505,6 +505,8 @@ func RegisterRoutes() { // RegisterUpdateOneArticleAtcodLst(articleatcodlst, "/updateone", serviceOfArticleAtcodLst.UpdateOne) // ArticleAtcodLst修改多条 // RegisterUpdateArticleAtcodLst(articleatcodlst, "/update", serviceOfArticleAtcodLst.Update) + // ArticleAtcodLst 通过artId查询关联的属性 + RegisterSelectAttrCodeAndValueByArtId(articleatcodlst, "/selectbyartid", serviceOfArticleAtcodLst.SelectAttrCodeAndValueByArtId) // WorkLineWorkPlaceLst的路由组 worklineworkplacelst := party.Party("/worklineworkplacelst") @@ -649,9 +651,11 @@ func RegisterRoutes() { // Operation删除多条 // RegisterDeleteOperation(operation, "/delete", serviceOfOperation.Delete) // Operation查询多条 - RegisterSelectOperation(operation, "/query", serviceOfOperation.Select) + RegisterSelectOperation(operation, "/selectlist", serviceOfOperation.Select) + // Operation查询多条并分页 + RegisterQueryOperation(operation, "/query", serviceOfOperation.SelectAndPaging) // Operation查询一条 - RegisterSelectOneOperation(operation, "/get", serviceOfOperation.SelectOne) + RegisterSelectOneOperation(operation, "/selectone", serviceOfOperation.SelectOne) // Operation修改一条 RegisterUpdateOneOperation(operation, "/updateone", serviceOfOperation.UpdateOne) // Operation修改多条 @@ -719,8 +723,8 @@ func RegisterRoutes() { RegisterUpdateOneArtCheckRule(artcheckrule, "/updateone", serviceOfArtCheckRule.UpdateOne) // ArtCheckRule修改多条 // RegisterUpdateArtCheckRule(artcheckrule, "/update", serviceOfArtCheckRule.Update) - // ArtCheckRule保存多条 - RegisterSaveArtCheckRule(artcheckrule, "/save", serviceOfArtCheckRule.Save) + // ArtCheckRule 通过物料查询匹配的零件校验规则 + RegisterSelectArtCheckRuleByArt(artcheckrule, "/selectbyart", serviceOfArtCheckRule.SelectByArt) // ArtQtyAllocate的路由组 artqtyallocate := party.Party("/artqtyallocate") @@ -743,7 +747,7 @@ func RegisterRoutes() { // ArtQtyAllocate修改多条 // RegisterUpdateArtQtyAllocate(artqtyallocate, "/update", serviceOfArtQtyAllocate.Update) // ArtQtyAllocate保存多条 - RegisterSaveArtQtyAllocate(artqtyallocate, "/save", serviceOfArtQtyAllocate.Save) + //RegisterSaveArtQtyAllocate(artqtyallocate, "/save", serviceOfArtQtyAllocate.Save) // SpecArtShareAllocate的路由组 specartshareallocate := party.Party("/specartshareallocate") @@ -779,9 +783,11 @@ func RegisterRoutes() { // OPCBasicComInfo删除多条 // RegisterDeleteOPCBasicComInfo(opcbasiccominfo, "/delete", serviceOfOPCBasicComInfo.Delete) // OPCBasicComInfo查询多条 - RegisterSelectOPCBasicComInfo(opcbasiccominfo, "/query", serviceOfOPCBasicComInfo.Select) + RegisterSelectOPCBasicComInfo(opcbasiccominfo, "/selectlist", serviceOfOPCBasicComInfo.Select) + // OPCBasicComInfo查询多条并分页 + RegisterQueryOPCBasicComInfo(opcbasiccominfo, "/query", serviceOfOPCBasicComInfo.SelectAndPaging) // OPCBasicComInfo查询一条 - RegisterSelectOneOPCBasicComInfo(opcbasiccominfo, "/get", serviceOfOPCBasicComInfo.SelectOne) + RegisterSelectOneOPCBasicComInfo(opcbasiccominfo, "/selectone", serviceOfOPCBasicComInfo.SelectOne) // OPCBasicComInfo修改一条 RegisterUpdateOneOPCBasicComInfo(opcbasiccominfo, "/updateone", serviceOfOPCBasicComInfo.UpdateOne) // OPCBasicComInfo修改多条 @@ -802,9 +808,11 @@ func RegisterRoutes() { // OPCComDetailRule删除多条 // RegisterDeleteOPCComDetailRule(opccomdetailrule, "/delete", serviceOfOPCComDetailRule.Delete) // OPCComDetailRule查询多条 - RegisterSelectOPCComDetailRule(opccomdetailrule, "/query", serviceOfOPCComDetailRule.Select) + RegisterSelectOPCComDetailRule(opccomdetailrule, "/selectlist", serviceOfOPCComDetailRule.Select) + // OPCComDetailRule查询多条并分页 + RegisterQueryOPCComDetailRule(opccomdetailrule, "/query", serviceOfOPCComDetailRule.SelectAndPaging) // OPCComDetailRule查询一条 - RegisterSelectOneOPCComDetailRule(opccomdetailrule, "/get", serviceOfOPCComDetailRule.SelectOne) + RegisterSelectOneOPCComDetailRule(opccomdetailrule, "/selectone", serviceOfOPCComDetailRule.SelectOne) // OPCComDetailRule修改一条 RegisterUpdateOneOPCComDetailRule(opccomdetailrule, "/updateone", serviceOfOPCComDetailRule.UpdateOne) // OPCComDetailRule修改多条 @@ -823,34 +831,61 @@ func RegisterRoutes() { // OPCComRule删除多条 // RegisterDeleteOPCComRule(opccomrule, "/delete", serviceOfOPCComRule.Delete) // OPCComRule查询多条 - RegisterSelectOPCComRule(opccomrule, "/query", serviceOfOPCComRule.Select) + RegisterSelectOPCComRule(opccomrule, "/selectlist", serviceOfOPCComRule.Select) + // OPCComRule查询多条并分页 + RegisterQueryOPCComRule(opccomrule, "/query", serviceOfOPCComRule.SelectAndPaging) // OPCComRule查询一条 - RegisterSelectOneOPCComRule(opccomrule, "/get", serviceOfOPCComRule.SelectOne) + RegisterSelectOneOPCComRule(opccomrule, "/selectone", serviceOfOPCComRule.SelectOne) // OPCComRule修改一条 RegisterUpdateOneOPCComRule(opccomrule, "/updateone", serviceOfOPCComRule.UpdateOne) // OPCComRule修改多条 // RegisterUpdateOPCComRule(opccomrule, "/update", serviceOfOPCComRule.Update) - // Process的路由组 - process := party.Party("/process") - // Process的服务实例 - var serviceOfProcess = svr.NewProcessService() - // Process插入一条 - RegisterInsertOneProcess(process, "/insertone", serviceOfProcess.InsertOne) - // Process插入多条 - // RegisterInsertProcess(process, "/insert", serviceOfProcess.Insert) - // Process删除一条 - RegisterDeleteOneProcess(process, "/deleteone", serviceOfProcess.DeleteOne) - // Process删除多条 - // RegisterDeleteProcess(process, "/delete", serviceOfProcess.Delete) - // Process查询多条 - RegisterSelectProcess(process, "/query", serviceOfProcess.Select) - // Process查询一条 - RegisterSelectOneProcess(process, "/get", serviceOfProcess.SelectOne) - // Process修改一条 - RegisterUpdateOneProcess(process, "/updateone", serviceOfProcess.UpdateOne) - // Process修改多条 - // RegisterUpdateProcess(process, "/update", serviceOfProcess.Update) + // ScanRuleInfo的路由组 + scanruleinfo := party.Party("/scanruleinfo") + // ScanRuleInfo的服务实例 + var serviceOfScanRuleInfo = svr.NewScanRuleInfoService() + // ScanRuleInfo插入一条 + RegisterInsertOneScanRuleInfo(scanruleinfo, "/insertone", serviceOfScanRuleInfo.InsertOne) + // ScanRuleInfo插入多条 + // RegisterInsertScanRuleInfo(scanruleinfo, "/insert", serviceOfScanRuleInfo.Insert) + // ScanRuleInfo删除一条 + RegisterDeleteOneScanRuleInfo(scanruleinfo, "/deleteone", serviceOfScanRuleInfo.DeleteOne) + // ScanRuleInfo删除多条 + // RegisterDeleteScanRuleInfo(scanruleinfo, "/delete", serviceOfScanRuleInfo.Delete) + // ScanRuleInfo查询多条 + RegisterSelectScanRuleInfo(scanruleinfo, "/selectlist", serviceOfScanRuleInfo.Select) + // ScanRuleInfo查询多条并分页 + RegisterQueryScanRuleInfo(scanruleinfo, "/query", serviceOfScanRuleInfo.SelectAndPaging) + // ScanRuleInfo查询一条 + RegisterSelectOneScanRuleInfo(scanruleinfo, "/selectone", serviceOfScanRuleInfo.SelectOne) + // ScanRuleInfo修改一条 + RegisterUpdateOneScanRuleInfo(scanruleinfo, "/updateone", serviceOfScanRuleInfo.UpdateOne) + // ScanRuleInfo修改多条 + // RegisterUpdateScanRuleInfo(scanruleinfo, "/update", serviceOfScanRuleInfo.Update) + + // PrintBasicRuleInfo的路由组 + printbasicruleinfo := party.Party("/printbasicruleinfo") + // PrintBasicRuleInfo的服务实例 + var serviceOfPrintBasicRuleInfo = svr.NewPrintBasicRuleInfoService() + // PrintBasicRuleInfo插入一条 + RegisterInsertOnePrintBasicRuleInfo(printbasicruleinfo, "/insertone", serviceOfPrintBasicRuleInfo.InsertOne) + // PrintBasicRuleInfo插入多条 + // RegisterInsertPrintBasicRuleInfo(printbasicruleinfo, "/insert", serviceOfPrintBasicRuleInfo.Insert) + // PrintBasicRuleInfo删除一条 + RegisterDeleteOnePrintBasicRuleInfo(printbasicruleinfo, "/deleteone", serviceOfPrintBasicRuleInfo.DeleteOne) + // PrintBasicRuleInfo删除多条 + // RegisterDeletePrintBasicRuleInfo(printbasicruleinfo, "/delete", serviceOfPrintBasicRuleInfo.Delete) + // PrintBasicRuleInfo查询多条 + RegisterSelectPrintBasicRuleInfo(printbasicruleinfo, "/selectlist", serviceOfPrintBasicRuleInfo.Select) + // PrintBasicRuleInfo查询多条并分页 + RegisterQueryPrintBasicRuleInfo(printbasicruleinfo, "/query", serviceOfPrintBasicRuleInfo.SelectAndPaging) + // PrintBasicRuleInfo查询一条 + RegisterSelectOnePrintBasicRuleInfo(printbasicruleinfo, "/selectone", serviceOfPrintBasicRuleInfo.SelectOne) + // PrintBasicRuleInfo修改一条 + RegisterUpdateOnePrintBasicRuleInfo(printbasicruleinfo, "/updateone", serviceOfPrintBasicRuleInfo.UpdateOne) + // PrintBasicRuleInfo修改多条 + // RegisterUpdatePrintBasicRuleInfo(printbasicruleinfo, "/update", serviceOfPrintBasicRuleInfo.Update) // TightenWrenchInfo的路由组 tightenwrenchinfo := party.Party("/tightenwrenchinfo") @@ -865,9 +900,11 @@ func RegisterRoutes() { // TightenWrenchInfo删除多条 // RegisterDeleteTightenWrenchInfo(tightenwrenchinfo, "/delete", serviceOfTightenWrenchInfo.Delete) // TightenWrenchInfo查询多条 - RegisterSelectTightenWrenchInfo(tightenwrenchinfo, "/query", serviceOfTightenWrenchInfo.Select) + RegisterSelectTightenWrenchInfo(tightenwrenchinfo, "/selectlist", serviceOfTightenWrenchInfo.Select) + // TightenWrenchInfo查询多条并分页 + RegisterQueryTightenWrenchInfo(tightenwrenchinfo, "/query", serviceOfTightenWrenchInfo.SelectAndPaging) // TightenWrenchInfo查询一条 - RegisterSelectOneTightenWrenchInfo(tightenwrenchinfo, "/get", serviceOfTightenWrenchInfo.SelectOne) + RegisterSelectOneTightenWrenchInfo(tightenwrenchinfo, "/selectone", serviceOfTightenWrenchInfo.SelectOne) // TightenWrenchInfo修改一条 RegisterUpdateOneTightenWrenchInfo(tightenwrenchinfo, "/updateone", serviceOfTightenWrenchInfo.UpdateOne) // TightenWrenchInfo修改多条 @@ -888,9 +925,11 @@ func RegisterRoutes() { // TightenWrenchRuleInfo删除多条 // RegisterDeleteTightenWrenchRuleInfo(tightenwrenchruleinfo, "/delete", serviceOfTightenWrenchRuleInfo.Delete) // TightenWrenchRuleInfo查询多条 - RegisterSelectTightenWrenchRuleInfo(tightenwrenchruleinfo, "/query", serviceOfTightenWrenchRuleInfo.Select) + RegisterSelectTightenWrenchRuleInfo(tightenwrenchruleinfo, "/selectlist", serviceOfTightenWrenchRuleInfo.Select) + // TightenWrenchRuleInfo查询多条并分页 + RegisterQueryTightenWrenchRuleInfo(tightenwrenchruleinfo, "/query", serviceOfTightenWrenchRuleInfo.SelectAndPaging) // TightenWrenchRuleInfo查询一条 - RegisterSelectOneTightenWrenchRuleInfo(tightenwrenchruleinfo, "/get", serviceOfTightenWrenchRuleInfo.SelectOne) + RegisterSelectOneTightenWrenchRuleInfo(tightenwrenchruleinfo, "/selectone", serviceOfTightenWrenchRuleInfo.SelectOne) // TightenWrenchRuleInfo修改一条 // RegisterUpdateOneTightenWrenchRuleInfo(tightenwrenchruleinfo, "/updateone", serviceOfTightenWrenchRuleInfo.UpdateOne) // TightenWrenchRuleInfo修改多条 @@ -917,26 +956,32 @@ func RegisterRoutes() { // RoleRel修改多条 // RegisterUpdateRoleRel(rolerel, "/update", serviceOfRoleRel.Update) - // ScanRuleInfo的路由组 - scanruleinfo := party.Party("/scanruleinfo") - // ScanRuleInfo的服务实例 - var serviceOfScanRuleInfo = svr.NewScanRuleInfoService() - // ScanRuleInfo插入一条 - RegisterInsertOneScanRuleInfo(scanruleinfo, "/insertone", serviceOfScanRuleInfo.InsertOne) - // ScanRuleInfo插入多条 - //RegisterInsertScanRuleInfo(scanruleinfo, "/insert", serviceOfScanRuleInfo.Insert) - // ScanRuleInfo删除一条 - RegisterDeleteOneScanRuleInfo(scanruleinfo, "/deleteone", serviceOfScanRuleInfo.DeleteOne) - // ScanRuleInfo删除多条 - // RegisterDeleteScanRuleInfo(scanruleinfo, "/delete", serviceOfScanRuleInfo.Delete) - // ScanRuleInfo查询多条 - RegisterSelectScanRuleInfo(scanruleinfo, "/query", serviceOfScanRuleInfo.Select) - // ScanRuleInfo查询一条 - RegisterSelectOneScanRuleInfo(scanruleinfo, "/get", serviceOfScanRuleInfo.SelectOne) - // ScanRuleInfo修改一条 - RegisterUpdateOneScanRuleInfo(scanruleinfo, "/updateone", serviceOfScanRuleInfo.UpdateOne) - // ScanRuleInfo修改多条 - // RegisterUpdateScanRuleInfo(scanruleinfo, "/update", serviceOfScanRuleInfo.Update) + // Process的路由组 + process := party.Party("/process") + // Process的服务实例 + var serviceOfProcess = svr.NewProcessService() + // Process插入一条 + RegisterInsertOneProcess(process, "/insertone", serviceOfProcess.InsertOne) + // Process插入多条 + // RegisterInsertProcess(process, "/insert", serviceOfProcess.Insert) + // Process删除一条 + RegisterDeleteOneProcess(process, "/deleteone", serviceOfProcess.DeleteOne) + // Process删除多条 + // RegisterDeleteProcess(process, "/delete", serviceOfProcess.Delete) + // Process查询多条 + RegisterSelectProcess(process, "/selectlist", serviceOfProcess.Select) + // Process查询多条并分页 + RegisterQueryProcess(process, "/query", serviceOfProcess.SelectAndPaging) + // Process查询一条 + RegisterSelectOneProcess(process, "/selectone", serviceOfProcess.SelectOne) + // Process修改一条 + RegisterUpdateOneProcess(process, "/updateone", serviceOfProcess.UpdateOne) + // Process修改多条 + // RegisterUpdateProcess(process, "/update", serviceOfProcess.Update) + // Process 通过产线获取工序 + RegisterSelectProcessByWorkLine(process, "/selectbyworkline", serviceOfProcess.SelectByWorkLine) + // Process 通过工序获取工步 + RegisterSelectOperationByProcess(process, "/selectoperation", serviceOfProcess.SelectOperation) // ProcessDependOn的路由组 processdependon := party.Party("/processdependon") @@ -959,6 +1004,29 @@ func RegisterRoutes() { // ProcessDependOn修改多条 // RegisterUpdateProcessDependOn(processdependon, "/update", serviceOfProcessDependOn.Update) + // ProcessWorkPlaceLst的路由组 + processworkplacelst := party.Party("/processworkplacelst") + // ProcessWorkPlaceLst的服务实例 + var serviceOfProcessWorkPlaceLst = svr.NewProcessWorkPlaceLstService() + // ProcessWorkPlaceLst插入一条 + // RegisterInsertOneProcessWorkPlaceLst(processworkplacelst, "/insertone", serviceOfProcessWorkPlaceLst.InsertOne) + // ProcessWorkPlaceLst插入多条 + RegisterInsertProcessWorkPlaceLst(processworkplacelst, "/insert", serviceOfProcessWorkPlaceLst.Insert) + // ProcessWorkPlaceLst删除一条 + // RegisterDeleteOneProcessWorkPlaceLst(processworkplacelst, "/deleteone", serviceOfProcessWorkPlaceLst.DeleteOne) + // ProcessWorkPlaceLst删除多条 + // RegisterDeleteProcessWorkPlaceLst(processworkplacelst, "/delete", serviceOfProcessWorkPlaceLst.Delete) + // ProcessWorkPlaceLst查询多条 + RegisterSelectProcessWorkPlaceLst(processworkplacelst, "/selectlist", serviceOfProcessWorkPlaceLst.Select) + // ProcessWorkPlaceLst查询多条并分页 + //RegisterQueryProcessWorkPlaceLst(processworkplacelst, "/query", serviceOfProcessWorkPlaceLst.SelectAndPaging) + // ProcessWorkPlaceLst查询一条 + //RegisterSelectOneProcessWorkPlaceLst(processworkplacelst, "/selectone", serviceOfProcessWorkPlaceLst.SelectOne) + // ProcessWorkPlaceLst修改一条 + // RegisterUpdateOneProcessWorkPlaceLst(processworkplacelst, "/updateone", serviceOfProcessWorkPlaceLst.UpdateOne) + // ProcessWorkPlaceLst修改多条 + // RegisterUpdateProcessWorkPlaceLst(processworkplacelst, "/update", serviceOfProcessWorkPlaceLst.Update) + // GuideRuleInfo的路由组 guideruleinfo := party.Party("/guideruleinfo") // GuideRuleInfo的服务实例 @@ -1070,29 +1138,6 @@ func RegisterRoutes() { // ArtWorkLineLst修改多条 RegisterSaveArtWorkLineLst(artworklinelst, "/save", serviceOfArtWorkLineLst.Save) - // PrintBasicRuleInfo的路由组 - printbasicruleinfo := party.Party("/printbasicruleinfo") - // PrintBasicRuleInfo的服务实例 - var serviceOfPrintBasicRuleInfo = svr.NewPrintBasicRuleInfoService() - // PrintBasicRuleInfo插入一条 - RegisterInsertOnePrintBasicRuleInfo(printbasicruleinfo, "/insertone", serviceOfPrintBasicRuleInfo.InsertOne) - // PrintBasicRuleInfo插入多条 - // RegisterInsertPrintBasicRuleInfo(printbasicruleinfo, "/insert", serviceOfPrintBasicRuleInfo.Insert) - // PrintBasicRuleInfo删除一条 - RegisterDeleteOnePrintBasicRuleInfo(printbasicruleinfo, "/deleteone", serviceOfPrintBasicRuleInfo.DeleteOne) - // PrintBasicRuleInfo删除多条 - // RegisterDeletePrintBasicRuleInfo(printbasicruleinfo, "/delete", serviceOfPrintBasicRuleInfo.Delete) - // PrintBasicRuleInfo查询多条 - RegisterSelectPrintBasicRuleInfo(printbasicruleinfo, "/query", serviceOfPrintBasicRuleInfo.Select) - // PrintBasicRuleInfo查询一条 - //RegisterSelectOnePrintBasicRuleInfo(printbasicruleinfo, "/get", serviceOfPrintBasicRuleInfo.SelectOne) - // PrintBasicRuleInfo修改一条 - RegisterUpdateOnePrintBasicRuleInfo(printbasicruleinfo, "/updateone", serviceOfPrintBasicRuleInfo.UpdateOne) - // PrintBasicRuleInfo修改多条 - // RegisterUpdatePrintBasicRuleInfo(printbasicruleinfo, "/update", serviceOfPrintBasicRuleInfo.Update) - // PrintBasicRuleInfo保存operation对应的规则 - //RegisterSavePrintBasicRuleInfoHandler(printbasicruleinfo, "/save", serviceOfPrintBasicRuleInfo.Save) - // OPCComValueCheckRule的路由组 opccomvaluecheckrule := party.Party("/opccomvaluecheckrule") // OPCComValueCheckRule的服务实例 @@ -1277,7 +1322,8 @@ func RegisterRoutes() { // Plant修改多条 // RegisterUpdatePlant(plant, "/update", serviceOfPlant.Update) // Plant获取所有工厂及工厂产品 - RegisterGetProjectsOfPlant(plant, "/getprojectofplant", serviceOfPlant.GetAllProjectsOfPlant) + //RegisterGetProjectsOfPlant(plant, "/getprojectofplant", serviceOfPlant.GetAllProjectsOfPlant) + RegisterGetWorkLineOfPlant(plant, "/getworklineofplant", serviceOfPlant.GetAllWorkLineOfPlant) // PrintDetail的路由组 printdetail := party.Party("/printdetail") @@ -1627,7 +1673,7 @@ func RegisterRoutes() { * * @Author : 代码生成器创建 * - * @Date : 2021-08-11 13:29:43 + * @Date : 2021-11-23 11:13:02 * ******************************************************************************/ func init() {