1

src/main/java/com/srq/modules/schedule/service/Impl/ScheduleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.srq.modules.schedule.service.Impl;
 
+import com.alibaba.fastjson.JSON;
 import com.srq.common.utils.BigDecimalUtils;
 import com.srq.modules.base.entity.OperatorData;
 import com.srq.modules.base.entity.SfdcDefectHist;
@@ -365,10 +366,11 @@ public class ScheduleServiceImpl implements ScheduleService {
         reportErpData.setReportDetails(reportDetails);
         ResponseData responseData1 = HttpClientUtil.doPostByRaw(interfaceUrl + "/mesReport/productReport", reportErpData);
         //获取接口返回数据
-        String interfaceMsg = responseData1.getMsg();
-        String interfaceCode = responseData1.getCode();
+        ResponseData interfaceMsg = JSON.parseObject(responseData1.getMsg(),ResponseData.class);
+
+        String interfaceCode = interfaceMsg.getCode();
         if(!"200".equals(interfaceCode)){
-            throw new RuntimeException("ERP接口有问题，请重试！");
+            throw new RuntimeException(interfaceMsg.getMsg());
         }
     }
     @Override
@@ -394,23 +396,31 @@ public class ScheduleServiceImpl implements ScheduleService {
         }else if(Integer.parseInt(String.valueOf(map.get("resultCode")))  != 200) {
             throw new RuntimeException(String.valueOf(map.get("resultMsg")));
         }
-        SOScheduledRoutingOutData soScheduledRoutingOutData=new SOScheduledRoutingOutData();
+        if(false) {
+            SOScheduledRoutingOutData soScheduledRoutingOutData = new SOScheduledRoutingOutData();
             soScheduledRoutingOutData.setOrderNo(inData.getOrderNo());
             soScheduledRoutingOutData.setSite(inData.getSite());
-        List<SOScheduledRoutingOutData>  scheduleList= scheduleMapper.getSOScheduleRoutingData(soScheduledRoutingOutData);
-        ReportErpData reportErpData=new ReportErpData();
+            List<SOScheduledRoutingOutData> scheduleList = scheduleMapper.getSOScheduleRoutingData(soScheduledRoutingOutData);
+            ReportErpData reportErpData = new ReportErpData();
             reportErpData.setOrderNo(scheduleList.get(0).getOrderRef1());
             reportErpData.setSite(scheduleList.get(0).getSite());
             reportErpData.setReleasedNo(scheduleList.get(0).getOrderRef2());
             reportErpData.setSequenceNo(scheduleList.get(0).getOrderRef3());
             reportErpData.setItemNo(scheduleList.get(0).getItemNo().intValue());
-        reportErpData.setReportId(scheduleList.get(0).getSite()+"-"+scheduleList.get(0).getOrderNo()+"-"+reportErpData.getItemNo()+"-"+inData.getSeqNo());
+            reportErpData.setReportId(scheduleList.get(0).getSite() + "-" + scheduleList.get(0).getOrderNo() + "-" + reportErpData.getItemNo() + "-" + inData.getSeqNo());
             ResponseData responseData1 = HttpClientUtil.doPostByRaw(interfaceUrl + "/mesReport/cancelProductReport", reportErpData);
             //获取接口返回数据
-        String interfaceMsg = responseData1.getMsg();
-        String interfaceCode = responseData1.getCode();
-        if(!"200".equals(interfaceCode)){
-            throw new RuntimeException("ERP接口有问题，请重试！");
+            // String interfaceMsg = responseData1.getMsg();
+            // String interfaceCode = responseData1.getCode();
+            // if(!"200".equals(interfaceCode)){
+            //     throw new RuntimeException("ERP接口有问题，请重试！");
+            // }
+            ResponseData interfaceMsg = JSON.parseObject(responseData1.getMsg(), ResponseData.class);
+
+            String interfaceCode = interfaceMsg.getCode();
+            if (!"200".equals(interfaceCode)) {
+                throw new RuntimeException(interfaceMsg.getMsg());
+            }
         }
     }
 

src/main/resources/application-dev.yml

@@ -5,9 +5,9 @@ spring:
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
       type: com.alibaba.druid.pool.DruidDataSource
       #url: jdbc:sqlserver://xujiesoft.vicp.net:11512;databaseName=XJMES
-      url: jdbc:sqlserver://192.168.1.84:1433;databaseName=SRQ_MES
-      username: xjsoft
-      password: XsoftJ123
+      url: jdbc:sqlserver://3hifs.3hcorp.com:1433;databaseName=SRQ_MES_TEST
+      username: sa
+      password: SRQmes123@
       initial-size: 10
       max-active: 100
       min-idle: 10
@@ -38,21 +38,26 @@ spring:
 ##多数据源的配置
 dynamic:
   datasource:
-    slave1:
-      driver-class-name: oracle.jdbc.OracleDriver
-      url: jdbc:oracle:thin:@192.168.1.146:1521/RACE
-      validation-query: SELECT 1 FROM DUAL
-      username: ifsapp
-      password: ifsapp
 #    slave1:
 #      driver-class-name: oracle.jdbc.OracleDriver
-#      url: jdbc:oracle:thin:@3hifs.3hcorp.com:1521/pdb
+#      url: jdbc:oracle:thin:@192.168.1.146:1521/RACE
 #      validation-query: SELECT 1 FROM DUAL
 #      username: ifsapp
 #      password: ifsapp
+    slave1:
+      driver-class-name: oracle.jdbc.OracleDriver
+      url: jdbc:oracle:thin:@3hifs.3hcorp.com:1521/pdb
+      validation-query: SELECT 1 FROM DUAL
+      username: ifsapp
+      password: ifsapp
+#    slave2:
+#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#      url: jdbc:sqlserver://192.168.1.84:1433;databaseName=SRQ_MES
+#      username: xjsoft
+#      password: XsoftJ123
     slave2:
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-      url: jdbc:sqlserver://192.168.1.84:1433;databaseName=SRQ_MES
-      username: xjsoft
-      password: XsoftJ123
+      url: jdbc:sqlserver://3hifs.3hcorp.com:1433;databaseName=SRQ_MES_TEST
+      username: sa
+      password: SRQmes123@
 

src/main/resources/application.yml

@@ -83,4 +83,4 @@ logging:
     org.springframework.jdbc.core.JdbcTemplate: DEBUG
 com:
   interface:
-    url: http://127.0.0.1:8068    # ERP接口名
+    url: http://192.168.1.128:8068    # ERP接口名