From fee844cff2dafea6dd610cf25d3a00ff61e93add Mon Sep 17 00:00:00 2001 From: zhangxin Date: Mon, 31 May 2021 16:13:39 +0800 Subject: [PATCH] =?UTF-8?q?workOrderStatusRecLst=E5=92=8CserialOrderStatus?= =?UTF-8?q?RecLst=E7=9A=84pos=E4=BD=BF=E7=94=A8=E8=87=AA=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/om/implments/OmToMes.serivce.impl.go | 28 +++++++++---------- .../ParsePortalWorkOrder.service.impl.go | 12 ++++---- .../om/implments/SerialOrder.service.impl.go | 14 +++++----- .../om/implments/WorkOrder.service.impl.go | 14 +++++----- .../implments/WorkOrderStatus.service.impl.go | 14 +++++----- services/schedule/SchedTask.Ctrl.go | 24 ++++++++-------- 6 files changed, 53 insertions(+), 53 deletions(-) diff --git a/services/om/implments/OmToMes.serivce.impl.go b/services/om/implments/OmToMes.serivce.impl.go index ce21f6c..6535413 100644 --- a/services/om/implments/OmToMes.serivce.impl.go +++ b/services/om/implments/OmToMes.serivce.impl.go @@ -324,16 +324,16 @@ func (impl *OmToMesServiceImplement) FeedbackFromMes(plantNr int) { // 更新work order 状态变化 if feedbackWorkOrder.STATUS == model.MesOrderStatusAccomplished { if workOrderStatus.Status != baseModel.WO_STATUS_FINISHED { - maxPos, err := workOrderStatusRecDao.GetMaxPos(workOrderStatus.WorkOrderId) - if err != nil { - log.Error("FeedbackFromMes get workOrder status rec max pos failed, error:" + err.Error() + " workOrderId: " + mesWorkOrder.WONO) - _ = session.Rollback() - _ = mesSession.Rollback() - return - } + //maxPos, err := workOrderStatusRecDao.GetMaxPos(workOrderStatus.WorkOrderId) + //if err != nil { + // log.Error("FeedbackFromMes get workOrder status rec max pos failed, error:" + err.Error() + " workOrderId: " + mesWorkOrder.WONO) + // _ = session.Rollback() + // _ = mesSession.Rollback() + // return + //} statusRec := model.WorkOrderStatusRecLst{ WorkOrderId: workOrderStatus.WorkOrderId, - Pos: maxPos + 1, + //Pos: maxPos + 1, PrevStatus: workOrderStatus.Status, Status: baseModel.WO_STATUS_FINISHED, StartTime: feedbackWorkOrder.STARTTIME, @@ -444,14 +444,14 @@ func (impl *OmToMesServiceImplement) dealWorkOrderHeader(mesWorkOrder apiModel.A } if serialOrder.SerialOrderStatus.Status < innerStatus { serialOrderStatus := serialOrder.SerialOrderStatus - maxPos, err := serialOrderStatusRecDao.GetMaxPos(detail.UNITSN) - if err != nil { - log.Error("dealWorkOrderHeader get serialOrder max pos failed, error:" + err.Error() + " serialOrderId: " + detail.UNITSN) - return feedbackWorkOrder, err - } + //maxPos, err := serialOrderStatusRecDao.GetMaxPos(detail.UNITSN) + //if err != nil { + // log.Error("dealWorkOrderHeader get serialOrder max pos failed, error:" + err.Error() + " serialOrderId: " + detail.UNITSN) + // return feedbackWorkOrder, err + //} statusRec := model.SerialOrderStatusRecLst{ SerialOrderId: detail.UNITSN, - Pos: maxPos + 1, + //Pos: maxPos + 1, PrevStatus: serialOrderStatus.Status, Status: innerStatus, StartTime: detail.SYNCTIME, diff --git a/services/om/implments/ParsePortalWorkOrder.service.impl.go b/services/om/implments/ParsePortalWorkOrder.service.impl.go index 82887de..0100906 100644 --- a/services/om/implments/ParsePortalWorkOrder.service.impl.go +++ b/services/om/implments/ParsePortalWorkOrder.service.impl.go @@ -363,17 +363,17 @@ func (impl *ParseMesWorkOrderServiceImplement) DealWorkOrder(pid int, newWorkOrderSign = false if workOrderStatus.Status != stateCode { - maxPos, err := workOrderStatusRecDao.GetMaxPos(workOrder.WorkOrderId) - if err != nil { - log.Error("ParseMesWorkOrder DealWorkOrder get work order status rec max pos failed, error: " + err.Error()) - return workOrder, workOrderStatus, workOrderQty, err - } + //maxPos, err := workOrderStatusRecDao.GetMaxPos(workOrder.WorkOrderId) + //if err != nil { + // log.Error("ParseMesWorkOrder DealWorkOrder get work order status rec max pos failed, error: " + err.Error()) + // return workOrder, workOrderStatus, workOrderQty, err + //} var workOrderStatusRec model.WorkOrderStatusRecLst workOrderStatusRec.WorkOrderId = workOrder.WorkOrderId workOrderStatusRec.PrevStatus = workOrderStatus.Status workOrderStatusRec.Status = stateCode - workOrderStatusRec.Pos = maxPos + 1 + //workOrderStatusRec.Pos = maxPos + 1 err = workOrderStatusRecDao.InsertOne(&workOrderStatusRec) if err != nil { log.Error("ParseMesWorkOrder DealWorkOrder insert work order status rec failed, error: " + err.Error()) diff --git a/services/om/implments/SerialOrder.service.impl.go b/services/om/implments/SerialOrder.service.impl.go index 616dc02..f0a2958 100644 --- a/services/om/implments/SerialOrder.service.impl.go +++ b/services/om/implments/SerialOrder.service.impl.go @@ -450,15 +450,15 @@ func (impl *SerialOrderServiceImplement) InsertFromWorkOrder(user *models.Userta session.Rollback() return nil, err } - maxPos, err := workOrderStatusRecDao.GetMaxPos(workOrderId) - if err != nil { - log.Error("InsertFromWorkOrder SerialOrder workOrderStatusRecDao GetMaxPos failed, error: " + err.Error()) - session.Rollback() - return nil, err - } + //maxPos, err := workOrderStatusRecDao.GetMaxPos(workOrderId) + //if err != nil { + // log.Error("InsertFromWorkOrder SerialOrder workOrderStatusRecDao GetMaxPos failed, error: " + err.Error()) + // session.Rollback() + // return nil, err + //} workOrderStatusRec := model.WorkOrderStatusRecLst{ WorkOrderId: workOrderId, - Pos: maxPos + 1, + //Pos: maxPos + 1, PrevStatus: workOrderStatus.Status, Status: baseModel.WO_STATUS_LOCKED, StartTime: workOrder.PlanStartTime, diff --git a/services/om/implments/WorkOrder.service.impl.go b/services/om/implments/WorkOrder.service.impl.go index 66f5399..716bb43 100644 --- a/services/om/implments/WorkOrder.service.impl.go +++ b/services/om/implments/WorkOrder.service.impl.go @@ -350,17 +350,17 @@ func (impl *WorkOrderServiceImplement) DeleteOne(user *models.Usertab, workOrder if statusRecord.Status != baseModel.WO_STATUS_UNPLANNED { return grmi.NewBusinessError("该workOrder不可以删除, status:" + strconv.Itoa(statusRecord.Status)) } - maxPos, err := statusRecDao.GetMaxPos(record.WorkOrderId) - if err != nil { - log.Error("WorkOrder DeleteOne get status rec max pos failed, error: " + err.Error()) - session.Rollback() - return err - } + //maxPos, err := statusRecDao.GetMaxPos(record.WorkOrderId) + //if err != nil { + // log.Error("WorkOrder DeleteOne get status rec max pos failed, error: " + err.Error()) + // session.Rollback() + // return err + //} var workOrderStatusRec model.WorkOrderStatusRecLst workOrderStatusRec.WorkOrderId = record.WorkOrderId workOrderStatusRec.PrevStatus = statusRecord.Status workOrderStatusRec.Status = baseModel.WO_STATUS_CANCELED - workOrderStatusRec.Pos = maxPos + 1 + //workOrderStatusRec.Pos = maxPos + 1 err = statusRecDao.InsertOne(&workOrderStatusRec) if err != nil { log.Error("WorkOrder DeleteOne insert status rec failed, error: " + err.Error()) diff --git a/services/om/implments/WorkOrderStatus.service.impl.go b/services/om/implments/WorkOrderStatus.service.impl.go index 89193ef..6bc4819 100644 --- a/services/om/implments/WorkOrderStatus.service.impl.go +++ b/services/om/implments/WorkOrderStatus.service.impl.go @@ -374,15 +374,15 @@ func (impl *WorkOrderStatusServiceImplement) ChangeStatus(user *models.Usertab, return grmi.NewBusinessError("order status is non sequence, workOrderId:" + entity.WorkOrderId + " change status:" + strconv.Itoa(entity.Status)) } } - maxPos, err := recDao.GetMaxPos(entity.WorkOrderId) - if err != nil { - log.Debug("get max pos failed, error:" + err.Error(), record.WorkOrderId) - session.Rollback() - return err - } + //maxPos, err := recDao.GetMaxPos(entity.WorkOrderId) + //if err != nil { + // log.Debug("get max pos failed, error:" + err.Error(), record.WorkOrderId) + // session.Rollback() + // return err + //} rec := model.WorkOrderStatusRecLst{ WorkOrderId: record.WorkOrderId, - Pos: maxPos+1, + //Pos: maxPos+1, PrevStatus: record.Status, } err = recDao.InsertOne(&rec) diff --git a/services/schedule/SchedTask.Ctrl.go b/services/schedule/SchedTask.Ctrl.go index c25adb3..069f332 100644 --- a/services/schedule/SchedTask.Ctrl.go +++ b/services/schedule/SchedTask.Ctrl.go @@ -218,13 +218,13 @@ func (tasksrv *TaskSrv) Release(workOrderStatusDao dal.WorkOrderStatusDAO, workO if err != nil { return err } - maxPos, err := workOrderStatusRecDao.GetMaxPos(tasksrv.WorkOrderStatus.WorkOrderId) - if err != nil { - return err - } + //maxPos, err := workOrderStatusRecDao.GetMaxPos(tasksrv.WorkOrderStatus.WorkOrderId) + //if err != nil { + // return err + //} // 新增批次订单状态变更记录 wostatrectab = model.WorkOrderStatusRecLst{} - wostatrectab.Pos = maxPos + 1 + //wostatrectab.Pos = maxPos + 1 wostatrectab.PlantNr = tasksrv.WorkOrderStatus.PlantNr wostatrectab.WorkOrderId = tasksrv.WorkOrderStatus.WorkOrderId wostatrectab.PrevStatus = common.WO_STATUS_LOCKED @@ -287,15 +287,15 @@ func (tasksrv *TaskSrv) ReleaseSerialOrder(relQty int) (err error) { serialOrderStatus := tasksrv.SerialTaskArray[i].SerialOrderStatusTab serialOrder := tasksrv.SerialTaskArray[i].SerialOrderTab - maxPos, err := serialOrderStatusRecDao.GetMaxPos(serialOrderStatus.SerialOrderId) - if err != nil { - session.Rollback() - innerLog.Error("ReleaseSerialOrder get max pos failed, error:" + err.Error() + " serialOrderId:" + serialOrderStatus.SerialOrderId) - return err - } + //maxPos, err := serialOrderStatusRecDao.GetMaxPos(serialOrderStatus.SerialOrderId) + //if err != nil { + // session.Rollback() + // innerLog.Error("ReleaseSerialOrder get max pos failed, error:" + err.Error() + " serialOrderId:" + serialOrderStatus.SerialOrderId) + // return err + //} recStatus := model.SerialOrderStatusRecLst{ SerialOrderId: serialOrderStatus.SerialOrderId, - Pos: maxPos + 1, + //Pos: maxPos + 1, PrevStatus: serialOrderStatus.Status, Status: common.WO_STATUS_RELEASED, StartTime: serialOrder.PlanStartTime,