排队

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

@@ -28,8 +28,8 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
     @PostMapping("/addQueueResult")
-    public Map<String, Object> addQueueResult(@RequestBody(required = false) Map<String, Object> map){
-        return qmsTruckFeign.addQueueResult(map);
+    public Map<String, Object> addQueueResult(String vno){
+        return qmsTruckFeign.addQueueResult(vno);
     }
 
 
@@ -38,8 +38,8 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
     @PostMapping("/addQueueList")
-    public Map<String, Object> addQueueList(@RequestBody(required = false) Map<String, Object> mapValue){
-        return qmsTruckFeign.addQueueList(mapValue);
+    public Map<String, Object> addQueueList(String resultId){
+        return qmsTruckFeign.addQueueList(resultId);
     }
 
     @ApiOperation(value="指令接收")
@@ -94,10 +94,11 @@ public class QMSController extends BaseRESTfulController {
                                                      Integer apiId,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer gridId,
-                                                     String con
+                                                     Integer locationId,
+                                                     String capacityNumber,
+                                                     Integer isSpelling
     ){
-        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, gridId,con);
+        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, locationId,capacityNumber, isSpelling);
     }
 
 
@@ -381,4 +382,22 @@ public class QMSController extends BaseRESTfulController {
                                                        String con
     ){return qmsTruckFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
     }
+
+
+    @ApiOperation(value="钢材科允许进厂")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+    })
+    @PostMapping("/allowEnFactory")
+    public Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsTruckFeign.allowEnFactory(mapValue);
+    }
+
+    @ApiOperation(value="APP端司机查看排队信息")
+    @GetMapping("getQueueResultByTotalId")
+    public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
+        return  qmsTruckFeign.getQueueResultByTotalId(resultTotalId);
+    }
+
+
 }

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

@@ -816,4 +816,10 @@ public class UniversalController extends BaseRESTfulController {
         }
         return 1;
     }
+
+    @ApiModelProperty(value = "获取仓库月台")
+    @GetMapping("/getSteelWarehouse")
+    public List<Map<String, Object>> getSteelWarehouse(){
+        return universalMapper.getSteelWarehouse();
+    }
 }

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

@@ -23,11 +23,11 @@ public interface QmsTruckFeign {
      */
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
-    public Map<String, Object> addQueueResult(@RequestBody(required = false) Map<String, Object> mapValue);
+    public Map<String, Object> addQueueResult( @RequestParam("vno")String vno);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
-    public Map<String, Object> addQueueList(@RequestBody(required = false) Map<String, Object> mapValue);
+    public Map<String, Object> addQueueList(@RequestParam("resultId")String resultId);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
@@ -61,8 +61,9 @@ public interface QmsTruckFeign {
                                                      @RequestParam("apiId") Integer apiId,
                                                      @RequestParam("pageNum") Integer pageNum,
                                                      @RequestParam("pageSize") Integer pageSize,
-                                                     @RequestParam("gridId") Integer gridId,
-                                                     @RequestParam("con")String con
+                                                     @RequestParam("locationId") Integer locationId,
+                                                     @RequestParam("capacityNumber")String capacityNumber,
+                                                     @RequestParam("isSpelling")Integer isSpelling
     );
 
 
@@ -190,4 +191,10 @@ public interface QmsTruckFeign {
                                                 @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/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -185,4 +185,7 @@ public interface UniversalMapper {
 
     //查询已下发订单数量  -->APP小红点
     Integer getOrderNum(String capacityNumber);
+
+    //仓库月台下拉框
+    List<Map<String, Object>> getSteelWarehouse();
 }

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

@@ -955,4 +955,11 @@
         WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
               AND OO.ORDER_STATUS = 4
     </select>
+    
+    <select id="getSteelWarehouse" resultType="java.util.Map">
+        SELECT RW.WAREHOUSE_ID   "id",
+               RW.WAREHOUSE_NAME "value"
+        FROM RMS_WAREHOUSE RW
+        WHERE RW.WAREHOUSE_TYPE_ID = 1
+    </select>
 </mapper>