From 1ece1213ed4a588e213811bc351b8d9d0e19ca85 Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Mon, 5 Jul 2021 16:12:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B7=A5=E4=BD=8D=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/base/WorkPlace.dao.go | 19 +++++++++++++++++++ dao/base/implments/WorkPlace.dao.impl.go | 18 ++++++++++++++++++ services/ods/ArtRouteOdsLst.service.go | 2 +- .../implments/ArtRouteOdsLst.service.impl.go | 13 +++++++++++-- web/controllers/ods/ArtRouteOdsLst.rest.go | 12 ++++-------- 5 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dao/base/WorkPlace.dao.go b/dao/base/WorkPlace.dao.go index d4cdcf1..7a8548b 100644 --- a/dao/base/WorkPlace.dao.go +++ b/dao/base/WorkPlace.dao.go @@ -75,6 +75,25 @@ type WorkPlaceDAO interface { * ******************************************************************************/ SelectOne(int) (*model.WorkPlace, error) + /****************************************************************************** + * + * @Function Name : SelectById + *----------------------------------------------------------------------------- + * + * @Description : 查找指定键的WorkPlace + * + * @Function Parameters : 主键 + * + * @Return Value : 查找到的WorkPlace + * + * @Return Value : 执行时发生的错误 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-04-21 10:27:00 + * + ******************************************************************************/ + SelectById(workPlaceId string) (*model.WorkPlace, error) /****************************************************************************** * * @Function Name : UpdateOne diff --git a/dao/base/implments/WorkPlace.dao.impl.go b/dao/base/implments/WorkPlace.dao.impl.go index dd5b084..4ab7488 100644 --- a/dao/base/implments/WorkPlace.dao.impl.go +++ b/dao/base/implments/WorkPlace.dao.impl.go @@ -98,6 +98,24 @@ func (impl *WorkPlaceDAOImplement) SelectOne(workPlaceNr int) (*model.WorkPlace, return &data, nil } + +/****************************************************************************** + * + * @Reference LAPP_GAAS_GFrame_BACKEND/dao/base/WorkPlaceDAO.SelectById + * + ******************************************************************************/ +func (impl *WorkPlaceDAOImplement) SelectById(workPlaceId string) (*model.WorkPlace, error) { + var data model.WorkPlace + ok, err := impl.session.Table(impl.meta.TableName).Where("PlantNr = ? and WorkPlaceId = ?",impl.plantNr, workPlaceId).Get(&data) + if err != nil { + return nil, grmi.NewDataBaseError(err) + } + if !ok { + return nil, nil + } + return &data, nil +} + /****************************************************************************** * * @Reference LAPP_GAAS_GFrame_BACKEND/dao/base/WorkPlaceDAO.UpdateOne diff --git a/services/ods/ArtRouteOdsLst.service.go b/services/ods/ArtRouteOdsLst.service.go index 1551c21..d9e9bf2 100644 --- a/services/ods/ArtRouteOdsLst.service.go +++ b/services/ods/ArtRouteOdsLst.service.go @@ -81,7 +81,7 @@ type ArtRouteOdsLstService interface { * @Date : 2021-03-18 23:20:31 * ******************************************************************************/ - SelectOneByWorkPlaceId(*models.Usertab, string, int) (*model.ArtRouteOdsLst, error) + SelectOneByWorkPlaceId(*models.Usertab, string, string) (*model.ArtRouteOdsLst, error) /****************************************************************************** * * @Function Name : SelectOne diff --git a/services/ods/implments/ArtRouteOdsLst.service.impl.go b/services/ods/implments/ArtRouteOdsLst.service.impl.go index cdbc26e..b93e5d4 100644 --- a/services/ods/implments/ArtRouteOdsLst.service.impl.go +++ b/services/ods/implments/ArtRouteOdsLst.service.impl.go @@ -211,7 +211,7 @@ func (impl *ArtRouteOdsLstServiceImplement) SelectOne(user *models.Usertab, artI * @Reference LAPP_GAAS_GFrame_BACKEND/services/ods/ArtRouteOdsLstService.SelectOneByWorkPlaceId * ******************************************************************************/ -func (impl *ArtRouteOdsLstServiceImplement) SelectOneByWorkPlaceId(user *models.Usertab, orderId string, workPlaceNr int) (*model.ArtRouteOdsLst, error) { +func (impl *ArtRouteOdsLstServiceImplement) SelectOneByWorkPlaceId(user *models.Usertab, orderId string, workPlaceId string) (*model.ArtRouteOdsLst, error) { grmi.Log(user, "/services/ods/implments/ODS_ArtRouteOdsLst.service.impl.go", "SelectOneArtRouteOdsLst", "查询一个ArtRouteOdsLst") @@ -239,7 +239,16 @@ func (impl *ArtRouteOdsLstServiceImplement) SelectOneByWorkPlaceId(user *models. codeInfos := bmodel.ParseBarcode(orderId, valst) artId := codeInfos["artId"] - result, err := dao.SelectOneByWorkPlaceId(artId, workPlaceNr) + //根据工位编号查询工位Id + placeDao := basedal.NewWorkPlaceDAO(session, user.Pid, user.Userid) + placeInfo,err := placeDao.SelectById(workPlaceId) + if err != nil { + return nil, err + } + if placeInfo == nil{ + return nil, grmi.NewBusinessError("查询对应的工位失败!") + } + result, err := dao.SelectOneByWorkPlaceId(artId, placeInfo.WorkPlaceNr) if err != nil { return nil, err } diff --git a/web/controllers/ods/ArtRouteOdsLst.rest.go b/web/controllers/ods/ArtRouteOdsLst.rest.go index 4585eb5..5794d1e 100644 --- a/web/controllers/ods/ArtRouteOdsLst.rest.go +++ b/web/controllers/ods/ArtRouteOdsLst.rest.go @@ -228,9 +228,9 @@ func RegisterSelectOneArtRouteOdsLst(party router.Party, path string, method fun * @Date : 2021-03-24 22:49:12 * ******************************************************************************/ -func RegisterSelectOneArtRouteOdsLstByWorkPlaceId(party router.Party, path string, method func(*models.Usertab, string, int) (*model.ArtRouteOdsLst, error)) { +func RegisterSelectOneArtRouteOdsLstByWorkPlaceId(party router.Party, path string, method func(*models.Usertab, string, string) (*model.ArtRouteOdsLst, error)) { - party.Get(path+"/{orderId:string}/{workPlaceNr:int}", func(ctx iris.Context) { + party.Get(path+"/{orderId:string}/{workPlaceId:string}", func(ctx iris.Context) { user, ok := jwts.ParseToken(ctx) if !ok { supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil) @@ -238,12 +238,8 @@ func RegisterSelectOneArtRouteOdsLstByWorkPlaceId(party router.Party, path strin } orderId := ctx.Params().GetString("orderId") - workPlaceNr,err := ctx.Params().GetInt("workPlaceNr") - if err != nil { - supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil) - return - } - result, err := method(user, orderId, workPlaceNr) + workPlaceId := ctx.Params().GetString("workPlaceId") + result, err := method(user, orderId, workPlaceId) if err != nil { supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil) return