'冲突'

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

@@ -882,6 +882,7 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+
     @ApiModelProperty(value = "边输边查片区")
     @PostMapping("/getSaleAreaByLike")
     public RESTfulResult getSaleAreaByLike(@RequestParam("index") String index) {
@@ -905,4 +906,12 @@ public class UniversalController extends BaseRESTfulController {
         int result = universalMapper.bandSaleArea(map);
         return success(result);
     }
+
+    @ApiOperation(value = "查询厂内钢材车辆作业总数")
+    @GetMapping("/getSteelOrderNum")
+    public RESTfulResult getSteelOrderNum(){
+        int i = universalMapper.getSteelOrderNum();
+        return success(i);
+    }
+
 }

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

@@ -68,6 +68,20 @@ public class WMSHController extends BaseRESTfulController {
     }
 
 
+    @PostMapping("getUnLockPortStock")
+    @ApiOperation(value = "展示万州港口港存库库存列表")
+    public RESTfulResult getUnLockPortStock(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getUnLockPortStock(mapValue, pageNum, pageSize, apiId,con);
+    }
+
+
     /**
      * 展示万州港港存库库存列表
      *

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

@@ -134,4 +134,11 @@ public interface WMSHFeign {
                                                  @RequestParam("pageSize") Integer pageSize,
                                                  @RequestParam("apiId") Integer apiId,
                                                  @RequestParam("con")String con);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getUnLockPortStock")
+    RESTfulResult getUnLockPortStock(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("con") String con);
 }

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

@@ -213,4 +213,7 @@ public interface UniversalMapper {
     BigDecimal isReceiveHaveArea(Integer receiveId);
     // 绑定片区
     int bandSaleArea(Map<String, Object> map);
+
+    int getSteelOrderNum();
+
 }

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

@@ -1068,4 +1068,12 @@
         SET RC.AREA_ID = #{areaId}
         WHERE RC.CONSIGNEE_ID = #{receiveId}
     </update>
+
+    <select id="getSteelOrderNum" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_LINE_SEQUENCE &gt;= 1
+        AND   OO.ORDER_STATUS = 5
+        AND   OO.ORDER_TYPE = 1
+    </select>
+
 </mapper>