Merge pull request 'workOrderStatusRecLst和serialOrderStatusRecLst的pos使用自增' (#289) from fix_order into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/289
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>

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,

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())

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,

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())

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)

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,