工艺路线同步方法修改，抽样算法修改优化。

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

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

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">

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

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("手动同步失败");
     }