diff --git a/services/om/implments/SerialOrder.service.impl.go b/services/om/implments/SerialOrder.service.impl.go index d1bdcba..c28c775 100644 --- a/services/om/implments/SerialOrder.service.impl.go +++ b/services/om/implments/SerialOrder.service.impl.go @@ -815,7 +815,7 @@ func (impl *SerialOrderServiceImplement) ReleaseSerialOrder(user *global.User, s } sfpBomHead.BomLstLi = sfpBomLstLi // 获取关联的所有零件ID - sfpArtMap := impl.ExtractArtId(bomHead) + sfpArtMap := impl.ExtractArtId(sfpBomHead) sfpArtIdLi := make([]string, 0, len(sfpArtMap)) for innerArtId := range sfpArtMap { sfpArtIdLi = append(sfpArtIdLi, innerArtId) @@ -857,6 +857,7 @@ func (impl *SerialOrderServiceImplement) ReleaseSerialOrder(user *global.User, s IsMainOrder: false, SFP: sfp, AllAttributeLi: sfpAllArticleAttributeLi, + ArtRelMap: sfpArtMap, } } mainOrderPOIdLi := make([]string, 0) @@ -886,6 +887,7 @@ func (impl *SerialOrderServiceImplement) ReleaseSerialOrder(user *global.User, s IsMainOrder: true, SFP: nil, AllAttributeLi: allArticleAttributeLi, + ArtRelMap: artMap, } // 获取所有使用工序的扫码校验规则 组建MAP数据结构 @@ -1054,7 +1056,7 @@ func (impl *SerialOrderServiceImplement) ReleaseSerialOrder(user *global.User, s return grmi.NewBusinessError("未获取到扫描校验详细规则, 工艺ID:" + strconv.Itoa(serialOrderStep.OperationId)) } - checkRuleMapPointer, allocateMapPointer, err := impl.ScanCodeCheck(user, session, checkRuleMap, allocateMap, artMap, &scanRule, &op, &serialOrderStep, op.Operation.ActivateInBKStation) + checkRuleMapPointer, allocateMapPointer, err := impl.ScanCodeCheck(user, session, checkRuleMap, allocateMap, orderOPData.ArtRelMap, &scanRule, &op, &serialOrderStep, op.Operation.ActivateInBKStation) if err != nil { _ = session.Rollback() return err @@ -2305,7 +2307,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftDataByCustOrder(user *glob } sfpBomHead.BomLstLi = sfpBomLstLi // 获取关联的所有零件ID - sfpArtMap := impl.ExtractArtId(bomHead) + sfpArtMap := impl.ExtractArtId(sfpBomHead) sfpArtIdLi := make([]string, 0, len(sfpArtMap)) for innerArtId := range sfpArtMap { sfpArtIdLi = append(sfpArtIdLi, innerArtId) @@ -2347,6 +2349,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftDataByCustOrder(user *glob IsMainOrder: false, SFP: sfp, AllAttributeLi: sfpAllArticleAttributeLi, + ArtRelMap: sfpArtMap, } } mainOrderPOIdLi := make([]string, 0) @@ -2376,6 +2379,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftDataByCustOrder(user *glob IsMainOrder: true, SFP: nil, AllAttributeLi: allArticleAttributeLi, + ArtRelMap: artMap, } // 获取所有使用工序的扫码校验规则 组建MAP数据结构 @@ -2547,7 +2551,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftDataByCustOrder(user *glob return grmi.NewBusinessError("未获取到扫描校验详细规则, 工艺ID:" + strconv.Itoa(serialOrderStep.OperationId)) } - checkRuleMapPointer, allocateMapPointer, err := impl.ScanCodeCheck(user, session, checkRuleMap, allocateMap, artMap, &scanRule, &op, &serialOrderStep, op.Operation.ActivateInBKStation) + checkRuleMapPointer, allocateMapPointer, err := impl.ScanCodeCheck(user, session, checkRuleMap, allocateMap, orderOPData.ArtRelMap, &scanRule, &op, &serialOrderStep, op.Operation.ActivateInBKStation) if err != nil { _ = session.Rollback() return err @@ -2789,7 +2793,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftData(user *global.User, se } sfpBomHead.BomLstLi = sfpBomLstLi // 获取关联的所有零件ID - sfpArtMap := impl.ExtractArtId(bomHead) + sfpArtMap := impl.ExtractArtId(sfpBomHead) sfpArtIdLi := make([]string, 0, len(sfpArtMap)) for innerArtId := range sfpArtMap { sfpArtIdLi = append(sfpArtIdLi, innerArtId) @@ -2828,6 +2832,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftData(user *global.User, se IsMainOrder: false, SFP: sfp, AllAttributeLi: sfpAllArticleAttributeLi, + ArtRelMap: sfpArtMap, } } mainOrderPOIdLi := make([]string, 0) @@ -2847,6 +2852,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftData(user *global.User, se if len(opLi) == 0 { return grmi.NewBusinessError("未获取到工艺数据") } + // 所有需要生成工单工序绑定的数据 orderPoMap[productId] = &model.OrderAUPoData{ Config: nil, @@ -2854,6 +2860,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftData(user *global.User, se IsMainOrder: true, SFP: nil, AllAttributeLi: allArticleAttributeLi, + ArtRelMap: artMap, } // 获取所有使用工序的扫码校验规则 组建MAP数据结构 @@ -3012,8 +3019,7 @@ func (impl *SerialOrderServiceImplement) GenerateCraftData(user *global.User, se if !exist { return grmi.NewBusinessError("未获取到扫描校验详细规则, 工艺ID:" + strconv.Itoa(serialOrderStep.OperationId)) } - - checkRuleMapPointer, allocateMapPointer, err := impl.ScanCodeCheck(user, session, checkRuleMap, allocateMap, artMap, &scanRule, &op, &serialOrderStep, op.Operation.ActivateInBKStation) + checkRuleMapPointer, allocateMapPointer, err := impl.ScanCodeCheck(user, session, checkRuleMap, allocateMap, orderOPData.ArtRelMap, &scanRule, &op, &serialOrderStep, op.Operation.ActivateInBKStation) if err != nil { return err } @@ -3045,7 +3051,6 @@ 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 { @@ -3065,7 +3070,6 @@ func (impl *SerialOrderServiceImplement) GenerateCraftData(user *global.User, se } else { templateId = generateRule.TemplateId } - fmt.Println("templateId:", templateId) printTemplate, exist = labelTemplateMap[templateId] if !exist { return grmi.NewBusinessError("存在单据打印规则中配置的标签模板, 模板ID:" + generateRule.TemplateId) @@ -3922,7 +3926,6 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use } if len(serialOrderLi) > 0 { _ = session.Rollback() - fmt.Println("schedKeyLi:", schedKeyLi) return grmi.NewBusinessError("生成的排序Key已存在工单") } now := time.Now()