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

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

@@ -295,6 +295,7 @@ func (impl *SerialOrderServiceImplement) GenerateProductCraft(user *global.User,
 	twMap := make(map[int][]baseModel.TightenWrenchInfo)
 	planDate := serialOrder.PlanStartDate.Restore().Format(grmi.DateOutFormat)
 	schedKey := serialOrder.SchedKey
+	priority := serialOrder.Priority
 	var usedArticle *baseModel.Article
 	var usedSerialOrder *model.SerialOrder
 	for _, orderOPData := range orderPoMap {
@@ -333,6 +334,7 @@ func (impl *SerialOrderServiceImplement) GenerateProductCraft(user *global.User,
 				LastPieceInBatch: serialOrder.LastPieceInBatch,
 				PreSchedKey:      schedKey,
 				SchedKey:         schedKey,
+				Priority:         priority,
 				OrderType:        baseModel.ORDER_TYPE_PRE,
 				OrderType1:       serialOrder.OrderType1,
 				OrderType2:       serialOrder.OrderType2,

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

@@ -198,6 +198,8 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use
 			copy(preSerialOrder.LabelDetailLi, serialOrder.LabelDetailLi)
 			for _, preOrder := range serialOrder.PreOrderLi {
 				newPreOrder := preOrder
+				newPreOrder.SchedKey = serialOrder.SchedKey
+				newPreOrder.Priority = serialOrder.Priority
 				newPreOrder.SerialOrderPOLstLi = make([]model.SerialOrderPOLst, len(preOrder.SerialOrderPOLstLi), len(preOrder.SerialOrderPOLstLi))
 				newPreOrder.SerialOrderStepLstLi = make([]model.SerialOrderStepLst, len(preOrder.SerialOrderStepLstLi), len(preOrder.SerialOrderStepLstLi))
 				newPreOrder.SerialOrderOPDetailLi = make([]model.SerialOrderOPDetail, len(preOrder.SerialOrderOPDetailLi), len(preOrder.SerialOrderOPDetailLi))
@@ -224,6 +226,8 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use
 			copy(serialOrder.LabelDetailLi, preSerialOrder.LabelDetailLi)
 			for _, preOrder := range preSerialOrder.PreOrderLi {
 				newPreOrder := preOrder
+				newPreOrder.SchedKey = serialOrder.SchedKey
+				newPreOrder.Priority = serialOrder.Priority
 				newPreOrder.SerialOrderPOLstLi = make([]model.SerialOrderPOLst, len(preOrder.SerialOrderPOLstLi), len(preOrder.SerialOrderPOLstLi))
 				newPreOrder.SerialOrderStepLstLi = make([]model.SerialOrderStepLst, len(preOrder.SerialOrderStepLstLi), len(preOrder.SerialOrderStepLstLi))
 				newPreOrder.SerialOrderOPDetailLi = make([]model.SerialOrderOPDetail, len(preOrder.SerialOrderOPDetailLi), len(preOrder.SerialOrderOPDetailLi))
@@ -251,6 +255,8 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use
 		impl.ReplaceData(&serialOrder, serialNumber, product.CtrlStr1==meModel.PRODUCT_TYPE_PRE)
 		for index, preOrder := range serialOrder.PreOrderLi {
 			preOrder.MainOrderId = serialOrder.SerialOrderId
+			preOrder.SchedKey = serialOrder.SchedKey
+			preOrder.Priority = serialOrder.Priority
 			serialNumber, err = snrDao.GetNextSnrWithTime(project.PreOrderSnr, serialOrder.PlanStartTime.Restore())
 			if err != nil {
 				_ = session.Rollback()