生产管理修改

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java

@@ -19,8 +19,7 @@ import java.util.Map;
  * @author Chill
  */
 @FeignClient(
-	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
-	fallback = IErpDataProduceClientFallback.class
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME
 )
 public interface IErpDataProduceClient {
 
@@ -37,7 +36,7 @@ public interface IErpDataProduceClient {
 	 * 缺件申报-通过零件号获取批次号
      */
 	@GetMapping(QUERY_BATCH)
-	R<QueryBatchVO> queryBatch(String partCode);
+	R<QueryBatchVO> queryBatch(@RequestParam("partCode") String partCode);
 
 	/**
 	 * 返工订单
@@ -49,13 +48,13 @@ public interface IErpDataProduceClient {
 	 * 获取产品区域
 	 */
 	@GetMapping(PRODUCT_APP_AREA)
-	R<Map<String, String>> getProductAppareaByPartCode(String partCode);
+	R<Map<String, String>> getProductAppareaByPartCode(@RequestParam("partCode") String partCode);
 
 	/**
 	 * 获取产品版本
 	 */
 	@GetMapping(VERSION)
-	R<String> getVersionByPartCode(String partCode);
+	R<String> getVersionByPartCode(@RequestParam("partCode") String partCode);
 
 	/**
 	 * 获取保管员

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -638,7 +638,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             // 产品应用领域
             if (yo.getPartCode() != null) {
                 Map<String, String> productInfo = this.getProductAppareaByPartCode(yo.getPartCode());
-                map.put("productApparea", StringUtils.isNotBlank(productInfo.get("productapparea")) ? productInfo.get("productapparea") : "/");
+                map.put("productApparea", productInfo != null && StringUtils.isNotBlank(productInfo.get("productapparea")) ? productInfo.get("productapparea") : "/");
             }
             // 图纸版次
             if (yo.getPartCode() != null) {

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml

@@ -63,7 +63,7 @@
         ORDER BY a.reqdate DESC
     </select>
     <select id="getProductAppareaByPartCode" resultType="java.util.Map">
-        select b.productapparea, b.cgzmark from ( select a.* from dba_mgr.t_prtbasdef a
+        select nvl(b.productapparea,'无') as productapparea, nvl(b.cgzmark,'无') as cgzmark from ( select a.* from dba_mgr.t_prtbasdef a
         where a.prtno = #{partCode}) b where rownum = 1
     </select>
     <select id="getVersionByPartCode" resultType="java.lang.String">