From 5a2e48400beeabd6b08473e4e7f71ecc6e9ca342 Mon Sep 17 00:00:00 2001 From: "DESKTOP-H7A6KL3\\wenzh" Date: Fri, 11 Aug 2023 17:38:24 +0800 Subject: [PATCH] =?UTF-8?q?FP=20=E7=BB=93=E6=9E=9C=E6=A0=A1=E9=AA=8C,?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../om/implments/SerialOrder.service.impl.go | 34 +++++++++++++++++-- web/controllers/om/om.go | 21 ++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/services/om/implments/SerialOrder.service.impl.go b/services/om/implments/SerialOrder.service.impl.go index 9628b1d..bec9cff 100644 --- a/services/om/implments/SerialOrder.service.impl.go +++ b/services/om/implments/SerialOrder.service.impl.go @@ -11,9 +11,11 @@ import ( "LAPP_ACURA_MOM_BACKEND/grmi" meMeta "LAPP_ACURA_MOM_BACKEND/meta/me" meta "LAPP_ACURA_MOM_BACKEND/meta/om" + omMeta "LAPP_ACURA_MOM_BACKEND/meta/om" baseModel "LAPP_ACURA_MOM_BACKEND/models/base" meModel "LAPP_ACURA_MOM_BACKEND/models/me" model "LAPP_ACURA_MOM_BACKEND/models/om" + "errors" "strconv" "strings" "time" @@ -332,12 +334,40 @@ func (impl *SerialOrderServiceImplement) UpdatePfOne(user *global.User, entity * engine := db.Eloquent.Master() session := engine.NewSession() defer session.Close() - engine.ShowSQL(true) dao := dal.NewSerialOrderInspectionItemDAO(session, user.PlantNr, user.UserId) - err := dao.Updatepf(entity) + recDao := dal.NewSerialOrderInspectionItemRecLstDAO(session, user.PlantNr, user.UserId) + //查询订单信息是否存在 + itemList, err := dao.Select([]grmi.Predicate{ + omMeta.SerialOrderInspectionItem_SerialOrderId.NewPredicate(grmi.Equal, entity.SerialOrderId), + }, []grmi.Field{omMeta.SerialOrderInspectionItem_Pos}) if err != nil { return err } + if len(itemList) <= 0 { + return errors.New("订单的信息不存在!") + } + err = session.Begin() + if err != nil { + return err + } + err = dao.Updatepf(entity) + if err != nil { + _ = session.Rollback() + return err + } + nowTime := time.Now() + recordTab := model.SerialOrderInspectionItemRecLst{ + PlantNr: user.PlantNr, + SerialOrderId: entity.SerialOrderId, + PersonID: user.UserId, + OrderDate: grmi.DateTime(nowTime), + } + err = recDao.InsertOne(&recordTab) + if err != nil { + _ = session.Rollback() + return err + } + _ = session.Commit() return nil } diff --git a/web/controllers/om/om.go b/web/controllers/om/om.go index 778cdcf..69437fb 100644 --- a/web/controllers/om/om.go +++ b/web/controllers/om/om.go @@ -456,6 +456,27 @@ func RegisterRoutes() { // RegisterUpdateOneSerialOrderPOStatusRecLst(serialorderpostatusreclst, "/updateone", serviceOfSerialOrderPOStatusRecLst.UpdateOne) // SerialOrderPOStatusRecLst修改多条 // RegisterUpdateSerialOrderPOStatusRecLst(serialorderpostatusreclst, "/update", serviceOfSerialOrderPOStatusRecLst.Update) + + // SerialOrderInspectionItemRecLst的路由组 + serialorderinspectionitemreclst := party.Party("/serialorderinspectionitemreclst") + // SerialOrderInspectionItemRecLst的服务实例 + var serviceOfSerialOrderInspectionItemRecLst = svr.NewSerialOrderInspectionItemRecLstService() + // SerialOrderInspectionItemRecLst插入一条 + // RegisterInsertOneSerialOrderInspectionItemRecLst(serialorderinspectionitemreclst, "/insertone", serviceOfSerialOrderInspectionItemRecLst.InsertOne) + // SerialOrderInspectionItemRecLst插入多条 + // RegisterInsertSerialOrderInspectionItemRecLst(serialorderinspectionitemreclst, "/insert", serviceOfSerialOrderInspectionItemRecLst.Insert) + // SerialOrderInspectionItemRecLst删除一条 + // RegisterDeleteOneSerialOrderInspectionItemRecLst(serialorderinspectionitemreclst, "/deleteone", serviceOfSerialOrderInspectionItemRecLst.DeleteOne) + // SerialOrderInspectionItemRecLst删除多条 + // RegisterDeleteSerialOrderInspectionItemRecLst(serialorderinspectionitemreclst, "/delete", serviceOfSerialOrderInspectionItemRecLst.Delete) + // SerialOrderInspectionItemRecLst查询多条 + RegisterSelectSerialOrderInspectionItemRecLst(serialorderinspectionitemreclst, "/query", serviceOfSerialOrderInspectionItemRecLst.Select) + // SerialOrderInspectionItemRecLst查询一条 + RegisterSelectOneSerialOrderInspectionItemRecLst(serialorderinspectionitemreclst, "/get", serviceOfSerialOrderInspectionItemRecLst.SelectOne) + // SerialOrderInspectionItemRecLst修改一条 + // RegisterUpdateOneSerialOrderInspectionItemRecLst(serialorderinspectionitemreclst, "/updateone", serviceOfSerialOrderInspectionItemRecLst.UpdateOne) + // SerialOrderInspectionItemRecLst修改多条 + // RegisterUpdateSerialOrderInspectionItemRecLst(serialorderinspectionitemreclst, "/update", serviceOfSerialOrderInspectionItemRecLst.Update) }) }