查询一级工序名称

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);
 }

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);
 	}
 
 	/**

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())){

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);
+	}
 }

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);
+
 }

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>

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);
 }

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;
+    }
 }