销售合并

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

@@ -39,20 +39,20 @@ public class QmsQueueListController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
-    @ApiOperation(value="指令接收-->新增排队链表")
+    @ApiOperation(value="指令接收-->新增排队链表：需要运输订单号")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
     @PostMapping("/addQueueList")
-    public RESTfulResult addQueueList(@RequestBody(required = false)  Map<String, Object> mapValue){
+    public RESTfulResult addQueueList(@RequestBody(required = false) Map<String, Object> mapValue){
         String orderNumber = (String) mapValue.get("orderNumber");
         int i = qmsQueueListService.addQueueList(orderNumber);
         return success(i);
     }
 
-    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
+    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗或月台、转移原因")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "mapValue", value = "实绩Id、门岗或月台、转移原因", required = false, dataType = "Map"),
     })
     @PostMapping("/changeQueue")
     public RESTfulResult changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
@@ -62,7 +62,7 @@ public class QmsQueueListController extends BaseRESTfulController {
 
     @ApiOperation(value="排队取消-->修改排队链表deleted为1")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
     })
     @PostMapping("/queueCancel")
     public RESTfulResult queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
@@ -72,7 +72,7 @@ public class QmsQueueListController extends BaseRESTfulController {
 
     @ApiOperation(value="排队插队-->修改排队链表顺序号为最小")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号或者网格排队实绩ID取一个就行、插队原因", required = false, dataType = "Map"),
     })
     @PostMapping("/queueCutInLine")
     public RESTfulResult queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue){
@@ -80,9 +80,9 @@ public class QmsQueueListController extends BaseRESTfulController {
         return success(i);
     }
 
-    @ApiOperation(value="排队结束-->修改deleted = 1")
+    @ApiOperation(value="排队结束-->修改deleted = 1：运输订单号 或者 网格排队实绩 ID 取一个就行")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号或者网格排队实绩ID取一个就行", required = false, dataType = "Map"),
     })
     @PostMapping("/queueEndByPDA")
     public RESTfulResult queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
@@ -96,7 +96,6 @@ public class QmsQueueListController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId(134)", 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("/listMonitor")
     public RESTfulResult listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -113,4 +112,45 @@ public class QmsQueueListController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @ApiOperation(value="仓库排队结束-->修改deleted = 1：运输订单号 或者 网格排队实绩 ID 取一个就行")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号或者网格排队实绩ID取一个就行", required = false, dataType = "Map"),
+    })
+    @PostMapping("/queueEndWarehouse")
+    public RESTfulResult queueEndWarehouse(@RequestBody(required=false) Map<String, Object> mapValue){
+        int i = qmsQueueListService.queueEndWarehouse(mapValue);
+        return success(i);
+    }
+
+
+    @ApiOperation(value="仓库链表监控")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(134)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/warehouseListMonitor")
+    public RESTfulResult warehouseListMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+                                     Integer apiId,
+                                     Integer pageNum,
+                                     Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allListMonitor = qmsQueueListService.warehouseListMonitor(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> listMonitor = qmsQueueListService.warehouseListMonitor(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allListMonitor,listMonitor);
+        return success(pageList);
+    }
+
+    @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 success(qmsQueueListService.getListQueueMes(mapValue));
+    }
 }

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

@@ -43,10 +43,8 @@ public class QmsQueueResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
     @PostMapping("/addQueueResult")
-    public RESTfulResult addQueueResult(String orderNumber){
-        Map<String, Object> mapValue = new HashMap<>();
-        mapValue.put("orderNumber", orderNumber);
-        int i = qmsQueueResultService.addQueueResult(mapValue);
+    public RESTfulResult addQueueResult(@RequestBody(required = false) Map<String, Object> map){
+        int i = qmsQueueResultService.addQueueResult(map);
         return success(i);
     }
 
@@ -56,7 +54,6 @@ public class QmsQueueResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId(125)", 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("/getQueueApply")
     public RESTfulResult getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -108,17 +105,18 @@ public class QmsQueueResultController extends BaseRESTfulController {
     @ApiOperation(value="指令接收")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(130)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(130、190)", 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("/orderReceive")
     public RESTfulResult orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
                                        Integer apiId,
                                        Integer pageNum,
-                                       Integer pageSize
+                                       Integer pageSize,
+                                       Integer queueType
     ){
+        mapValue.put("queueType", queueType);
         //不分页筛选数据
         List<Map<String, Object>> allOrderReceive = qmsQueueResultService.orderReceive(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -128,13 +126,14 @@ public class QmsQueueResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
-    @ApiOperation(value="查询排队开始")
+    @ApiOperation(value="查询排队开始 网格Id视情况而给 可不给")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(128)", 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 = "gridId", value = "仓储网格(筛选)", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "type", value = "类型3：采购、1|2：销售", required = false, dataType = "Integer"),
+
     })
     @PostMapping("/getQueueListByQueueUp")
     public RESTfulResult getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -143,9 +142,6 @@ public class QmsQueueResultController extends BaseRESTfulController {
                                        Integer pageSize,
                                        Integer gridId
     ){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
         if(gridId != null){
             mapValue.put("gridId", gridId);
         }
@@ -158,13 +154,45 @@ public class QmsQueueResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @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 RESTfulResult getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer gatepostId
+    ){
+        if(gatepostId != null){
+            mapValue.put("gatepostId", gatepostId);
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allQueueApply = qmsQueueResultService.getQueueMes(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> queueApply = qmsQueueResultService.getQueueMes(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQueueApply,queueApply);
+        return success(pageList);
+    }
+
+    @ApiOperation(value="通过运输订单号查询进厂排队详情")
+    @PostMapping("/getQueueMes")
+    public RESTfulResult getQueueMes(Map<String, Object> map){
+        List<Map<String, Object>> warehouseQueueMes = qmsQueueResultService.getQueueMes(map);
+        return success(warehouseQueueMes);
+    }
+
     @ApiOperation(value="查询排队转移")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(124)", 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("/getChangeQueue")
     public RESTfulResult getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -187,14 +215,17 @@ public class QmsQueueResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId(131)", 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("/getQueueCancel")
     public RESTfulResult getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
-                                               Integer pageSize
+                                               Integer pageSize,
+                                               Integer gatepostId
     ){
+        if(gatepostId != null){
+            mapValue.put("gatepostId", gatepostId);
+        }
         //不分页筛选数据
         List<Map<String, Object>> allQueueCancel = qmsQueueResultService.getQueueCancel(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -206,7 +237,7 @@ public class QmsQueueResultController extends BaseRESTfulController {
 
     @ApiOperation(value="通过Id查询排队取消实绩")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "resultId", value = "排队取消实绩", required = false, dataType = "Integer"),
     })
     @PostMapping("/getQueueCancelByResultId/{resultId}")
     public RESTfulResult getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
@@ -216,7 +247,7 @@ public class QmsQueueResultController extends BaseRESTfulController {
 
     @ApiOperation(value="修改排队取消实绩：时间、原因")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "qmsQueueResult", value = "排队取消实体类", required = false, dataType = "QmsQueueResult"),
     })
     @PostMapping("/updateQueueCancel")
     public RESTfulResult updateQueueCancel(@RequestBody QmsQueueResult qmsQueueResult){
@@ -230,7 +261,6 @@ public class QmsQueueResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId(132)", 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("/getQueueInsert")
     public RESTfulResult getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -253,7 +283,6 @@ public class QmsQueueResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId(133)", 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("/getQueueEndResult")
     public RESTfulResult getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -270,20 +299,21 @@ public class QmsQueueResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
-    @ApiOperation(value="汽车监控")
+    @ApiOperation(value="汽车监控(仓库)")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
+            @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 RESTfulResult capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
-                                           Integer pageSize
+                                           Integer pageSize,
+                                           Integer gridType
     ){
+        mapValue.put("gridType", gridType);
         //不分页筛选数据
         List<Map<String, Object>> allCapacityMonitor = qmsQueueResultService.capacityMonitor(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -314,4 +344,136 @@ public class QmsQueueResultController extends BaseRESTfulController {
         int code = qmsQueueResultService.cancelQueue(mapValue);
         return success(code);
     }
+
+    //========================================仓库=====================================================
+    @ApiOperation(value="新增仓库排队")
+    @PostMapping("/addQueueResultByCk")
+    public RESTfulResult addQueueResultByCk(@RequestBody Map<String,Object> mapValue){
+        int code = qmsQueueResultService.addQueueResultByCk(mapValue);
+        return success(code);
+    }
+
+    @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 RESTfulResult getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allWarehouseQueueApply = qmsQueueResultService.getWarehouseQueueApply(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> warehouseQueueApply = qmsQueueResultService.getWarehouseQueueApply(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allWarehouseQueueApply,warehouseQueueApply);
+        return success(pageList);
+    }
+
+    @ApiOperation(value="查询仓库排队开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(191)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getWarehouseQueueListByQueueUp")
+    public RESTfulResult getWarehouseQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allWarehouseQueueApply = qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> warehouseQueueApply = qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allWarehouseQueueApply,warehouseQueueApply);
+        return success(pageList);
+    }
+
+    @ApiOperation(value="查询仓库排队详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(192)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllWarehouseQueueMes")
+    public RESTfulResult getAllWarehouseQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer platformId
+    ){
+        if(platformId != null){
+            mapValue.put("platformId", platformId);
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allWarehouseQueueApply = qmsQueueResultService.getWarehouseQueueMes(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> warehouseQueueApply = qmsQueueResultService.getWarehouseQueueMes(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allWarehouseQueueApply,warehouseQueueApply);
+        return success(pageList);
+    }
+
+    @ApiOperation(value="通过运输订单号查询仓库排队详情")
+    @PostMapping("/getWarehouseQueueMes")
+    public RESTfulResult getWarehouseQueueMes(Map<String, Object> map){
+        List<Map<String, Object>> warehouseQueueMes = qmsQueueResultService.getWarehouseQueueMes(map);
+        return success(warehouseQueueMes);
+    }
+
+
+    @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 RESTfulResult getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allWarehouseQueueChange = qmsQueueResultService.getWarehouseQueueChange(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> warehouseQueueChange = qmsQueueResultService.getWarehouseQueueChange(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allWarehouseQueueChange,warehouseQueueChange);
+        return success(pageList);
+    }
+
+    @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 RESTfulResult getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allWarehouseQueueEndMes = qmsQueueResultService.getWarehouseQueueEndMes(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> warehouseQueueEndMes = qmsQueueResultService.getWarehouseQueueEndMes(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, warehouseQueueEndMes,allWarehouseQueueEndMes);
+        return success(pageList);
+    }
+
+
 }

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

@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,4 +21,9 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/updateEnactoryResult")
     public RESTfulResult updateEnactoryResult(@RequestBody(required = false) Map<String, Object> mapValue);
 
+
+    //修改装车点
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadResultList")
+    public RESTfulResult updateLoadResultList(@RequestBody(required = false) List<Map<String, Object>> mapList);
+
 }

src/main/java/com/steerinfo/dil/mapper/QmsQueueListMapper.java

@@ -30,4 +30,12 @@ public interface QmsQueueListMapper extends IBaseMapper<QmsQueueList, BigDecimal
     //链表监控
     List<Map<String, Object>> listMonitor(Map<String, Object> map);
 
+    //通过运输订单号查询运输订单信息
+    Map<String, Object> getOrderMesByOrderNum(String orderNumber);
+
+    //仓库链表监控
+    List<Map<String, Object>> warehouseListMonitor(Map<String, Object> map);
+
+    //查询某一个队列的车辆排队详情
+    List<Map<String, Object>> getListQueueMes(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/mapper/QmsQueueResultMapper.java

@@ -3,7 +3,6 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.QmsQueueResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -17,7 +16,13 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     BigDecimal selectMaxId();
 
     //车辆进入电子围栏后触发排队申请 发送数据：运输订单号 返回 运力Id、实绩总表Id、订单ID
-    Map<String, Object> queryCIdAndTIdByOrderNumber(String orderNumber);
+    List<Map<String, Object>> queryCIdAndTIdByOrderNumber(String orderNumber);
+
+    //通过运输订单号 查找 层次号  垛位 以及 仓储网格ID
+    List<Map<String, Object>> getWarehouseMesByOrderNum(String orderNumber);
+
+    //通过运输订单号查询某个销售订单所有的装车点
+    List<Integer> getAllLoadingByOrderNumber(String orderNumber);
 
     //人工添加排队申请查询所有执行中订单 订单状态 ：1
     List<Map<String, Object>> getAllExecutionOrder(Map<String, Object> map);
@@ -31,6 +36,9 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     //通过门岗名称查询门岗ID
     BigDecimal getGatepostIdByGatepostName(String gatepostName);
 
+    //通过月台名称查询月台ID
+    BigDecimal getPlatformIdByPlatformName(String platformName);
+
     //通过门岗ID 和 网格类型 匹配 网格主键
     BigDecimal getGridIdByGatepostIdAndGridType(Map<String, Object> map);
 
@@ -44,6 +52,9 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     //查询排队开始、详情数据  正在排队的数据
     List<Map<String, Object>> getQueueListByQueueUp(Map<String, Object> map);
 
+    //查询排队详情
+    List<Map<String, Object>> getQueueMes(Map<String, Object> map);
+
     //查询排队转移详情
     List<Map<String, Object>> getChangeQueueMes(Map<String, Object> map);
 
@@ -62,9 +73,30 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     //查询排队结束
     List<Map<String, Object>> getQueueEndResult(Map<String, Object> map);
 
-    //汽车监控
+    //汽车监控(仓库汽车监控)
     List<Map<String, Object>> capacityMonitor(Map<String, Object> map);
 
+
+
+    /*============================================仓库排队====================================*/
+    //查询仓库排队申请 系统自动下发 查询指令下发
+    List<Map<String, Object>> getWarehouseQueueApply(Map<String, Object> map);
+
+    //查询仓库指令接收
+    List<Map<String, Object>> getWarehouseOrderReceive(Map<String, Object> map);
+
+    //查询仓库排队开始
+    List<Map<String, Object>> getWarehouseQueueListByQueueUp(Map<String, Object> map);
+
+    //查看仓库排队详情 通过运输订单号
+    List<Map<String, Object>> getWarehouseQueueMes(Map<String, Object> map);
+
+    //查询仓库排队转移
+    List<Map<String, Object>> getWarehouseQueueChange(Map<String, Object> map);
+
+    //查询仓库排队结束
+    List<Map<String, Object>> getWarehouseQueueEndMes(Map<String, Object> map);
+
     /*
     ***************APP**********************
     */
@@ -99,5 +131,4 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     // 通过车牌号得到网格id
     BigDecimal getGridIdNotNull(String capacityNumber);
 
-
 }

src/main/java/com/steerinfo/dil/mapper/QueuingRulesMapper.java

@@ -0,0 +1,29 @@
+package com.steerinfo.dil.mapper;
+
+import org.mapstruct.Mapper;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/16 10:01
+ */
+@Mapper
+public interface QueuingRulesMapper {
+    //查询订单跟订单物资中间表 查询是否有多个物资Id
+    List<Integer> getAllMaterialId(Map<String, Object> map);
+
+    //通过物资Id查询仓库是否有货 或者 是否有多个仓库有货
+    List<Integer> getWarehouseIdByMaterialId(Integer materialId);
+
+    //通过仓库Id 和 物资Id 查询垛位 层次 月台 仓库
+    List<Map<String, Object>> getStackGradation(Map<String, Object> map);
+
+    //通过月台Id 查询月台当前排队车辆数
+    BigDecimal queueCountByPlatformId(BigDecimal platformId);
+
+    //如果当前状态满足之前所有条件 则根据仓库优先级进行选择仓库
+
+}

src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java

@@ -1,11 +0,0 @@
-package com.steerinfo.dil.mapper;
-
-import com.steerinfo.dil.model.RmsCapacity;
-import com.steerinfo.framework.mapper.IBaseMapper;
-
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, Short> {
-
-}

src/main/java/com/steerinfo/dil/service/IQmsQueueListService.java

@@ -25,7 +25,7 @@ public interface IQmsQueueListService{
     //添加汽车排队链表
     int addQueueList(String orderNumber);
 
-    //排队转移 新增一条链表 修改实绩链表Id
+    //进厂排队转移(仓库排队转移) 新增一条链表 修改实绩链表Id
     int changeQueue(Map<String, Object> map);
 
     //排队取消 通过运输订单号进行查询取消 或 实绩Id  修改
@@ -39,4 +39,16 @@ public interface IQmsQueueListService{
 
     //链表监控
     List<Map<String, Object>> listMonitor(Map<String, Object> map);
+
+    //发送数据给门禁系统
+    int sendMessageToGatepost(String orderNumber);
+
+    //仓库排队结束接口 ：扫描第一件物资吊牌时间
+    int queueEndWarehouse(Map<String, Object> map);
+
+    //仓库链表监控
+    List<Map<String, Object>> warehouseListMonitor(Map<String, Object> map);
+
+    //查询某一个队列的车辆排队详情
+    List<Map<String, Object>> getListQueueMes(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/IQmsQueueResultService.java

@@ -24,6 +24,9 @@ public interface IQmsQueueResultService{
     //车辆进入电子围栏自动触发系统新增排队实绩
     int addQueueResult(Map<String, Object> map);
 
+    //新增仓库排队
+    int addQueueResultByCk(Map<String, Object> map);
+
     //查询排队转移详情
     List<Map<String, Object>> getChangeQueueMes(Map<String, Object> map);
 
@@ -39,6 +42,9 @@ public interface IQmsQueueResultService{
     //查询排队开始、详情数据  正在排队的数据
     List<Map<String, Object>> getQueueListByQueueUp(Map<String, Object> map);
 
+    //查询排队详情
+    List<Map<String, Object>> getQueueMes(Map<String, Object> map);
+
     //查询排队取消
     List<Map<String, Object>> getQueueCancel(Map<String, Object> map);
 
@@ -57,6 +63,22 @@ public interface IQmsQueueResultService{
     //汽车监控
     List<Map<String, Object>> capacityMonitor(Map<String, Object> map);
 
+    //=============================================仓库排队=======================================================
+    //查询仓库排队申请
+    List<Map<String, Object>> getWarehouseQueueApply(Map<String, Object> map);
+
+    //查询仓库排队开始
+    List<Map<String, Object>> getWarehouseQueueListByQueueUp(Map<String, Object> map);
+
+    //查看排队详情 通过运输订单号
+    List<Map<String, Object>> getWarehouseQueueMes(Map<String, Object> map);
+
+    //查询排队转移
+    List<Map<String, Object>> getWarehouseQueueChange(Map<String, Object> map);
+
+    //查询仓库排队结束
+    List<Map<String, Object>> getWarehouseQueueEndMes(Map<String, Object> map);
+
     /*
      * APP
      */

src/main/java/com/steerinfo/dil/service/IQueuingRulesService.java

@@ -0,0 +1,29 @@
+package com.steerinfo.dil.service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/16 10:03
+ */
+
+public interface IQueuingRulesService {
+    //查询订单跟订单物资中间表 查询是否有多个物资Id
+    List<Integer> getAllMaterialId(Map<String, Object> map);
+
+    //通过物资Id查询仓库是否有货 或者 是否有多个仓库有货
+    List<Integer> getWarehouseIdByMaterialId(Integer materialId);
+
+    //通过仓库Id 和 物资Id 查询垛位 层次 月台 仓库
+    List<Map<String, Object>> getStackGradation(Map<String, Object> map);
+
+    //通过月台Id 查询月台当前排队车辆数
+    BigDecimal queueCountByPlatformId(BigDecimal platformId);
+
+    //通过排队规则查询月台ID  materialIdList：运单关联的所有物资
+    List<Map<String, Object>> getPlatId(List<Integer> materialIdList);
+
+
+}

src/main/java/com/steerinfo/dil/service/IRmsCapacityService.java

@@ -1,23 +0,0 @@
-package com.steerinfo.dil.service;
-
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.dil.model.RmsCapacity;
-import java.util.Date;
-import java.math.BigDecimal;
-
-/**
- * RmsCapacity服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-14 11:31
- * 类描述
- * 修订历史：
- * 日期：2021-09-14
- * 作者：generator
- * 参考：
- * 描述：RmsCapacity服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IRmsCapacityService{
-
-}

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

@@ -4,8 +4,6 @@ import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.QmsQueueResultMapper;
 import com.steerinfo.dil.model.QmsQueueResult;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.dil.model.QmsQueueList;
 import com.steerinfo.dil.mapper.QmsQueueListMapper;
 import com.steerinfo.dil.service.IQmsQueueListService;
@@ -13,6 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+
+import javax.xml.transform.Source;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -45,7 +47,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     private TmsTruckFeign tmsTruckFeign;
 
     /**
-     * 添加 链表排序
+     * 开始排队  添加 链表排序
      * @param orderNumber 运输订单号
      * @return
      */
@@ -87,7 +89,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
 
     /**
      * 排队转移
-     * 参数：实绩Id、门岗名称、转移原因
+     * 参数：实绩Id、门岗名称||门岗ID 或者 月台名称||月台ID、转移原因
      * @param map
      * @return
      */
@@ -103,33 +105,46 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         updateQueueListToDie(listId);
         //获取运力ID
         BigDecimal capacityId = DataChange.dataToBigDecimal(mapValue.get("capacityId"));
-        //如果传入的是门岗名称
-        if(map.get("gatepostName") != null){
-            //通过传入的门岗名称查询门岗ID
-            BigDecimal gatepostId = qmsQueueResultMapper.getGatepostIdByGatepostName((String) map.get("gatepostName"));
-            mapValue.put("queueLocationId", gatepostId);
+
+        //判断传入的是门岗 还是 月台 只会传入一个
+        if(map.get("gatepostName") != null || map.get("gatepostId") != null){
+            //如果传入的是门岗名称
+            if(map.get("gatepostName") != null){
+                //通过传入的门岗名称查询门岗ID
+                BigDecimal gatepostId = qmsQueueResultMapper.getGatepostIdByGatepostName((String) map.get("gatepostName"));
+                mapValue.put("queueLocationId", gatepostId);
+            }else {
+                //否则应该传入门岗ID
+                mapValue.put("queueLocationId", map.get("gatepostId"));
+            }
+            mapValue.put("gridType", 3);
         }else {
-            //否则应该传入门岗ID
-            mapValue.put("queueLocationId", map.get("gatepostId"));
+            if(map.get("platformName") != null){
+                //通过传入的月台名称查询月台ID
+                BigDecimal platformId = qmsQueueResultMapper.getPlatformIdByPlatformName((String) map.get("platformName"));
+                mapValue.put("queueLocationId", platformId);
+            }else {
+                //否则应该传入的是月台ID
+                mapValue.put("queueLocationId", map.get("platformId"));
+            }
+            mapValue.put("gridType", 1);
         }
-        mapValue.put("gridType", 3);
-        //通过门岗ID 和 网格类型 查询对应网格ID
+
+        //通过门岗ID或者月台ID 和 网格类型 查询对应网格ID
         BigDecimal gridId = qmsQueueResultMapper.getGridIdByGatepostIdAndGridType(mapValue);
         //查询当前网格链表还在排队中的 最大序号 + 1
         mapValue.put("gridId", gridId);
         Integer maxListNodeOrder = qmsQueueListMapper.getMaxListNodeOrder(mapValue);
-        int nodeOrder = (maxListNodeOrder == null ? 0 : maxListNodeOrder) + 1;
+        int listNodeOrder = (maxListNodeOrder == null ? 0 : maxListNodeOrder) + 1;
         //新增一条链表
         QmsQueueList qmsQueueList = new QmsQueueList();
         //添加主键ID 新增的链表Id
         BigDecimal maxId = qmsQueueListMapper.selectMaxId();
         qmsQueueList.setListId(maxId);
-        //添加排队序号与逻辑删除 0： 正在排队
-        qmsQueueList.setListNodeOrder(new BigDecimal(nodeOrder));
+        //添加排队序号 逻辑删除 正在排队0 添加网格Id 添加运力Id
+        qmsQueueList.setListNodeOrder(new BigDecimal(listNodeOrder));
         qmsQueueList.setDeleted(new BigDecimal(0));
-        //添加网格Id
         qmsQueueList.setGridId(gridId);
-        //添加运力Id
         qmsQueueList.setCapacityId(capacityId);
 
         qmsQueueList.setInsertUsername("admin");
@@ -157,7 +172,27 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      */
     @Override
     public int queueCancel(Map<String, Object> map) {
+        int i = 0;
+        if(map.get("resultIdList") != null){
+            List<Object> resultIdList = (List) map.get("resultIdList");
+            for (Object resultId : resultIdList) {
+                Map<String, Object> resultMap = new HashMap<>();
+                resultMap.put("resultId", resultId);
+                resultMap.put("resultCancelReason", map.get("resultCancelReason"));
+                i += queueCancelSon(resultMap);
+            }
+        }else if(map.get("orderNumber") != null){
+            i = queueCancelSon(map);
+        }
+        return i;
+    }
 
+    /**
+     * 取消子表
+     * @param map
+     * @return
+     */
+    public int queueCancelSon(Map<String, Object> map){
         BigDecimal resultId;
         map.putAll(qmsQueueListMapper.getQueueResultByOrderNumber(map));
         //获取实绩Id
@@ -172,7 +207,6 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         qmsQueueResult.setResultCancelTime(new Date());//设置取消时间
         qmsQueueResult.setResultCancelReason((String) map.get("resultCancelReason"));//设置取消原因
         int i1 = qmsQueueResultMapper.updateByPrimaryKeySelective(qmsQueueResult);
-
         return i + i1;
     }
 
@@ -212,7 +246,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     }
 
     /**
-     * 排队结束 PDA 形式
+     * 进厂排队结束 PDA 形式
      * 运输订单号
      * @param map
      * @return
@@ -237,6 +271,20 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         return i + i1;
     }
 
+    /**
+     * 发送运输订单信息给门岗系统
+     * 包含运输订单号，车牌号，门岗名称；
+     * @return
+     */
+    public int sendMessageToGatepost(String orderNumber){
+        //通过运输订单号查询相关信息
+        Map<String, Object> map = qmsQueueListMapper.getOrderMesByOrderNum(orderNumber);
+        map.put("orderNumber", orderNumber);
+        //访问门岗接口发送数据
+        //************************************
+        return 0;
+    }
+
     /**
      * 链表监控
      * @param map
@@ -259,4 +307,63 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         qmsQueueList.setDeleted(new BigDecimal(1));
         return qmsQueueListMapper.updateByPrimaryKeySelective(qmsQueueList);
     }
+
+    /**
+     * 结束仓库排队
+     * @param map {orderNumber 运输订单号}
+     * @return
+     */
+    public int queueEndWarehouse(Map<String, Object> map){
+        //通过运输订单号查询排队实绩ID 链表Id
+        map.putAll(qmsQueueListMapper.getQueueResultByOrderNumber(map));
+        BigDecimal resultId = DataChange.dataToBigDecimal(map.get("resultId")); //实绩Id
+        BigDecimal listId = DataChange.dataToBigDecimal(map.get("listId"));  //链表Id
+        //通过链表id修改链表对应数据 将此数据移出队列 deleted = 1
+        int i = updateQueueListToDie(listId);
+        //给排队实绩中添加数据
+        QmsQueueResult qmsQueueResult = new QmsQueueResult();
+        qmsQueueResult.setResultId(resultId);
+        qmsQueueResult.setResultEndTime(new Date());
+        int i1 = qmsQueueResultMapper.updateByPrimaryKeySelective(qmsQueueResult);
+        return i + i1;
+    }
+
+    /**
+     * 仓库排队监控
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> warehouseListMonitor(Map<String, Object> map) {
+        return qmsQueueListMapper.warehouseListMonitor(map);
+    }
+
+    /**
+     * 查询排队详情 门岗ID 或者 月台ID
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getListQueueMes(Map<String, Object> map) {
+        HashMap<String, Object> hashMap = new HashMap<>();
+        if(map.get("gatepostId") != null){//传入的是门岗ID 自然类型就为 3：进厂门岗
+            hashMap.put("queueLocationId", map.get("gatepostId"));
+            hashMap.put("gridType", 3);
+        }else if(map.get("platformId") != null){ // 1：成品仓库
+            hashMap.put("queueLocationId", map.get("platformId"));
+            hashMap.put("gridType", 1);
+        }
+        //通过门岗ID和 类型 来查询网格ID
+        BigDecimal gridId = qmsQueueResultMapper.getGridIdByGatepostIdAndGridType(hashMap);
+        map.put("gridId", gridId);
+        List<Map<String, Object>> listQueueMes = qmsQueueListMapper.getListQueueMes(map);
+        for (Map<String, Object> queueMes : listQueueMes) {
+            //获取排队开始时间
+            Date resultStartTime = (Date) queueMes.get("resultStartTime");
+            long sTime = new Date().getTime() - resultStartTime.getTime(); //当前时间与开始时间相差毫秒数
+            sTime = sTime / (1000 * 60);
+            queueMes.put("minute", sTime + "分钟");
+        }
+        return listQueueMes;
+    }
 }

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

@@ -1,11 +1,13 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.QmsQueueListMapper;
 import com.steerinfo.dil.model.QmsQueueList;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.model.QmsQueueResult;
 import com.steerinfo.dil.mapper.QmsQueueResultMapper;
 import com.steerinfo.dil.service.IQmsQueueResultService;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,9 +35,15 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
 
     @Autowired
     private QmsQueueListMapper qmsQueueListMapper;
+    
+    @Autowired
+    private QueuingRulesServiceImpl queuingRulesService;
+
+    @Autowired
+    private TmsTruckFeign tmsTruckFeign;
 
     /**
-     * 新增排队实绩
+     * 新增进厂排队实绩
      * @param map {orderNumber}运输订单号
      * @return
      */
@@ -46,17 +54,24 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         qmsQueueResult.setId(qmsQueueResultMapper.selectMaxId());
         //获取传入运输订单号
         String orderNumber = (String) map.get("orderNumber");
-        //查询实绩总表ID与运力Id
-        Map<String, Object> cidAndTidMap = qmsQueueResultMapper.queryCIdAndTIdByOrderNumber(orderNumber);
-        BigDecimal capacityId = DataChange.dataToBigDecimal(cidAndTidMap.get("capacityId"));
-        map.put("capacityId", capacityId);  //使用传进来的map将数据一路带到尾
-        qmsQueueResult.setCapacityId(capacityId);
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(cidAndTidMap.get("resultTotalId"));
-        qmsQueueResult.setResultTotalId(resultTotalId);
-        //通过运输订单号查询物资Id
-        BigDecimal materialId = qmsQueueResultMapper.queryOrderMesByOrderId(DataChange.dataToBigDecimal(cidAndTidMap.get("orderId")));
-        //通过物资Id查询门岗ID
-        map.put("materialId", materialId);
+        //查询实绩总表ID 运力Id  物资Id (OO-->OOM 一对多)  只有钢材会有多条数据 但都属于钢材类型 取第一个获取物资ID匹配
+        map.putAll(qmsQueueResultMapper.queryCIdAndTIdByOrderNumber(orderNumber).get(0)); //使用传进来的map将数据一路带到尾
+        //判断是否销售订单 销售订单进厂时查询装车点
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
+        if (orderType.intValue() == 1){
+            //查询当前订单关联几种物资
+            List<Integer> materialIdList = queuingRulesService.getAllMaterialId(map);
+            //取得月台ID、以及对应的物资Id
+            List<Map<String, Object>> platIdList = queuingRulesService.getPlatId(materialIdList);
+            List<Map<String, Object>> list = new ArrayList<>();
+            for (Map<String, Object> map1 : platIdList) {
+                map1.put("orderId", map.get("orderId"));
+                list.add(map1);
+            }
+            //远程调用 修改装车点
+            tmsTruckFeign.updateLoadResultList(list);
+        }
+        //通过物资Id 和 进厂类型 查询 门岗ID
         map.put("type", 0); //匹配物资可进厂的门岗
         List<BigDecimal> gatepostList = qmsQueueResultMapper.queryGatepostByMaterialId(map); //可能会有多个门岗可入
         BigDecimal gatepostId = gatepostList.get(0);
@@ -65,18 +80,63 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         //通过匹配出来的门岗ID获取网格ID
         BigDecimal gridId = qmsQueueResultMapper.getGridIdByGatepostIdAndGridType(map);
         map.put("gridId", gridId);
-        //新增进厂排队实绩
+        //新增进厂排队实绩 添加申请时间
         qmsQueueResult.setGridId(gridId);
-        //添加申请时间
         qmsQueueResult.setResultApplyforTime(new Date());
         //系统自动下发 添加下发时间
         qmsQueueResult.setResultDownTime(new Date());
+        //添加运力ID和总实绩ID
+        qmsQueueResult.setCapacityId(DataChange.dataToBigDecimal(map.get("capacityId")));
+        qmsQueueResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
 
         qmsQueueResult.setInsertTime(new Date());
         qmsQueueResult.setInsertUsername("admin");
         return qmsQueueResultMapper.insertSelective(qmsQueueResult);
     }
 
+
+    /**
+     * 新增仓库排队实绩
+     * @param map orderNumber运输订单号
+     * @return
+     */
+    public int addQueueResultByCk(Map<String, Object> map){
+        QmsQueueResult qmsQueueResult = new QmsQueueResult();
+        //生成主键
+        qmsQueueResult.setId(qmsQueueResultMapper.selectMaxId());
+        //查询当前订单下所有的装车作业点
+        List<Integer> loadingIdList = qmsQueueResultMapper.getAllLoadingByOrderNumber((String) map.get("orderNumber"));
+        //遍历所有装车点查询排队车辆数 选择最少的一个先进行排队
+        int platId = 0;
+        int num = 100; //
+        for (Integer platformId : loadingIdList) {
+            int count = queuingRulesService.queueCountByPlatformId(new BigDecimal(platformId)).intValue();
+            if(count == 0){
+                platId = platformId;
+                break;
+            }
+            if(count < num){
+                num = count; //取代比较数
+                platId = platformId; //替换月台ID
+            }
+        }
+        //获取添加网格Id
+        map.put("queueLocationId", platId);
+        map.put("gridType", 1);
+        qmsQueueResult.setGridId(qmsQueueResultMapper.getGridIdByGatepostIdAndGridType(map));
+        //通过运输订单号查询实绩ID 等数据
+        map.putAll(qmsQueueResultMapper.queryCIdAndTIdByOrderNumber((String) map.get("orderNumber")).get(0));
+        qmsQueueResult.setResultApplyforTime(new Date());
+        //系统自动下发 添加下发时间
+        qmsQueueResult.setResultDownTime(new Date());
+        //添加运力ID和总实绩ID
+        qmsQueueResult.setCapacityId(DataChange.dataToBigDecimal(map.get("capacityId")));
+        qmsQueueResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        qmsQueueResult.setInsertTime(new Date());
+        qmsQueueResult.setInsertUsername("admin");
+        return qmsQueueResultMapper.insertSelective(qmsQueueResult);
+    }
+
     /**
      * 查看排队转移界面
      * @param map
@@ -114,7 +174,15 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      */
     @Override
     public List<Map<String, Object>> orderReceive(Map<String, Object> map) {
-        List<Map<String, Object>> orderReceiveList = qmsQueueResultMapper.getOrderReceive(map);
+        Integer queueType = (Integer) map.get("queueType");
+        List<Map<String, Object>> orderReceiveList = null;
+        switch (queueType){
+            case 1: //进厂
+                orderReceiveList = qmsQueueResultMapper.getOrderReceive(map);
+                break;
+            case 2: //仓库
+                orderReceiveList = qmsQueueResultMapper.getWarehouseOrderReceive(map);
+        }
         //遍历数据 通过是否有接收时间 来判断是否接收
         for (Map<String, Object> orderReceiveMap : orderReceiveList) {
             if(orderReceiveMap.get("resultAcceptTime") != null){
@@ -137,6 +205,16 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         return qmsQueueResultMapper.getQueueListByQueueUp(map);
     }
 
+    /**
+     * 查询排队详情
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getQueueMes(Map<String, Object> map) {
+        return qmsQueueResultMapper.getQueueMes(map);
+    }
+
     /**
      * 查询排队取消数据
      * @param map
@@ -214,6 +292,58 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         return list;
     }
 
+    //=========================================仓库排队===========================================
+
+    /**
+     * 查看仓库排队申请
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getWarehouseQueueApply(Map<String, Object> map) {
+        return qmsQueueResultMapper.getWarehouseQueueApply(map);
+    }
+
+    /**
+     * 查看排队开始
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getWarehouseQueueListByQueueUp(Map<String, Object> map) {
+        return qmsQueueResultMapper.getWarehouseQueueListByQueueUp(map);
+    }
+
+    /**
+     * 查看仓库排队详情 通过运输订单号查询仓库
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getWarehouseQueueMes(Map<String, Object> map) {
+        return qmsQueueResultMapper.getWarehouseQueueMes(map);
+    }
+
+    /**
+     * 查询仓库排队转移详情
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getWarehouseQueueChange(Map<String, Object> map) {
+        return qmsQueueResultMapper.getWarehouseQueueChange(map);
+    }
+
+    /**
+     * 查询仓库排队结束
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getWarehouseQueueEndMes(Map<String, Object> map) {
+        return qmsQueueResultMapper.getWarehouseQueueEndMes(map);
+    }
+
     //********************************APP*********************************************
 
     /**

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

@@ -0,0 +1,126 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.QmsQueueResultMapper;
+import com.steerinfo.dil.mapper.QueuingRulesMapper;
+import com.steerinfo.dil.service.IQueuingRulesService;
+import com.steerinfo.dil.util.DataChange;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 排队规则
+ * @ author    :TXF
+ * @ time      :2021/10/16 10:04
+ */
+
+@Service
+public class QueuingRulesServiceImpl implements IQueuingRulesService {
+
+    @Resource
+    private QueuingRulesMapper queuingRulesMapper;
+
+    @Autowired
+    private QmsQueueResultMapper qmsQueueResultMapper;
+
+    /*=========================仓库排队规则=========================*/
+    /**
+     * 查询订单中所需要运输的物资  物资表对订单表 一对多
+     * @param map 运输订单号 orderNumber
+     * @return
+     */
+    @Override
+    public List<Integer> getAllMaterialId(Map<String, Object> map) {
+        return queuingRulesMapper.getAllMaterialId(map);
+    }
+
+    /**
+     *通过物资Id查询仓库是否有货 或者 是否有多个仓库有货
+     * @param materialId 物资ID
+     * @return
+     */
+    @Override
+    public List<Integer> getWarehouseIdByMaterialId(Integer materialId) {
+        return queuingRulesMapper.getWarehouseIdByMaterialId(materialId);
+    }
+
+    /**
+     * 通过仓库Id 和 物资Id 查询垛位 层次 月台 仓库
+     * @param map MaterialId 物资ID warehouseId 仓库ID
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getStackGradation(Map<String, Object> map) {
+        return queuingRulesMapper.getStackGradation(map);
+    }
+
+    /**
+     * 通过月台Id 查询月台当前排队车辆数
+     * @param platformId 月台ID
+     * @return
+     */
+    @Override
+    public BigDecimal queueCountByPlatformId(BigDecimal platformId) {
+        return queuingRulesMapper.queueCountByPlatformId(platformId);
+    }
+
+
+    /**
+     * 获取月台Id 通过物资ID 根据排队规则 获取车辆该去哪个月台
+     * 遗留问题：多种物资会有多个装车实绩 多个月台该如何插入装车实绩  先装哪个物资 查询线路会有多条数据 如何进行筛选
+     * @param materialIdList
+     * @return
+     */
+    public List<Map<String, Object>> getPlatId(List<Integer> materialIdList){
+        //遍历每一中物资查找月台
+        List<Map<String, Object>> platIdList = new ArrayList<>();
+        con:for (Integer materialId : materialIdList) {
+            Integer platId = null;
+            //一种物资可能在多个仓库中
+            Map<String, Object> map = new HashMap<>();
+            map.put("materialId", materialId);
+
+            List<Integer> warehouseList = getWarehouseIdByMaterialId(materialId);
+            int countNum = 1000; //初始化比较值
+            for (Integer warehouseId : warehouseList) {
+                HashMap<String, Object> hashMap = new HashMap<>();
+                hashMap.put("materialId", materialId);
+                hashMap.put("warehouseId", warehouseId);
+                //通过物资Id和仓库ID对仓储网格表 再次进行查询并筛选出层次号最高的几条数据
+                List<Map<String, Object>> mesList = getStackGradation(hashMap);
+                //遍历筛选出来的月台 查看当前月台排队车辆数
+                for (Map<String, Object> mesMap : mesList) {
+                    BigDecimal platformId = DataChange.dataToBigDecimal(mesMap.get("platformId"));
+                    //通过月台ID 和 网格类型 查找当前网格Id
+                    hashMap.put("queueLocationId", platformId);
+                    hashMap.put("gridType", 1);
+                    BigDecimal gridId = qmsQueueResultMapper.getGridIdByGatepostIdAndGridType(hashMap);
+                    //取得排队车辆数
+                    int count = queueCountByPlatformId(gridId).intValue();
+                    //如果当前月台排队车数为0 则直接选择这个月台
+                    if(count == 0){
+                        platId = platformId.intValue();
+                        map.put("loadingId", platId);
+                        platIdList.add(map);
+                        continue con;
+                    }
+                    //如果排队车辆数小于上个月台排队车辆数
+                    if(count < countNum){
+                        countNum = count; //取代比较数
+                        platId = platformId.intValue(); //替换月台ID
+                        map.put("loadingId", platId);
+                    }
+                }
+            }
+            platIdList.add(map);
+        }
+        return platIdList;
+    }
+
+}

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

@@ -1,29 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.RmsCapacityMapper;
-import com.steerinfo.dil.service.IRmsCapacityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.Date;
-import java.math.BigDecimal;
-
-/**
- * RmsCapacity服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-14 11:31
- * 类描述
- * 修订历史：
- * 日期：2021-09-14
- * 作者：generator
- * 参考：
- * 描述：RmsCapacity服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "rmsCapacityService")
-public class RmsCapacityServiceImpl implements IRmsCapacityService {
-
-    @Autowired
-    private RmsCapacityMapper rmsCapacityMapper;
-
-}

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

@@ -318,6 +318,4 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
-
-
 </mapper>

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

@@ -400,12 +400,18 @@
     select *
     from (
         select
-          RG.GATEPOST_NAME           "gatepostName",
+          RG.GATEPOST_ID "gatepostId",
+        (
+        select RG2.GATEPOST_NAME from RMS_GATEPOST RG2
+        where RG2.GATEPOST_ID = RG.GATEPOST_ID
+            ) "gatepostName",
           count(QQL.LIST_NODE_ORDER) "count"
         from RMS_GATEPOST RG
+          left join QMS_QUEUE_GRID QQG
+          on QQG.QUEUE_LOCATION_ID = RG.GATEPOST_ID and QQG.GRID_TYPE = 3
         LEFT JOIN QMS_QUEUE_LIST QQL
-            on QQL.GRID_ID = RG.GATEPOST_ID and QQL.DELETED = 0
-        group by RG.GATEPOST_NAME
+            on QQL.GRID_ID = QQG.GRID_ID and QQL.DELETED = 0
+        group by RG.GATEPOST_ID
         )
     <where>
       <if test="gatepostName != null">
@@ -421,8 +427,96 @@
       </if>
     </where>
     <include refid="orderBy"></include>
+    <if test="orderField == null  ">
+      order by "count" desc, "gatepostId" asc
+    </if>
+  </select>
+
+<!-- 通过运输订单号查询运输订单信息 -->
+  <select id="getOrderMesByOrderNum" parameterType="string" resultType="java.util.Map">
+     select
+        RC.CAPACITY_NUMBER "capacityNumber",
+            RG.GATEPOST_NAME "gatepostName"
+     from OMSTRUCK_ORDER OO
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join RMS_LINE RL
+        on RL.LINE_ID = OO.LINE_ID
+        left join RMS_GATEPOST RG
+        on RG.GATEPOST_ID = RL.LINE_START_NODE_ID
+    where OO.ORDER_NUMBER = #{orderNumber}
+  </select>
+
+<!-- 仓库链表监控 -->
+  <select id="warehouseListMonitor" resultType="java.util.Map" parameterType="java.util.Map">
+    select *
+    from (
+    select
+    RPP.PLATFORM_ID          "platformId",
+    (SELECT PLATFORM_NAME from RMS_PWAREHOUSE_PLATFORM where PLATFORM_ID = RPP.PLATFORM_ID
+        ) "platformName",
+    (select RW.WAREHOUSE_NAME from RMS_WAREHOUSE RW where RW.WAREHOUSE_ID = (select distinct WAREHOUSE_ID
+                                                                from RMS_PWAREHOUSE_GRID RPG
+                                                                where RPG.PLATFORM_ID = RPP.PLATFORM_ID )
+        ) "warehouseName",
+    count(QQL.LIST_NODE_ORDER) "count"
+    from RMS_PWAREHOUSE_PLATFORM RPP
+    left join QMS_QUEUE_GRID QQG
+        on QQG.QUEUE_LOCATION_ID = RPP.PLATFORM_ID and QQG.GRID_TYPE = 1
+    LEFT JOIN QMS_QUEUE_LIST QQL
+    on QQL.GRID_ID = QQG.GRID_ID and QQL.DELETED = 0
+    group by RPP.PLATFORM_ID
+    )
+    <where>
+      <if test="platformName != null">
+        <foreach collection="platformName" item="item" open="(" separator="or" close=")">
+          "platformName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="count != null">
+        and
+        <foreach collection="count" item="item" open="(" separator="or" close=")">
+          "count" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="warehouseName != null">
+        and
+        <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+          "warehouseName" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderBy"></include>
     <if test="orderField == null  ">
       order by "count" desc
     </if>
   </select>
+
+<!-- 查询某一个队列的车辆排队详情 -->
+ <select id="getListQueueMes" parameterType="java.util.Map" resultType="java.util.Map">
+   select QQL.LIST_ID           "listId",
+          RC.CAPACITY_NUMBER    "capacityNumber",
+          RC.CAPACITY_VIP       "capacityVip",
+          QQR.RESULT_START_TIME "resultStartTime",
+          (
+        <![CDATA[
+            select count(*)
+            from QMS_QUEUE_LIST QQL2
+                   join QMS_QUEUE_GRID QQG2
+                        on QQG2.GRID_ID = QQL2.GRID_ID
+            where QQL2.LIST_NODE_ORDER <= QQL.list_node_order
+              and QQL2.GRID_ID = QQL.GRID_ID
+              and QQL2.DELETED = 0
+        ]]>
+        )                     "listNodeOrder"
+   from QMS_QUEUE_LIST QQL
+          left join QMS_QUEUE_RESULT QQR
+                    on QQR.LIST_ID = QQL.LIST_ID
+          left join RMS_CAPACITY RC
+                    on RC.CAPACITY_ID = QQL.CAPACITY_ID
+   where QQL.DELETED = 0
+      <if test="gridId != null">
+        and QQL.GRID_ID = #{gridId}
+      </if>
+ </select>
 </mapper>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.QueuingRulesMapper">
+
+    <!--  查询订单有几件物资  -->
+    <select id="getAllMaterialId" parameterType="java.util.Map" resultType="int">
+        select OOM.MATERIAL_ID "materialId"
+        from OMSTRUCK_ORDER OO
+                 left join OMSTRUCK_ORDER_MATERIAL OOM
+                           on OO.ORDER_ID = OOM.ORDER_ID
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+
+<!--  查询仓库是否有货  -->
+    <select id="getWarehouseIdByMaterialId" parameterType="java.util.Map" resultType="int">
+        select distinct RPG.WAREHOUSE_ID "warehouseId"
+        from RMS_MATERIAL_STEEL RMS
+                 left join WMSP_GRID_MATERIAL WGM
+                           on RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID
+                 left join RMS_PWAREHOUSE_GRID RPG
+                           on RPG.GRID_ID = WGM.GRID_ID
+        where WGM.DELETED = 0
+          and RMS.MATERIAL_ID = #{materialId}
+    </select>
+
+<!--  通过仓库Id 和 物资Id 查询垛位 层次 月台  仓库 -->
+    <select id="getStackGradation" parameterType="java.util.Map" resultType="java.util.Map">
+        select RPG.WAREHOUSE_ID          "warehouseId",
+               rpg.GRID_GRADATION_NUMBER "gridGradationNumber",
+               RPG.PLATFORM_ID           "platformId",
+               RPG.STACKING_ID           "stackingId"
+
+        from RMS_MATERIAL_STEEL RMS
+                 left join WMSP_GRID_MATERIAL WGM
+                           on RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID
+                 left join RMS_PWAREHOUSE_GRID RPG
+                           on RPG.GRID_ID = WGM.GRID_ID
+        where WGM.DELETED = 0
+          and RMS.MATERIAL_ID = #{materialId}
+          and RPG.WAREHOUSE_ID = #{warehouseId}
+          and RPG.GRID_GRADATION_NUMBER = (
+            select MAX(rpg.GRID_GRADATION_NUMBER)
+            from RMS_MATERIAL_STEEL RMS
+                     left join WMSP_GRID_MATERIAL WGM
+                               on RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID
+                     left join RMS_PWAREHOUSE_GRID RPG
+                               on RPG.GRID_ID = WGM.GRID_ID
+            where WGM.DELETED = 0
+              and RMS.MATERIAL_ID = #{materialId}
+              and RPG.WAREHOUSE_ID = #{warehouseId})
+    </select>
+
+<!--  通过月台ID 查询当前月台排队车辆数  -->
+    <select id="queueCountByPlatformId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
+        select
+            count(*) "count"
+        from QMS_QUEUE_LIST
+        where GRID_ID = #{gridId}
+          and DELETED = 0
+    </select>
+
+
+
+</mapper>

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

@@ -652,6 +652,5 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
   
 </mapper>