Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_shunyin

services/om/SerialOrder.service.go

@@ -454,7 +454,7 @@ type SerialOrderService interface {
 	CancelMultiSerialOrder(user *global.User, serialOrderIdLi []string) error
 	GetProductTraceDataReport(user *global.User, serialOrderId string) (interface{}, error)
 	GenerateProductCraft(user *global.User, session *xorm.Session, serialOrder *model.SerialOrder) error
-	ReplaceData(serialOrder *model.SerialOrder, serialNumber string, isPre bool)
+	ReplaceData(serialOrder *model.SerialOrder, serialNumber string, day string, isPre bool)
 
 	// BreakUp 骨架拆解
 	BreakUp(user *global.User, barcode string) (err error)

services/om/implments/SerialOrder.Logic.impl.go

@@ -253,8 +253,13 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use
 			_ = session.Rollback()
 			return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error())
 		}
-		impl.ReplaceData(&serialOrder, serialNumber, product.CtrlStr1==meModel.PRODUCT_TYPE_PRE)
-		for index, preOrder := range serialOrder.PreOrderLi {
+		day := serialOrder.PlanStartTime.Restore().Format("060102")
+		impl.ReplaceData(&serialOrder, serialNumber, day, product.CtrlStr1==meModel.PRODUCT_TYPE_PRE)
+		preOrderLi := make([]model.SerialOrder, 0)
+		for _, preOrder := range serialOrder.PreOrderLi {
+			if preOrder.OrderType == baseModel.ORDER_TYPE_CROSS {
+				continue
+			}
 			preOrder.MainOrderId = serialOrder.SerialOrderId
 			preOrder.SchedKey = serialOrder.SchedKey
 			preOrder.Priority = serialOrder.Priority
@@ -263,9 +268,11 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use
 				_ = session.Rollback()
 				return grmi.NewBusinessError("获取流水号失败，错误:" + err.Error())
 			}
-			impl.ReplaceData(&preOrder, serialNumber, true)
-			serialOrder.PreOrderLi[index] = preOrder
+			day := preOrder.PlanStartTime.Restore().Format("060102")
+			impl.ReplaceData(&preOrder, serialNumber, day,true)
+			preOrderLi = append(preOrderLi, preOrder)
 		}
+		serialOrder.PreOrderLi = preOrderLi
 		writeSerialOrderLi = append(writeSerialOrderLi, serialOrder)
 		writeSerialOrderStatusLi = append(writeSerialOrderStatusLi, serialOrder.SerialOrderStatus)
 		writeSerialOrderPoLi = append(writeSerialOrderPoLi, serialOrder.SerialOrderPOLstLi...)
@@ -421,8 +428,8 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use
 }
 
 // ReplaceData 替换工单数据中的工单ID
-func (impl *SerialOrderServiceImplement) ReplaceData(serialOrder *model.SerialOrder, serialNumber string, isPre bool) {
-	day := serialOrder.PlanStartTime.Restore().Format("060102")
+func (impl *SerialOrderServiceImplement) ReplaceData(serialOrder *model.SerialOrder, serialNumber string, day string, isPre bool) {
+	//day := serialOrder.PlanStartTime.Restore().Format("060102")
 	serialOrderId := strings.Replace(serialOrder.SerialOrderId, "$serialNumber$", serialNumber, 1)
 	if isPre {
 		serialOrderId = strings.Replace(serialOrderId, "$date$", day, 1)

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

@@ -948,10 +948,12 @@ func (impl *CustOrderServiceImplement) ReleaseCustOrder(user *global.User, custO
 					return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error() + ", 流水号Id:" + product.SerialOrderSnr)
 				}
 			}
-			serialOrderSvr.ReplaceData(&serialOrder, serialNumber, isPre)
+			waitReleaseSerialOrderLi[0].PlanStartTime.Restore()
+			day := waitReleaseSerialOrderLi[0].PlanStartTime.Restore().Format("060102")
+			serialOrderSvr.ReplaceData(&serialOrder, serialNumber, day, isPre)
 			for index, preOrder := range serialOrder.PreOrderLi {
 				preOrder.MainOrderId = serialOrder.SerialOrderId
-				serialOrderSvr.ReplaceData(&preOrder, preSerialNumber, true)
+				serialOrderSvr.ReplaceData(&preOrder, preSerialNumber, day, true)
 				serialOrder.PreOrderLi[index] = preOrder
 			}
 			writeSerialOrderLi = append(writeSerialOrderLi, serialOrder)