From 95fe9c5134080ca8c004ba254fe0148dca4613b0 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Fri, 29 May 2026 14:11:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=80=E7=BA=A7=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erpdata/feign/IErpDataPartClient.java      |  9 +++++++++
 .../service/impl/DsPartServiceImpl.java        |  6 ++----
 .../service/impl/YieldOrderServiceImpl.java    | 18 +++++++++++++++++-
 .../erpdata/feign/ErpDataPartClient.java       |  5 +++++
 .../erpdata/mapper/ErpPartMapper.java          |  3 +++
 .../erpdata/mapper/ErpPartMapper.xml           |  4 ++++
 .../erpdata/service/IErpPartService.java       |  8 ++++++++
 .../service/impl/ErpPartServiceImpl.java       |  7 +++++++
 8 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataPartClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataPartClient.java
index f2e17a710..c3f83fa50 100644
--- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataPartClient.java
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataPartClient.java
@@ -46,6 +46,7 @@ public interface IErpDataPartClient {
 	String API_PREFIX = "/feign/erpdata/client";
 	String SENDING_PART_GIVE_ERP = API_PREFIX + "/sendingPartGiveErp";
 	String OPEN_PDM_DRAWING = API_PREFIX + "/openPdmDrawing";
+	String FIND_NAME_BY_ROAM_NO = API_PREFIX + "/findNameByRoamNo";
 
 	/**
 	 * 调用erp过程发送零件信息（烧结零件不同步erp）
@@ -61,4 +62,12 @@ public interface IErpDataPartClient {
 	 */
 	@GetMapping(OPEN_PDM_DRAWING)
 	String openPdmDrawing(@RequestParam("partCode") String partCode);
+
+	/**
+	 * 获取一级工序名称
+	 * @param partCode
+	 * @return
+	 */
+	@GetMapping(FIND_NAME_BY_ROAM_NO)
+	String findNameByRoamNo(@RequestParam("partCode") String partCode,@RequestParam("roamNo") String roamNo);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
index f8d42a900..02d05107e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
@@ -611,10 +611,8 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 
 	@Override
 	public String findNameByRoamNo(String partCode, String roamNo) {
-		//TODO 到ERP数据中查询数据
-//		sb.append(" select a.firseqname from dba_mgr.v_mes_rb_partoplink@erp_mes_link a ");
-//		sb.append(" where a.prtno=:partCode and a.firseq=:roamNo ");
-		return null;
+		// 到ERP数据中查询数据
+		return erpDataPartClient.findNameByRoamNo(partCode, roamNo);
 	}
 
 	/**
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 f2c64aaf8..38a8a452b 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
@@ -341,8 +341,24 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
                 this.updateById(yieldOrder);
             }
 
+            //校验B号
+            if(StringUtils.isEmpty(yieldOrder.getRoamNo())){
+                yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode());
+                yieldOrder.setValidationTime(DateUtil.now());
+                yieldOrder.setValidationMomo("未查询到B号");
+                this.updateById(yieldOrder);
+            }
+            //查询一级工序名称
+            String roamNoText = dsPartService.findNameByRoamNo(yieldOrder.getPartCode(), yieldOrder.getRoamNo());
+            if(StringUtils.isEmpty(roamNoText)){
+                yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode());
+                yieldOrder.setValidationTime(DateUtil.now());
+                yieldOrder.setValidationMomo("未查询一级工序名称");
+                this.updateById(yieldOrder);
+            }
+
             // 验证烧结订单的b号描述，如果包含封接字样则验证子件，不包含则不验证
-            if (primaryCraft.contains(YieldOrderConst.ROAMNO_TEXT_FJ)) {
+            if (roamNoText.contains(YieldOrderConst.ROAMNO_TEXT_FJ)) {
                 DsPartEntity partEntity = dsPartService.selectDsPartByPatCodeAndVersion(yieldOrder.getPartCode(), yieldOrder.getPartVersion());
                 // 烧结订单 需要校验子件必须包含【玻璃饼、壳体、插针、石墨模】
                 if(yieldOrder.getYieldType().equals(YieldOrderEnum.YIELD_TYPE_2.getCode())){
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataPartClient.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataPartClient.java
index 165092ab8..d762d175a 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataPartClient.java
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataPartClient.java
@@ -32,4 +32,9 @@ public class ErpDataPartClient implements  IErpDataPartClient{
 	public String openPdmDrawing(String partCode) {
 		return partService.openPdmDrawing(partCode);
 	}
+
+	@Override
+	public String findNameByRoamNo(String partCode, String roamNo) {
+		return partService.findNameByRoamNo(partCode,roamNo);
+	}
 }
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartMapper.java
index 2c1b5ef51..5317617a1 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartMapper.java
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartMapper.java
@@ -16,4 +16,7 @@ public interface ErpPartMapper extends Mapper {
     String selectPdmpart(@Param("partCode") String partCode);
 
     String selectPrtbasdef(@Param("partCode") String partCode);
+
+    String findNameByRoamNo(@Param("partCode")String partCode,@Param("roamNo") String roamNo);
+
 }
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartMapper.xml
index 667602d2d..f097b2bfa 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartMapper.xml
@@ -14,5 +14,9 @@
         WHERE a.prtno = #{partCode}
         AND ROWNUM = 1;
     </select>
+    <select id="findNameByRoamNo" resultType="java.lang.String">
+        select a.firseqname from dba_mgr.v_mes_rb_partoplink a
+        where a.prtno = #{partCode} and a.firseq = #{roamNo}
+    </select>
 
 </mapper>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpPartService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpPartService.java
index d87d50269..c8d2d9738 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpPartService.java
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpPartService.java
@@ -25,4 +25,12 @@ public interface IErpPartService {
      * @return
      */
     String openPdmDrawing(String partCode);
+
+    /**
+     * 获取erp一级工序名称
+     * @param partCode
+     * @param roamNo
+     * @return
+     */
+    String findNameByRoamNo(String partCode, String roamNo);
 }
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpPartServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpPartServiceImpl.java
index 2d5c2bd55..8d9134b61 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpPartServiceImpl.java
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpPartServiceImpl.java
@@ -83,4 +83,11 @@ public class ErpPartServiceImpl  implements IErpPartService {
         log.warn("未找到零件{}的pdm图纸地址", partCode);
         return null;
     }
+
+    @Override
+    public String findNameByRoamNo(String partCode, String roamNo) {
+        log.info("查询erp获取一级工序名称:{},roamNo:{}",partCode,roamNo);
+        String firseqname = erpPartMapper.findNameByRoamNo(partCode,roamNo);
+        return firseqname;
+    }
 }