Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -341,7 +341,8 @@ public class AMScontroller{
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId,
-                                              String con,String sendCompId) {
+                                              String con,
+                                                    String sendCompId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
@@ -1418,11 +1419,12 @@ public class AMScontroller{
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  String consigneeSsoId) {
+                                                  String consigneeSsoId,
+                                                  @RequestParam(required = false) String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId);
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con);
     }
 
     @ApiOperation(value="查询已上报销售订单信息")
@@ -1431,11 +1433,12 @@ public class AMScontroller{
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
                                                @RequestParam Integer apiId,
-                                               @RequestParam(required = false) String consigneeSsoId){
+                                               @RequestParam(required = false) String consigneeSsoId,
+                                               @RequestParam(required = false) String con){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId);
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con);
     }
 
     @ApiModelProperty(value = "展示销售公司已审核的订单")

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

@@ -585,11 +585,14 @@ public class BMSController extends BaseRESTfulController {
                                                            String carrierSsoId,
                                                            Integer detailStatus,
                                                            Integer orderType,
-                                                           String userId) {
+                                                           String userId,
+                                                           String startTime,
+                                                           String endTime) {
         if (mapVal == null) {
             mapVal = new HashMap<>();
         }
-        return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId);
+        return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
+                 endTime);
     }
 
 }

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

@@ -1,8 +1,7 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.QmsTruckFeign;
+import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -21,7 +20,7 @@ import java.util.Map;
 public class QMSController extends BaseRESTfulController {
 
     @Autowired
-    private QmsTruckFeign qmsTruckFeign;
+    private QmsFeign qmsFeign;
 
     @ApiOperation(value="触发电子围栏-->新增排队实绩")
     @ApiImplicitParams({
@@ -29,17 +28,16 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/addQueueResult")
     public Map<String, Object> addQueueResult(String vno){
-        return qmsTruckFeign.addQueueResult(vno);
+        return qmsFeign.addQueueResult(vno);
     }
 
-
     @ApiOperation(value="指令接收-->新增排队链表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
     @PostMapping("/addQueueList")
     public Map<String, Object> addQueueList(String resultId){
-        return qmsTruckFeign.addQueueList(resultId);
+        return qmsFeign.addQueueList(resultId);
     }
 
     @ApiOperation(value="指令接收")
@@ -58,7 +56,7 @@ public class QMSController extends BaseRESTfulController {
                                             Integer queueType,
                                             String con
     ){
-        return qmsTruckFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType,con);
+        return qmsFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType,con);
     }
 
 
@@ -77,7 +75,7 @@ public class QMSController extends BaseRESTfulController {
                                              Integer pageSize,
                                              String con
     ){
-        return qmsTruckFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+        return qmsFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
 
 
@@ -98,35 +96,9 @@ public class QMSController extends BaseRESTfulController {
                                                      String capacityNumber,
                                                      Integer isSpelling
     ){
-        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, locationId,capacityNumber, isSpelling);
-    }
-
-
-    @ApiOperation(value="查询进厂排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(184)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllQueueMes")
-    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer gatepostId,
-                                              String con
-    ){
-        return qmsTruckFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId,con);
-    }
-
-    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
-    @PostMapping("/changeQueue")
-    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.changeQueue(mapValue);
+        return qmsFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, locationId,capacityNumber, isSpelling);
     }
 
-
     @ApiOperation(value="查询排队转移")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -142,17 +114,7 @@ public class QMSController extends BaseRESTfulController {
                                               Integer pageSize,
                                               String con
     ){
-        return qmsTruckFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-    }
-
-
-    @ApiOperation(value="排队取消-->修改排队链表deleted为1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/queueCancel")
-    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.queueCancel(mapValue);
+        return qmsFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
     }
 
     @ApiOperation(value="查询排队取消")
@@ -170,26 +132,25 @@ public class QMSController extends BaseRESTfulController {
                                               Integer pageSize,
                                               String con
     ){
-        return qmsTruckFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+        return qmsFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
 
-    @ApiOperation(value="通过Id查询排队取消实绩")
+    @ApiOperation(value="修改排队取消实绩：时间、原因")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
-    @PostMapping("/getQueueCancelByResultId/{resultId}")
-    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
-        return qmsTruckFeign.getQueueCancelByResultId(resultId);
+    @PostMapping("/updateQueueCancel")
+    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.updateQueueCancel(mapValue);
     }
 
-
-    @ApiOperation(value="修改排队取消实绩：时间、原因")
+    @ApiOperation(value="排队取消-->修改排队链表deleted为1")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
-    @PostMapping("/updateQueueCancel")
-    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
-        return qmsTruckFeign.updateQueueCancel(mapValue);
+    @PostMapping("/queueCancel")
+    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.queueCancel(mapValue);
     }
 
 
@@ -199,7 +160,7 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/queueCutInLine")
     public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.queueCutInLine(mapValue);
+        return qmsFeign.queueCutInLine(mapValue);
     }
 
 
@@ -218,16 +179,7 @@ public class QMSController extends BaseRESTfulController {
                                               Integer pageSize,
                                               String con
     ){
-        return qmsTruckFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="排队结束-->修改deleted = 1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/queueEndByPDA")
-    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.queueEnd(mapValue);
+        return qmsFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @ApiOperation(value="查询排队结束")
@@ -245,29 +197,9 @@ public class QMSController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  String con
     ){
-        return qmsTruckFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="汽车监控")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/capacityMonitor")
-    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer gridType,
-                                               String con
-    ){
-        return qmsTruckFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType,con);
+        return qmsFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
-
     @ApiOperation(value="链表监控")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -281,123 +213,207 @@ public class QMSController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           String con
-    ){return qmsTruckFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
-    @PostMapping("/getQueueStatusList")
-    public Map<String, Object> getQueueStatusList(){
-        return qmsTruckFeign.getQueueStatusList();
+                                           Integer isSpelling
+    ){return qmsFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,isSpelling);
     }
 
     @ApiOperation(value="通过车牌号查询司机接单")
     @PostMapping("/getOrderReceive/{capacityNumber}")
     public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
-        return qmsTruckFeign.getOrderReceive(capacityNumber);
+        return qmsFeign.getOrderReceive(capacityNumber);
     }
 
     @ApiOperation(value="通过车牌号取消排队")
     @PostMapping("/cancelQueue")
     public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue){
-        return qmsTruckFeign.cancelQueue(mapValue);
+        return qmsFeign.cancelQueue(mapValue);
     }
 
-    @ApiOperation(value="查询执行中订单")
+    @ApiOperation(value="钢材科允许进厂")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(156)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
     })
-    @PostMapping("/getAllExecutionOrder")
-    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                    Integer apiId,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                    Integer orderType,
-                                                    Integer status,
-                                                    String con
-    ){
-        return qmsTruckFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status,con);
+    @PostMapping("/allowEnFactory")
+    public Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.allowEnFactory(mapValue);
     }
 
-    @ApiOperation(value="查询某一个门岗的排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
-    })
-    @PostMapping("/getListQueueMes")
-    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.getListQueueMes(mapValue);
+    @ApiOperation(value="APP端司机查看排队信息")
+    @GetMapping("getQueueResultByTotalId")
+    public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
+        return  qmsFeign.getQueueResultByTotalId(resultTotalId);
     }
 
 
-    @ApiOperation(value="查询仓库排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueApply")
-    public Map<String, Object> getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer platformId,
-                                                      String con
-    ){return qmsTruckFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-    }
-    @ApiOperation(value="查询仓库排队转移")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueChange")
-    public Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-
-                                                       String con
-    ){return qmsTruckFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    @ApiOperation(value="单拼链表查看详情")
+    @PostMapping("/getListMonitorMes")
+    public Map<String, Object> getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.getListMonitorMes(mapValue);
     }
 
-
-    @ApiOperation(value="查询仓库排队结束")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueEndMes")
-    public Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       String con
-    ){return qmsTruckFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    @ApiOperation(value="多拼链表查看详情")
+    @PostMapping("/getSpellingListMonitorMes")
+    public Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.getSpellingListMonitorMes(mapValue);
     }
 
 
-    @ApiOperation(value="钢材科允许进厂")
+    @ApiOperation(value="排队结束-->修改deleted = 1")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
-    @PostMapping("/allowEnFactory")
-    public Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.allowEnFactory(mapValue);
+    @PostMapping("/queueEndByPDA")
+    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.queueEnd(mapValue);
     }
 
-    @ApiOperation(value="APP端司机查看排队信息")
-    @GetMapping("getQueueResultByTotalId")
-    public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
-        return  qmsTruckFeign.getQueueResultByTotalId(resultTotalId);
-    }
 
+//    @ApiOperation(value="查询进厂排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(184)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllQueueMes")
+//    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                              Integer apiId,
+//                                              Integer pageNum,
+//                                              Integer pageSize,
+//                                              Integer gatepostId,
+//                                              String con
+//    ){
+//        return qmsFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId,con);
+//    }
+
+//    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
+//    @PostMapping("/changeQueue")
+//    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
+//        return qmsFeign.changeQueue(mapValue);
+//    }
+
+
+
+
+//    @ApiOperation(value="通过Id查询排队取消实绩")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+//    })
+//    @PostMapping("/getQueueCancelByResultId/{resultId}")
+//    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
+//        return qmsFeign.getQueueCancelByResultId(resultId);
+//    }
+
+
+
+//    @ApiOperation(value="汽车监控")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/capacityMonitor")
+//    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                               Integer apiId,
+//                                               Integer pageNum,
+//                                               Integer pageSize,
+//                                               Integer gridType,
+//                                               String con
+//    ){
+//        return qmsFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType,con);
+//    }
+
+
+
+
+//    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
+//    @PostMapping("/getQueueStatusList")
+//    public Map<String, Object> getQueueStatusList(){
+//        return qmsFeign.getQueueStatusList();
+//    }
+
+
+
+//    @ApiOperation(value="查询执行中订单")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(156)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllExecutionOrder")
+//    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                    Integer apiId,
+//                                                    Integer pageNum,
+//                                                    Integer pageSize,
+//                                                    Integer orderType,
+//                                                    Integer status,
+//                                                    String con
+//    ){
+//        return qmsFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status,con);
+//    }
+
+//    @ApiOperation(value="查询某一个门岗的排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+//    })
+//    @PostMapping("/getListQueueMes")
+//    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
+//        return qmsFeign.getListQueueMes(mapValue);
+//    }
+
+
+//    @ApiOperation(value="查询仓库排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueApply")
+//    public Map<String, Object> getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                      Integer apiId,
+//                                                      Integer pageNum,
+//                                                      Integer pageSize,
+//                                                      Integer platformId,
+//                                                      String con
+//    ){return qmsFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
+//    @ApiOperation(value="查询仓库排队转移")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueChange")
+//    public Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                       Integer apiId,
+//                                                       Integer pageNum,
+//                                                       Integer pageSize,
+//
+//                                                       String con
+//    ){return qmsFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
+
+
+//    @ApiOperation(value="查询仓库排队结束")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueEndMes")
+//    public Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                       Integer apiId,
+//                                                       Integer pageNum,
+//                                                       Integer pageSize,
+//                                                       String con
+//    ){return qmsFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
 
 }

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

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.QMSFeign;
-import com.steerinfo.dil.feign.QmsTruckFeign;
+import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -29,7 +28,7 @@ public class WMSController extends BaseRESTfulController {
     @Autowired
     WMSFeign wmsFeign;
     @Autowired
-    QMSFeign qmsFeign;
+    QmsFeign qmsFeign;
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({

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

@@ -281,10 +281,11 @@ public interface AmsFeign {
      */
     @PostMapping(value = "/api/v1/ams/amspurchaseorders/getPurchaseOrderList")
     Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       @RequestParam Integer pageNum,
-                                       @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId, @RequestParam String con,
-                                       @RequestParam String sendCompId
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con,
+                                       @RequestParam("sendCompId") String sendCompId
                                              );
 
 
@@ -1350,7 +1351,8 @@ public interface AmsFeign {
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
-                                           @RequestParam(required = false) String consigneeSsoId);
+                                           @RequestParam(required = false) String consigneeSsoId,
+                                           @RequestParam(required = false) String con);
 
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
@@ -1361,7 +1363,8 @@ public interface AmsFeign {
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
                                                @RequestParam Integer apiId,
-                                               @RequestParam(required = false) String consigneeSsoId);
+                                               @RequestParam(required = false) String consigneeSsoId,
+                                               @RequestParam(required = false) String con);
 
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
     Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,

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

@@ -242,5 +242,7 @@ public interface BmstruckFeign {
                                                     @RequestParam("carrierSsoId") String carrierSsoId,
                                                     @RequestParam("detailStatus") Integer detailStatus,
                                                     @RequestParam("orderType") Integer orderType,
-                                                    @RequestParam("userId") String userId);
+                                                    @RequestParam("userId") String userId,
+                                                    @RequestParam("startTime")String startTime,
+                                                    @RequestParam("endTime")String endTime);
 }

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

@@ -1,20 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @author luobang
- * @create 2021-10-13 9:09
- */
-@FeignClient(value = "DAL-TRICK-QMS-DEV",url = "${openfeign.OMSFeign.url}")
-public interface QMSFeign {
-    @RequestMapping(value = "/api/v1/queueTruck/qmsqueuegrids/getStackingId",method = RequestMethod.POST)
-    Map<String,Object> getStackingId(@RequestParam BigDecimal warehouseId,
-                                     @RequestParam int size);
-}

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

@@ -0,0 +1,210 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/1 17:19
+ */
+
+@FeignClient(name = "dil-trick-queue-dev", url = "${openfeign.QmsTruckFeign.url}")
+public interface QmsFeign {
+
+    @RequestMapping(value = "/api/v1/queueTruck/qmsqueuegrids/getStackingId",method = RequestMethod.POST)
+    Map<String,Object> getStackingId(@RequestParam BigDecimal warehouseId,
+                                     @RequestParam int size);
+
+    /*
+    QmsQueueResultController /  QmsQueueListController
+     */
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
+     Map<String, Object> addQueueResult( @RequestParam("vno")String vno);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
+     Map<String, Object> addQueueList(@RequestParam("resultId")String resultId);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
+     Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("queueType") Integer queueType,
+                                            @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
+     Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
+     Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize,
+                                                     @RequestParam("locationId") Integer locationId,
+                                                     @RequestParam("capacityNumber")String capacityNumber,
+                                                     @RequestParam("isSpelling")Integer isSpelling
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
+     Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCancel")
+     Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
+     Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
+     Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
+     Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
+     Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueEndByPDA")
+    Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
+     Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam("apiId") Integer apiId,
+                                                 @RequestParam("pageNum") Integer pageNum,
+                                                 @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/listMonitor")
+     Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("isSpelling")Integer isSpelling
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
+     Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
+     Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/allowEnFactory")
+    Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue);
+
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getQueueResultByTotalId")
+    Map<String, Object> getQueueResultByTotalId(@RequestParam("resultTotalId") String resultTotalId);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListMonitorMes")
+    Map<String, Object> getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/getSpellingListMonitorMes")
+    Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
+//     Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                              @RequestParam("apiId") Integer apiId,
+//                                              @RequestParam("pageNum") Integer pageNum,
+//                                              @RequestParam("pageSize") Integer pageSize,
+//                                              @RequestParam("gatepostId") Integer gatepostId,
+//                                              @RequestParam("con")String con
+//    );
+
+    
+//    @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
+//     Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
+//
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancelByResultId/{resultId}")
+//     Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
+
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/capacityMonitor")
+//     Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                               @RequestParam("apiId") Integer apiId,
+//                                               @RequestParam("pageNum") Integer pageNum,
+//                                               @RequestParam("pageSize") Integer pageSize,
+//                                               @RequestParam("gridType") Integer gridType,
+//                                               @RequestParam("con")String con
+//    );
+    
+
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueStatusList")
+//     Map<String, Object> getQueueStatusList();
+
+
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllExecutionOrder")
+//     Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                    @RequestParam("apiId") Integer apiId,
+//                                                    @RequestParam("pageNum") Integer pageNum,
+//                                                    @RequestParam("pageSize") Integer pageSize,
+//                                                    @RequestParam("orderType")Integer orderType,
+//                                                    @RequestParam("status")Integer status,
+//                                                    @RequestParam("con")String con
+//    );
+
+
+//
+//    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListQueueMes")
+//    RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueChange")
+//    Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                @RequestParam("apiId") Integer apiId,
+//                                                @RequestParam("pageNum") Integer pageNum,
+//                                                @RequestParam("pageSize") Integer pageSize,
+//                                                @RequestParam("con")String con
+//    );
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueEndMes")
+//    Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                @RequestParam("apiId") Integer apiId,
+//                                                @RequestParam("pageNum") Integer pageNum,
+//                                                @RequestParam("pageSize") Integer pageSize,
+//                                                @RequestParam("con")String con
+//    );
+
+}

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

@@ -1,200 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/1 17:19
- */
-
-@FeignClient(name = "dil-trick-queue-dev", url = "${openfeign.QmsTruckFeign.url}")
-public interface QmsTruckFeign {
-
-    /*
-    QmsQueueResultController /  QmsQueueListController
-     */
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
-    public Map<String, Object> addQueueResult( @RequestParam("vno")String vno);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
-    public Map<String, Object> addQueueList(@RequestParam("resultId")String resultId);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
-    public Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            @RequestParam("apiId") Integer apiId,
-                                            @RequestParam("pageNum") Integer pageNum,
-                                            @RequestParam("pageSize") Integer pageSize,
-                                            @RequestParam("queueType") Integer queueType,
-                                            @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
-    public Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                             @RequestParam("apiId") Integer apiId,
-                                             @RequestParam("pageNum") Integer pageNum,
-                                             @RequestParam("pageSize") Integer pageSize,
-                                             @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
-    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("gatepostId") Integer gatepostId,
-                                              @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
-    public Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     @RequestParam("apiId") Integer apiId,
-                                                     @RequestParam("pageNum") Integer pageNum,
-                                                     @RequestParam("pageSize") Integer pageSize,
-                                                     @RequestParam("locationId") Integer locationId,
-                                                     @RequestParam("capacityNumber")String capacityNumber,
-                                                     @RequestParam("isSpelling")Integer isSpelling
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
-    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
-    public Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCancel")
-    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
-    public Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancelByResultId/{resultId}")
-    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
-    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
-    public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
-    public Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueEndByPDA")
-    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
-    public Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 @RequestParam("apiId") Integer apiId,
-                                                 @RequestParam("pageNum") Integer pageNum,
-                                                 @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/capacityMonitor")
-    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("gridType") Integer gridType,
-                                               @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/listMonitor")
-    public Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("con")String con
-    );
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueStatusList")
-    public Map<String, Object> getQueueStatusList();
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
-    public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
-    public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllExecutionOrder")
-    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                    @RequestParam("apiId") Integer apiId,
-                                                    @RequestParam("pageNum") Integer pageNum,
-                                                    @RequestParam("pageSize") Integer pageSize,
-                                                    @RequestParam("orderType")Integer orderType,
-                                                    @RequestParam("status")Integer status,
-                                                    @RequestParam("con")String con
-    );
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListQueueMes")
-    RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueChange")
-    Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("con")String con
-    );
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueEndMes")
-    Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/allowEnFactory")
-    Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue);
-
-    @GetMapping("api/v1/queueTruck/qmsqueueresults/getQueueResultByTotalId")
-    Map<String, Object> getQueueResultByTotalId(@RequestParam("resultTotalId") String resultTotalId);
-}

src/main/resources/bootstrap.yml

@@ -12,6 +12,7 @@ spring:
   mvc:
     static-path-pattern:
 
+
 #eureka设置
 eureka:
   client:
@@ -21,7 +22,6 @@ eureka:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-
 genxml:
   pth: com/agit
 cache:

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

@@ -165,7 +165,7 @@
                 and RCC.CARRIER_ID = #{carrierId}
             </if>
             <if test="index != null">
-                and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
+                and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0 or  instr(RC.INSERT_UPDATE_REMARK, #{index})>0)
             </if>
             <if test="con != null">
                 and instr(RC.INSERT_UPDATE_REMARK, #{con}) > 0
@@ -872,7 +872,7 @@
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">
-            order by "materialCode" desc
+            order by "materialCode" ASC
         </if>
     </select>
 
@@ -964,7 +964,7 @@
         SELECT RW.WAREHOUSE_ID   "id",
                RW.WAREHOUSE_NAME "value"
         FROM RMS_WAREHOUSE RW
-        WHERE RW.WAREHOUSE_TYPE_ID = 1
+        WHERE RW.WAREHOUSE_TYPE_ID = 9
     </select>
 
     <select id="getShipNameMesByLike" resultType="java.util.Map" parameterType="java.util.Map">