From 9f145591daa5043799e974fe599fd9e0b5c51afd Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Fri, 26 Nov 2021 10:18:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=BF=94=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meta/qm/ReclinerReclst.meta.go | 4 +- models/qm/ReclinerReclst.model.go | 1 + models/qm/qm.go | 6 + services/qm/ReclinerReclst.service.go | 40 ++++++ .../implments/ReclinerReclst.service.impl.go | 66 ++++++++++ web/controllers/qm/ReclinerReclst.rest.go | 117 ++++++++++++++++++ web/controllers/qm/qm.go | 4 + 7 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 models/qm/qm.go diff --git a/meta/qm/ReclinerReclst.meta.go b/meta/qm/ReclinerReclst.meta.go index c1ae085..1e10182 100644 --- a/meta/qm/ReclinerReclst.meta.go +++ b/meta/qm/ReclinerReclst.meta.go @@ -18,6 +18,7 @@ import ( ******************************************************************************/ var ReclinerReclst_PlantNr = grmi.NewField("PlantNr", "QM_ReclinerReclst.PlantNr", "plantnr", grmi.TypeInt) var ReclinerReclst_RecNr = grmi.NewField("RecNr", "QM_ReclinerReclst.RecNr", "recnr", grmi.TypeInt) +var ReclinerReclst_RecType = grmi.NewField("RecType", "QM_ReclinerReclst.RecType", "RecType", grmi.TypeString) var ReclinerReclst_Line = grmi.NewField("Line", "QM_ReclinerReclst.Line", "line", grmi.TypeString) var ReclinerReclst_ArtId = grmi.NewField("ArtId", "QM_ReclinerReclst.ArtId", "artid", grmi.TypeString) var ReclinerReclst_SerialOrderId = grmi.NewField("SerialOrderId", "QM_ReclinerReclst.SerialOrderId", "serialorderid", grmi.TypeString) @@ -43,6 +44,7 @@ var ReclinerReclst = grmi.NewEntity( map[string]grmi.Field{ ReclinerReclst_PlantNr.Name: ReclinerReclst_PlantNr, ReclinerReclst_RecNr.Name: ReclinerReclst_RecNr, + ReclinerReclst_RecType.Name: ReclinerReclst_RecType, ReclinerReclst_Line.Name: ReclinerReclst_Line, ReclinerReclst_ArtId.Name: ReclinerReclst_ArtId, ReclinerReclst_SerialOrderId.Name: ReclinerReclst_SerialOrderId, @@ -54,4 +56,4 @@ var ReclinerReclst = grmi.NewEntity( ReclinerReclst_CreateTime.Name: ReclinerReclst_CreateTime, }, []string{"PlantNr"}, - []string{"ArtId", "SerialOrderId", "ReclinerNr", "ItemPartNr", "Status", "LastUser"}) + []string{"ArtId", "RecType", "SerialOrderId", "ReclinerNr", "ItemPartNr", "Status", "LastUser"}) diff --git a/models/qm/ReclinerReclst.model.go b/models/qm/ReclinerReclst.model.go index 17553fb..b585066 100644 --- a/models/qm/ReclinerReclst.model.go +++ b/models/qm/ReclinerReclst.model.go @@ -22,6 +22,7 @@ import ( type ReclinerReclst struct { PlantNr int `xorm:"pk int 'PlantNr'" json:"QM_ReclinerReclst-PlantNr"` RecNr int `xorm:"pk int 'RecNr' autoincr" json:"QM_ReclinerReclst-RecNr"` + RecType string `xorm:"nvarchar(16) 'RecType'" json:"QM_ReclinerReclst-RecType"` Line string `xorm:"nvarchar(16) 'Line'" json:"QM_ReclinerReclst-Line"` ArtId string `xorm:"nvarchar(64) 'ArtId'" json:"QM_ReclinerReclst-ArtId"` SerialOrderId string `xorm:"nvarchar(100) 'SerialOrderId'" json:"QM_ReclinerReclst-SerialOrderId"` diff --git a/models/qm/qm.go b/models/qm/qm.go new file mode 100644 index 0000000..7535467 --- /dev/null +++ b/models/qm/qm.go @@ -0,0 +1,6 @@ +package qm + +const ( + QM_REC_TYPE = "REC" + QM_SERI_TYPE = "SERI" +) diff --git a/services/qm/ReclinerReclst.service.go b/services/qm/ReclinerReclst.service.go index e41466b..80e27bf 100644 --- a/services/qm/ReclinerReclst.service.go +++ b/services/qm/ReclinerReclst.service.go @@ -196,6 +196,46 @@ type ReclinerReclstService interface { * ******************************************************************************/ Update(*global.User, *[]model.ReclinerReclst) error + /****************************************************************************** + * + * @Function Name : InsertSeriOne + *----------------------------------------------------------------------------- + * + * @Description : 插入一条ReclinerReclst + * + * @Function Parameters : 当前访问人员信息 + * + * @Function Parameters : 需要插入的ReclinerReclst + * + * @Return Value : 执行时发生的错误 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-07-12 14:05:20 + * + ******************************************************************************/ + InsertSeriOne(*global.User, *model.ReclinerReclst) error + /****************************************************************************** + * + * @Function Name : SelectSeriOne + *----------------------------------------------------------------------------- + * + * @Description : 查找指定键的ReclinerReclst + * + * @Function Parameters : 主键 + * + * @Function Parameters : 主键 + * + * @Return Value : 查找到的ReclinerReclst + * + * @Return Value : 执行时发生的错误 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-07-12 14:05:20 + * + ******************************************************************************/ + SelectSeriOne(*global.User, string) (*model.ReclinerReclst, error) } /****************************************************************************** diff --git a/services/qm/implments/ReclinerReclst.service.impl.go b/services/qm/implments/ReclinerReclst.service.impl.go index 3f5538a..b03ee05 100644 --- a/services/qm/implments/ReclinerReclst.service.impl.go +++ b/services/qm/implments/ReclinerReclst.service.impl.go @@ -30,6 +30,7 @@ import ( var DefaultConditionOfReclinerReclst = grmi.NewCondition( map[string]grmi.ConditionItem{ meta.ReclinerReclst_RecNr.UrlParameterName: grmi.NewConditionItem(meta.ReclinerReclst_RecNr, grmi.Equal, true), + meta.ReclinerReclst_RecType.UrlParameterName: grmi.NewConditionItem(meta.ReclinerReclst_RecType, grmi.Equal, true), meta.ReclinerReclst_Line.UrlParameterName: grmi.NewConditionItem(meta.ReclinerReclst_Line, grmi.Equal, true), meta.ReclinerReclst_ArtId.UrlParameterName: grmi.NewConditionItem(meta.ReclinerReclst_ArtId, grmi.Equal, false), meta.ReclinerReclst_SerialOrderId.UrlParameterName: grmi.NewConditionItem(meta.ReclinerReclst_SerialOrderId, grmi.Equal, false), @@ -441,3 +442,68 @@ func (impl *ReclinerReclstServiceImplement) Update(user *global.User, entities * } return nil } + +/****************************************************************************** + * + * @Reference LAPP_GAAS_GFrame_BACKEND/services/qm/ReclinerReclstService.InsertSeriOne + * + ******************************************************************************/ +func (impl *ReclinerReclstServiceImplement) InsertSeriOne(user *global.User, entity *model.ReclinerReclst) error { + + grmi.Log(user, "/services/qm/implments/ReclinerReclst.service.impl.go", "InsertOneReclinerReclst", "插入一个ReclinerReclst") + + engine := db.Eloquent.Master() + session := engine.NewSession() + defer session.Close() + dao := dal.NewReclinerReclstDAO(session, user.PlantNr, user.UserId) + seriDao := omDal.NewSerialOrderDAO(session, user.PlantNr, user.UserId) + seriInfo, err := seriDao.SelectBySerialOrder(entity.SerialOrderId) + if err != nil { + return err + } + if seriInfo == nil { + return grmi.NewBusinessError("不存在指定记录!") + } + orderId := entity.SerialOrderId + entity.ArtId = seriInfo.ArtId + entity.Line = seriInfo.PlanResourceId + entity.RecType = model.QM_SERI_TYPE + entity.Status = "N" + entity.ReclinerNr = "R-" + orderId + err = dao.InsertOne(entity) + if err != nil { + return err + } + return nil +} + +/****************************************************************************** + * + * @Reference LAPP_GAAS_GFrame_BACKEND/services/qm/ReclinerReclstService.SelectSeriOne + * + ******************************************************************************/ +func (impl *ReclinerReclstServiceImplement) SelectSeriOne(user *global.User, orderId string) (*model.ReclinerReclst, error) { + + grmi.Log(user, "/services/qm/implments/ReclinerReclst.service.impl.go", "InsertOneReclinerReclst", "插入一个ReclinerReclst") + + engine := db.Eloquent.Master() + session := engine.NewSession() + defer session.Close() + seriDao := omDal.NewSerialOrderDAO(session, user.PlantNr, user.UserId) + seriInfo, err := seriDao.SelectBySerialOrder(orderId) + if err != nil { + return nil, err + } + if seriInfo == nil { + return nil, grmi.NewBusinessError("不存在指定记录!") + } + entity := new(model.ReclinerReclst) + entity.PlantNr = user.PlantNr + entity.ArtId = seriInfo.ArtId + entity.SerialOrderId = orderId + entity.Line = seriInfo.PlanResourceId + entity.RecType = model.QM_SERI_TYPE + entity.ReclinerNr = "R-" + orderId + return entity, nil +} + diff --git a/web/controllers/qm/ReclinerReclst.rest.go b/web/controllers/qm/ReclinerReclst.rest.go index dde0689..7b5f821 100644 --- a/web/controllers/qm/ReclinerReclst.rest.go +++ b/web/controllers/qm/ReclinerReclst.rest.go @@ -390,3 +390,120 @@ func RegisterUpdateReclinerReclst(party router.Party, path string, method func(* RegisterMultiReclinerReclst(party, "PUT", path, method) } + + +/****************************************************************************** + * + * @Function Name : RegisterInsertOneReclinerReclst + *----------------------------------------------------------------------------- + * + * @Description : 为一个插入单条ReclinerReclst的方法注册路由 + * + * @Function Parameters : 路由分组 + * + * @Function Parameters : 路径 + * + * @Function Parameters : 实际处理请求的方法 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-07-12 14:05:20 + * + ******************************************************************************/ +func RegisterInsertSeriOneReclinerReclst(party router.Party, path string, method func(*global.User, *model.ReclinerReclst) error) { + + RegisterOneSeriReclinerReclst(party, "POST", path, method) +} + +/****************************************************************************** + * + * @Function Name : RegisterOneSeriReclinerReclst + *----------------------------------------------------------------------------- + * + * @Description : 为一个处理单条ReclinerReclst的方法注册路由 + * + * @Function Parameters : 路由分组 + * + * @Function Parameters : HTTP方法 + * + * @Function Parameters : 路径 + * + * @Function Parameters : 实际处理请求的方法 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-07-12 14:05:20 + * + ******************************************************************************/ +func RegisterOneSeriReclinerReclst(party router.Party, httpMethod string, path string, method func(*global.User, *model.ReclinerReclst) error) { + + party.Handle(httpMethod, path, func(ctx iris.Context) { + user, ok := jwts.ParseToken(ctx) + if !ok { + supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil) + return + } + + var err error = nil + + entity := new(model.ReclinerReclst) + if ctx.GetContentLength() > 0 { + err := ctx.ReadJSON(entity) + if err != nil { + supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil) + return + } + } else { + entity = nil + } + + err = method(user, entity) + if err != nil { + supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil) + return + } + supports.Ok(ctx, supports.OptionSuccess, nil) + }) +} + + +/****************************************************************************** + * + * @Function Name : RegisterSelectSeriOneReclinerReclst + *----------------------------------------------------------------------------- + * + * @Description : 为一个查找单条ReclinerReclst的方法注册路由 + * + * @Function Parameters : 路由分组 + * + * @Function Parameters : 路径 + * + * @Function Parameters : 实际处理请求的方法 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-07-12 14:05:20 + * + ******************************************************************************/ +func RegisterSelectSeriOneReclinerReclst(party router.Party, path string, method func(*global.User, string) (*model.ReclinerReclst, error)) { + + party.Get(path+"/{orderId:string}", func(ctx iris.Context) { + user, ok := jwts.ParseToken(ctx) + if !ok { + supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil) + return + } + + orderId := ctx.Params().GetString("orderId") + result, err := method(user, orderId) + 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/qm/qm.go b/web/controllers/qm/qm.go index c2d027a..85c2792 100644 --- a/web/controllers/qm/qm.go +++ b/web/controllers/qm/qm.go @@ -260,6 +260,10 @@ func RegisterRoutes() { // RegisterUpdateOneReclinerReclst(reclinerreclst, "/updateone", serviceOfReclinerReclst.UpdateOne) // ReclinerReclst修改多条 // RegisterUpdateReclinerReclst(reclinerreclst, "/update", serviceOfReclinerReclst.Update) + // 插入条码 + RegisterInsertSeriOneReclinerReclst(reclinerreclst, "/insertserione", serviceOfReclinerReclst.InsertSeriOne) + // 查询信息 + RegisterSelectSeriOneReclinerReclst(reclinerreclst, "/serione", serviceOfReclinerReclst.SelectSeriOne) }) }