services/pln/implments/CustOrder.service.impl.go

@@ -873,7 +873,11 @@ func (impl *CustOrderServiceImplement) LockCustOrder(user *global.User, custOrde
 		// 创建序列工单和工单状态
 		for i := 0; i < orderData.PlanQty; i++ {
 			syncKey = custOrderId + "-" + strconv.Itoa(i)
-
+			serialNumber, err := snrDao.GetNextSnrWithTime(project.SerialOrderSnr, orderData.PlanStartDate.Restore())
+			if err != nil {
+				_ = session.Rollback()
+				return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error())
+			}
 			for _, product := range productLi {
 				// 获取生产使用的产线
 				var resourceId string
@@ -914,12 +918,6 @@ func (impl *CustOrderServiceImplement) LockCustOrder(user *global.User, custOrde
 				current++
 				planStartDate := grmi.Date(planStartTime)
 				planEndDate := grmi.Date(planEndTime)
-
-				serialNumber, err := snrDao.GetNextSnrWithTime(project.SerialOrderSnr, planStartTime)
-				if err != nil {
-					_ = session.Rollback()
-					return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error())
-				}
 				serialOrderId := product.MachineCode + serialNumber + product.ProductType + product.ColorValue
 
 				timeInt, err := strconv.Atoi(planStartTime.Format("060102150405"))
@@ -1185,7 +1183,11 @@ func (impl *CustOrderServiceImplement) LockCustOrderForGantt(user *global.User,
 			//firstStr := baseModel.NUMBER_MAP[first]
 			//secondStr := baseModel.NUMBER_MAP[second]
 
-
+			serialNumber, err := snrDao.GetNextSnrWithTime(project.SerialOrderSnr, orderData.CustOrder.PlanStartDate.Restore())
+			if err != nil {
+				_ = session.Rollback()
+				return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error())
+			}
 			for _, product := range productLi {
 				workLine, exist := workLineMap[product.DefaultWorkLineId]
 				if !exist {
@@ -1217,11 +1219,7 @@ func (impl *CustOrderServiceImplement) LockCustOrderForGantt(user *global.User,
 				planEndTime := orderData.CustOrder.PlanStartTime.Restore().Add(time.Duration(int(perDuration)*(current+1)) * time.Second)
 				planStartDate := grmi.Date(planStartTime)
 				planEndDate := grmi.Date(planEndTime)
-				serialNumber, err := snrDao.GetNextSnrWithTime(project.SerialOrderSnr, planStartTime)
-				if err != nil {
-					_ = session.Rollback()
-					return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error())
-				}
+
 				serialOrderId := product.MachineCode + serialNumber + product.ProductType + product.ColorValue
 
 				if i == 0 {