Merge remote-tracking branch 'origin/master'

op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java

@@ -280,7 +280,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
         for (EquPlanEquSpare spare : spares) {
             EquSpareApply apply = new EquSpareApply();
             apply.setApplyId(IdUtils.fastSimpleUUID());
-            apply.setApplyCode("A"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+String.format("%03d",applySerialNum));
+            apply.setApplyCode("A"+orderCode+String.format("%03d",applySerialNum));
             applySerialNum++;
             apply.setSpareCode(spare.getMaterialCode());
             apply.setSpareName(spare.getMaterialDesc());
@@ -305,6 +305,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
             System.out.println(plan.getPlanCode()+"========equ_spare_apply:"+sce);
         }
 
+
         /**equ_plan_detail->equ_order_detail*******************************************************/
         EquPlanDetail itqo = new EquPlanDetail();
         itqo.setParentCode(plan.getPlanEquId());

op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml

@@ -22,6 +22,7 @@
                ep.work_outsourcing_unit workOutsourcingUnit,
                ep.work_connection workConnection,
                ep.work_reason workReason,
+               ep.plan_code planCode,
                epe.equipment_code equipmentCode,
                epe.equipment_name equipmentName,
                epe.id planEquId

op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java

@@ -79,6 +79,7 @@ public class SapController extends BaseController {
         R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
         List<Map<String, String>> dateSources = dateSources0.getData();
         dateSources.forEach(dateSource -> {
+            if(!"ds_999".equals(dateSource.get("poolName"))){
                 logger.info("++++++++++++" + dateSource.get("poolName") + "++++product同步开始++++++++++");
                 DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key
 
@@ -96,6 +97,7 @@ public class SapController extends BaseController {
                     logger.error("++++++++++++" + dateSource.get("poolName")+"同步product失败，错误信息："+ r.getMsg());
                 }
                 logger.error("++++++++++++" + dateSource.get("poolName") + "++++product同步结束++++++++++");
+            }
         });
         return R.ok();
     }
@@ -115,6 +117,7 @@ public class SapController extends BaseController {
         R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
         List<Map<String, String>> dateSources = dateSources0.getData();
         dateSources.forEach(dateSource -> {
+            if(!"ds_999".equals(dateSource.get("poolName"))) {
                 logger.info("++++++++++++" + dateSource.get("poolName") + "++++bom同步开始++++++++++");
                 DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key
 
@@ -132,6 +135,7 @@ public class SapController extends BaseController {
                     logger.error("++++++++++++" + dateSource.get("poolName") + "同步bom失败，错误信息：" + r.getMsg());
                 }
                 logger.error("++++++++++++" + dateSource.get("poolName") + "++++bom同步结束++++++++++");
+            }
         });
         return R.ok();
 
@@ -152,6 +156,7 @@ public class SapController extends BaseController {
         R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
         List<Map<String, String>> dateSources = dateSources0.getData();
         dateSources.forEach(dateSource -> {
+            if(!"ds_999".equals(dateSource.get("poolName"))) {
                 logger.info("++++++++++++" + dateSource.get("poolName") + "++++工艺同步开始++++++++++");
                 DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key
 
@@ -170,9 +175,9 @@ public class SapController extends BaseController {
                     logger.error("++++++++++++" + dateSource.get("poolName") + "同步工艺失败，错误信息：" + r.getMsg());
                 }
                 logger.error("++++++++++++" + dateSource.get("poolName") + "++++工艺同步结束++++++++++");
+            }
         });
         return R.ok();
-
     }
 
     /**