修改

src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -1620,6 +1620,13 @@ public class AMScontroller{
         return amsFeign.dispatchTruckOrderBySale(mapValue);
     }
 
+    @ApiOperation(value="销售公司直接选择车牌号派发内转钢材运输订单")
+    @PostMapping("/dispatchInwardTruckOrderBySale")
+    public Map<String,Object> dispatchInwardTruckOrderBySale(@RequestBody Map<String,Object> mapValue){
+        return amsFeign.dispatchInwardTruckOrderBySale(mapValue);
+    }
+
+
     @ApiOperation(value="展示销售焦炭订单")
     @PostMapping("/getCokeSaleOrderList")
     public RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -2008,4 +2015,10 @@ public class AMScontroller{
     ) {
         return amsFeign.getRangePoint(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
+
+    @ApiOperation(value = "更新内转钢材收货客户")
+    @PostMapping("/updateInwardConsignee")
+    public Map<String,Object> updateInwardConsignee(@RequestBody(required = false)Map<String,Object>map){
+        return amsFeign.updateInwardConsignee(map);
+    }
 }

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -2522,4 +2522,26 @@ public class TMSController extends BaseRESTfulController {
         }
         return tmsTruckFeign.getInwardSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
     }
+
+    @ApiOperation(value = "销售钢材派单列表")
+    @PostMapping("/getInwardSaleSteelOrder")
+    public Map<String,Object> getInwardSaleSteelOrder(@RequestBody(required = false)Map<String,Object>map,
+                                                       String startTime,
+                                                       String endTime,
+                                                       String carrierSsoId,
+                                                       String receiveName,
+                                                       String materialName,
+                                                       String specification,
+                                                       String remark,
+                                                       String capacityNo,
+                                                       String carrierName,
+                                                       String consigneeName,
+                                                       String saler){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardSaleSteelOrder(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
+    }
+
+
 }

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

@@ -1503,6 +1503,9 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchTruckOrderBySale")
     Map<String, Object> dispatchTruckOrderBySale(Map<String, Object> mapValue);
 
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchInwardTruckOrderBySale")
+    Map<String, Object> dispatchInwardTruckOrderBySale(Map<String, Object> mapValue);
+
     @PostMapping(value = "api/v1/ams/amssaleorders/getCokeSaleOrderList")
     RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    @RequestParam("pageNum") Integer pageNum,
@@ -1746,4 +1749,8 @@ public interface AmsFeign {
                                       @RequestParam Integer apiId,
                                       @RequestParam String con);
 
+
+
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/updateInwardConsignee")
+    Map<String, Object> updateInwardConsignee(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -732,6 +732,21 @@ public interface TmsTruckFeign {
                                                  @RequestParam("carrierName") String carrierName,
                                                  @RequestParam("consigneeName") String consigneeName,
                                                  @RequestParam("saler") String saler);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelOrder")
+    Map<String, Object> getInwardSaleSteelOrder(@RequestBody(required = false) Map<String, Object> map,
+                                                 @RequestParam("startTime") String startTime,
+                                                 @RequestParam("endTime") String endTime,
+                                                 @RequestParam("carrierSsoId") String carrierSsoId,
+                                                 @RequestParam("receiveName") String receiveName,
+                                                 @RequestParam("materialName") String materialName,
+                                                 @RequestParam("specification") String specification,
+                                                 @RequestParam("remark") String remark,
+                                                 @RequestParam("capacityNo") String capacityNo,
+                                                 @RequestParam("carrierName") String carrierName,
+                                                 @RequestParam("consigneeName") String consigneeName,
+                                                 @RequestParam("saler") String saler);
+
 }
 
 

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api
@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
@@ -19,21 +19,21 @@ openfeign:
   BmstruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:localhost:8047}
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:localhost:8086}
+    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:localhost:8090}
+    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8095}
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
   OTMSFeign: