Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API into dev

src/main/java/com/steerinfo/dil/service/impl/TmstruckEnfactoryResultServiceImpl.java

@@ -237,9 +237,9 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 map.put("materialId", materialId);
                 checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
         }
-        if(checkMeasureCommission == 0){
-            throw new Exception("委托发送失败");
-        }
+//        if(checkMeasureCommission == 0){
+//            throw new Exception("委托发送失败");
+//        }
         i += tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(generateEnFactoryResult(map)); //添加进厂实绩
         //修改路段顺序号
         i += utilsService.updateOrderLineSequence(map);

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -54,6 +54,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     @Autowired
     OmsFeign omsFeign;
 
+    @Autowired
+    BmsTruckFeign bmsTruckFeign;
+
     @Autowired
     AmsFeign amsFeign;
 
@@ -215,6 +218,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 if (closeStatus != null && DataChange.dataToBigDecimal(closeStatus).intValue() == 0) {
                     amsFeign.dispatchTruckOrderByCarrier(mapValue);
                 }
+                bmsTruckFeign.addDetailsOrder(orderId);
                 break;
             case 4:
                 break;

src/main/java/com/steerinfo/dil/service/impl/TmstruckLoadResultServiceImpl.java

@@ -313,6 +313,12 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             }
             tmstruckLoadResult.setInsertUpdateRemark(insertUpdateRemark);
         }
+<<<<<<< HEAD
+//        if (j == 0) {
+//            throw new Exception("第二次委托发送失败");
+//        }
+=======
+>>>>>>> bf4c2967e0e6aa0fe1e443c7ac538afb6341c61d
         tmstruckLoadResult.setCaseNumber((String) map.get("caseNumber"));
         i += tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //推送消息到websocket

src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -123,11 +123,11 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         Integer shipperId = tmstruckMeasureCommissionMapper.getShipperIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
         if(shipperId == 1){
             //发送委托给达州钢铁
-            i += sendMeasureCommissionMes(map);
+//            i += sendMeasureCommissionMes(map);
         }
         if(shipperId == 2) {
             //发送委托给达兴能源
-            i += sendDXMeasureCommissionMes(map);
+//            i += sendDXMeasureCommissionMes(map);
         }
         return i;
     }

src/main/resources/application-dev.yml

@@ -21,7 +21,7 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmsTruckFeign:
@@ -31,15 +31,15 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   JoinFeign:
-    url: ${JOINFEIGN_URL:localhost:8006}
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
   QmsFeign:
     url: ${QMSFEIGN_URL:172.16.33.162:8017}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
 
 server:
   port: 8008

src/main/resources/com/steerinfo/dil/mapper/UtilsMapper.xml

@@ -202,9 +202,13 @@
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.ORDER_ID = OO.ORDER_ID
+<<<<<<< HEAD
+        where  OO.ORDER_NUMBER=#{orderNumber}
+=======
         left join RMS_CAPACITY RC
             on OO.CAPACITY_ID = RC.CAPACITY_ID
         where  OO.order_Number=#{orderNumber}
+>>>>>>> bf4c2967e0e6aa0fe1e443c7ac538afb6341c61d
     </select>
 
     <select id="getLineSequenceByOrderNumber" parameterType="string" resultType="java.lang.Integer">