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

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

@@ -1107,10 +1107,10 @@ func (impl *SerialOrderServiceImplement) ReleaseSerialOrder(user *global.User, s
 				if len(generateRuleLi) == 1 {
 					generateRule = &generateRuleLi[0]
 					var usedTemplateId string
-					if generateRule.MainCodeName == "Pre" {
-						usedTemplateId = generateRule.TemplateId
-					} else {
+					if generateRule.MainCodeName == "Product" {
 						usedTemplateId = product.PrintTemplateId
+					} else {
+						usedTemplateId = generateRule.TemplateId
 					}
 					printTemplate, exist = labelTemplateMap[usedTemplateId]
 					if !exist {
@@ -2585,6 +2585,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftDataByCustOrder(user *glob
 							_ = session.Rollback()
 							return grmi.NewBusinessError("未获取到打印规则, 工艺ID:" + strconv.Itoa(serialOrderStep.OperationId))
 						}
+
 						generateRuleLi := make([]baseModel.PrintBasicRuleInfo, 0)
 						for _, rule := range ruleLi {
 							if rule.Action == baseModel.PRINT_RULE_ACTION_UPDATE {
@@ -2600,10 +2601,10 @@ func (impl *SerialOrderServiceImplement) GenerateCraftDataByCustOrder(user *glob
 						if len(generateRuleLi) == 1 {
 							generateRule = &generateRuleLi[0]
 							var templateId string
-							if generateRule.MainCodeName == "Pre" {
-								templateId = generateRule.TemplateId
-							} else {
+							if generateRule.MainCodeName == "Product" {
 								templateId = product.PrintTemplateId
+							} else {
+								templateId = generateRule.TemplateId
 							}
 							printTemplate, exist = labelTemplateMap[templateId]
 							if !exist {
@@ -3044,6 +3045,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftData(user *global.User, se
 					if !exist {
 						return grmi.NewBusinessError("未获取到打印规则, 工艺ID:" + strconv.Itoa(serialOrderStep.OperationId))
 					}
+					fmt.Println("serialOrderStep.OperationId:", serialOrderStep.OperationId)
 					generateRuleLi := make([]baseModel.PrintBasicRuleInfo, 0)
 					for _, rule := range ruleLi {
 						if rule.Action == baseModel.PRINT_RULE_ACTION_UPDATE {
@@ -3058,11 +3060,12 @@ func (impl *SerialOrderServiceImplement) GenerateCraftData(user *global.User, se
 					if len(generateRuleLi) == 1 {
 						generateRule = &generateRuleLi[0]
 						var templateId string
-						if generateRule.MainCodeName == "Pre" {
-							templateId = generateRule.TemplateId
-						} else {
+						if generateRule.MainCodeName == "Product" {
 							templateId = product.PrintTemplateId
+						} else {
+							templateId = generateRule.TemplateId
 						}
+						fmt.Println("templateId:", templateId)
 						printTemplate, exist = labelTemplateMap[templateId]
 						if !exist {
 							return grmi.NewBusinessError("存在单据打印规则中配置的标签模板, 模板ID:" + generateRule.TemplateId)