dsas

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

@@ -415,11 +415,12 @@ public class AMScontroller{
                                                              Integer pageNum,
                                                              Integer pageSize,
                                                              Integer apiId,
+                                                             String con,
                                                              Integer deleted) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, deleted);
+        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, con,deleted);
     }
 
     @PostMapping("/getInwardContractPrice")
@@ -428,11 +429,12 @@ public class AMScontroller{
                                                              Integer pageNum,
                                                              Integer pageSize,
                                                              Integer apiId,
-                                                             Integer deleted) {
+                                                             Integer deleted,
+                                                             String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getInwardContractPrice(mapValue, pageNum, pageSize, apiId, deleted);
+        return amsFeign.getInwardContractPrice(mapValue, pageNum, pageSize, apiId, deleted,con);
     }
 
 
@@ -2064,4 +2066,12 @@ public class AMScontroller{
         return amsFeign.addSteelSaleOrderList(mapList);
     }
 
+    @PostMapping("/updateTransPrice")
+    @ApiOperation(value = "修改内转汽运单价")
+    public Map<String, Object> updateTransPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.updateTransPrice(mapValue);
+    }
 }

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

@@ -250,4 +250,9 @@ public class OTMSController {
                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize){
         return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
+
+    @GetMapping("/getLocationForAddress")
+    public RESTfulResult getLocationForAddress(@RequestParam("address") String address){
+        return otmsFeign.getLocationForAddress(address);
+    }
 }

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

@@ -281,6 +281,11 @@ public class QMSController extends BaseRESTfulController {
         return qmsFeign.ctrlZQueueAllow(map);
     }
 
+    @PostMapping("/getStoreQueueList")
+    public Map<String, Object> getStoreQueueList(){
+        return qmsFeign.getStoreQueueList();
+    }
+
 
 //    @ApiOperation(value="查询进厂排队详情")
 //    @ApiImplicitParams({

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

@@ -654,11 +654,13 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageSize,
                                                          Integer apiId,
                                                          Integer status,
-                                                         @RequestParam(required = false) String con) {
+                                                         @RequestParam(required = false) String con,
+                                                         @RequestParam(required = false) String startTime,
+                                                         @RequestParam(required = false) String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con,startTime,endTime);
     }
 
     @PostMapping("insertDeliveryNotice")

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

@@ -336,6 +336,7 @@ public interface AmsFeign {
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize,
                                        @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con,
                                        @RequestParam("deleted") Integer deleted
 
     );
@@ -1648,7 +1649,8 @@ public interface AmsFeign {
                                                       @RequestParam("pageNum") Integer pageNum,
                                                       @RequestParam("pageSize") Integer pageSize,
                                                       @RequestParam("apiId") Integer apiId,
-                                                      @RequestParam("deleted") Integer deleted);
+                                                      @RequestParam("deleted") Integer deleted,
+                                                      @RequestParam("con") String con);
     //根据物资查询运输物资单价
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
     Map<String, Object> getInwardPriceBy(@RequestBody(required = false)Map<String, Object> mapvalue);
@@ -1779,4 +1781,6 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amssaleorders/addSteelSaleOrderList")
     Map<String, Object> addSteelSaleOrderList(@RequestBody List<Map<String, Object>> mapList);
 
+    @PostMapping("/api/v1/ams/amscontracttruckprices/updateTransPrice")
+    Map<String, Object> updateTransPrice(@RequestBody Map<String, Object> mapList);
 }

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

@@ -139,4 +139,8 @@ public interface OtmsFeign {
 
     @PostMapping("/api/v1/otms/pathDisplay/abnormalLineWarn")
     public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
+
+    //查询地址经纬度
+    @GetMapping("/api/v1/otms/pathDisplay/getLocationForAddress")
+    public RESTfulResult getLocationForAddress(@RequestParam("address") String address);
 }

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

@@ -146,6 +146,10 @@ public interface QmsFeign {
 
     @PostMapping("api/v1/queueTruck/qmsqueuelists/ctrlZQueueAllow")
     Map<String, Object> ctrlZQueueAllow(Map<String, Object> map);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getStoreQueueList")
+    Map<String, Object> getStoreQueueList();
+
 //    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
 //     Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
 //                                              @RequestParam("apiId") Integer apiId,

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

@@ -749,7 +749,9 @@ public interface TmsshipFeign {
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer  status,
-                                                  @RequestParam(required = false) String con);
+                                                  @RequestParam(required = false) String con,
+                                                  @RequestParam String startTime,
+                                                  @RequestParam String endTime);
 
     /**
      * 新增放货通知