From 7702e103fa14457b26cc7fc23bd234a54f565b31 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Thu, 28 May 2026 11:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=A7=E7=BB=93=E8=AE=A2=E5=8D=95=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=AD=90=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/YieldOrderServiceImpl.java   | 70 ++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index 0c078b7e5..83028a5ec 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -476,11 +476,79 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
             if (!result) {
                 yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
                 yieldOrder.setValidationTime(DateUtil.now());
-                yieldOrder.setValidationMomo("未查询到零件信息！");
+                yieldOrder.setValidationMomo(yieldOrder.getPartCode()+": 未查询到零件信息！");
                 this.updateById(yieldOrder);
                 return null;
             }
         }
+        // 烧结订单 需要校验子件必须包含【玻璃饼、壳体、插针、石墨模】
+        if(yieldOrder.getYieldType().equals(YieldOrderEnum.YIELD_TYPE_2.getCode())){
+            if(partEntity == null){
+                yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
+                yieldOrder.setValidationTime(DateUtil.now());
+                yieldOrder.setValidationMomo(yieldOrder.getPartCode()+": 未查询到零件信息！");
+                this.updateById(yieldOrder);
+                return null;
+            }
+
+            List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
+            List<Long> childPartIdList = partRelationEntityList.stream()
+                    .map(DsPartRelationEntity::getChildPartId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+
+            if (CollectionUtils.isEmpty(childPartIdList)) {
+                yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
+                yieldOrder.setValidationTime(DateUtil.now());
+                yieldOrder.setValidationMomo(partEntity.getPartCode()+" :未查询到子件信息");
+                this.updateById(yieldOrder);
+                return null;
+            }
+
+            List<DsPartEntity> dsPartEntityList = dsPartService.listByIds(childPartIdList);
+
+            // 收集所有子件的
+            Set<Integer> sinTerTypeSet = dsPartEntityList.stream()
+                    .map(DsPartEntity::getSinTerType)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+            if(CollectionUtils.isEmpty(sinTerTypeSet)){
+                yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
+                yieldOrder.setValidationTime(DateUtil.now());
+                yieldOrder.setValidationMomo(partEntity.getPartCode()+" :子件类型为空");
+                this.updateById(yieldOrder);
+                return null;
+            }
+
+            // 校验必须包含的零件类型
+            List<Integer> requiredTypes = Arrays.asList(DsPartConstant.SIN_TER_TYPE_CZ, DsPartConstant.SIN_TER_TYPE_KT, DsPartConstant.SIN_TER_TYPE_BLB, DsPartConstant.SIN_TER_TYPE_SMM);
+
+            List<Integer> missingTypes = new ArrayList<>();
+            for (Integer requiredType : requiredTypes) {
+                if (!sinTerTypeSet.contains(requiredType)) {
+                    missingTypes.add(requiredType);
+                }
+            }
+
+            if (!missingTypes.isEmpty()) {
+                String missingDesc = missingTypes.stream()
+                        .map(type -> {
+                            if (type.equals(DsPartConstant.SIN_TER_TYPE_CZ)) return "插针";
+                            if (type.equals(DsPartConstant.SIN_TER_TYPE_KT)) return "壳体";
+                            if (type.equals(DsPartConstant.SIN_TER_TYPE_BLB)) return "玻璃饼";
+                            if (type.equals(DsPartConstant.SIN_TER_TYPE_SMM)) return "石墨模";
+                            return "未知类型(" + type + ")";
+                        })
+                        .collect(Collectors.joining("、"));
+
+                yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
+                yieldOrder.setValidationTime(DateUtil.now());
+                yieldOrder.setValidationMomo("零件："+partEntity.getPartCode()+" 缺少子件类型: " + missingDesc);
+                this.updateById(yieldOrder);
+                return null;
+            }
+
+        }
 
         Integer rank;
         // 先判断是否是热表订单 不是返回二级工艺