diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java index fc2578c7..f19d21ea 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java +++ b/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 queryBatch(String partCode); + R queryBatch(@RequestParam("partCode") String partCode); /** * 返工订单 @@ -49,13 +48,13 @@ public interface IErpDataProduceClient { * 获取产品区域 */ @GetMapping(PRODUCT_APP_AREA) - R> getProductAppareaByPartCode(String partCode); + R> getProductAppareaByPartCode(@RequestParam("partCode") String partCode); /** * 获取产品版本 */ @GetMapping(VERSION) - R getVersionByPartCode(String partCode); + R getVersionByPartCode(@RequestParam("partCode") String partCode); /** * 获取保管员 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index c58cdd32..85f9aac8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -638,7 +638,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl 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) { diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml index 30f1fb6e..39aed5ee 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml @@ -63,7 +63,7 @@ ORDER BY a.reqdate DESC