diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java index 11354e6b8..cab856c42 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java @@ -36,7 +36,7 @@ public interface RemoteSapService { public R shopOrderBomUpdate(@RequestBody(required = false) List> mapList); @PostMapping("/sap/sapRouterSync") - public R sapRouterSync(@RequestBody SapRouterQuery sapRouterQuery); + public R sapRouterSync(@RequestBody SapRouterQuery sapRouterQuery); @PostMapping("/sap/materialPreparation") public R>materialPreparation(@RequestParam("shopOrder") String shopOrder); diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java index eeaa3b628..15b438725 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java @@ -29,7 +29,7 @@ public class RemoteSapFallbackFactory implements FallbackFactory sapRouterSync(SapRouterQuery sapRouterQuery) { + public R sapRouterSync(SapRouterQuery sapRouterQuery) { return R.fail("SAP服务同步工艺失败:" + throwable.getMessage()); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index f02976a7f..091428581 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -651,9 +651,11 @@ qct.remark_code remarkCode, qct.cxzz, qct.jgy, - qct.pgy + qct.pgy, + bp.umrez from qc_check_task qct left join pro_order_workorder pow on pow.workorder_code = qct.order_no and pow.del_flag = '0' + LEFT JOIN base_product bp ON qct.material_code = bp.product_code AND bp.del_flag = '0' where qct.record_id = #{recordId}