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

src/main/java/com/steerinfo/dil/feign/BmsTruckFeign.java

@@ -20,5 +20,5 @@ public interface BmsTruckFeign {
     public RESTfulResult addDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addInwardDetailsOrder")
-    Map<String,Object> addDetailsOrder(Map<String,Object> map);
+    Map<String,Object> addInwardDetailsOrder(Map<String,Object> map);
 }

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

@@ -254,7 +254,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                         omsFeign.addPurInwardOrder(orderId);
                     }
                     try {
-                        bmsTruckFeign.addDetailsOrder(map);
+                        bmsTruckFeign.addInwardDetailsOrder(map);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }

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

@@ -394,21 +394,18 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
         Map<String,Object>mapPrice = null;
         try {
             mapPrice = amsFeign.getInwardPriceBy(mapInfo);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if(mapPrice != null){
-            mapPrice.put("orderId",orderId1);
-            try {
+            if(mapPrice != null){
+                mapPrice.put("orderId",orderId1);
                 mapPrice.putAll(map);
-                Map<String, Object> stringObjectMap = bmsTruckFeign.addDetailsOrder(mapPrice);
+                Map<String, Object> stringObjectMap = bmsTruckFeign.addInwardDetailsOrder(mapPrice);
                 if (stringObjectMap==null){
-                   throw new Exception("生成账单失败");
+                    return -1;
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
+
         return i;
     }
 }

src/main/resources/application-dev.yml

@@ -25,13 +25,13 @@ openfeign:
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+    url: ${BMSTRUCKFEIGN_URL:localhost:8009}
   WmshBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   QmsFeign:
@@ -39,7 +39,7 @@ openfeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
 
 server:
   port: 8008