From c31d125503a5f60979af84e2ce415a5483966bb8 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Thu, 21 Aug 2025 17:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8A=BD?=
 =?UTF-8?q?=E6=A0=B7=E7=AE=97=E6=B3=95=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/system/api/RemoteSapService.java     | 2 +-
 .../com/op/system/api/factory/RemoteSapFallbackFactory.java   | 2 +-
 .../main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml | 4 +++-
 .../java/com/op/sap/service/impl/SapRouterServiceImpl.java    | 1 +
 .../java/com/op/technology/controller/ProRouteController.java | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

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<Map<String, Object>> mapList);
 
     @PostMapping("/sap/sapRouterSync")
-    public R<Boolean> sapRouterSync(@RequestBody SapRouterQuery sapRouterQuery);
+    public R sapRouterSync(@RequestBody SapRouterQuery sapRouterQuery);
 
     @PostMapping("/sap/materialPreparation")
     public R<List<SapMaterialPreparation>>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<RemoteSapServic
             }
 
             @Override
-            public R<Boolean> 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}
 	</select>
     <select id="getTaskInfoCg" resultType="com.op.quality.domain.QcCheckTaskIncome">
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java
index 0f466640e..2c6a8a31a 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java
@@ -299,6 +299,7 @@ public class SapRouterServiceImpl implements SapRouterService {
                         sapProRoute.setUpdateBy(ANNAM);
                         sapProRoute.setUpdateTime(DateUtils.getNowDate());
                         sapProRouteMapper.updateProRoute(sapProRoute);
+                        successNum++;
                     }
                 }
 
diff --git a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java
index 11c777267..f37f669b7 100644
--- a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java
+++ b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java
@@ -194,7 +194,7 @@ public class ProRouteController extends BaseController {
         R r = remoteSapService.sapRouterSync(qo);
         logger.info("选择产品进行工艺更新结束:"+ JSONObject.toJSONString(r));
         if (r.getCode() == 200) {
-            return AjaxResult.success();
+            return AjaxResult.success(r.getData().toString());
         }
         return AjaxResult.error("手动同步失败");
     }