麻柳新厂厂外库功能

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

@@ -2316,6 +2316,12 @@ public class AMScontroller{
         return amsFeign.insertOyeWarehouse(mapValue);
     }
 
+    @ApiOperation(value="新增欧冶具体库房信息")
+    @PostMapping("/insertOyeWarehouseSide")
+    public Map<String,Object> insertOyeWarehouseSide(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.insertOyeWarehouseSide(mapValue);
+    }
+
 
     @ApiOperation(value = "查询欧冶库房信息")
     @PostMapping("/getOyeWarehouse")
@@ -2329,6 +2335,18 @@ public class AMScontroller{
         return amsFeign.getOyeWarehouse(mapValue,pageNum,pageSize,apiId);
     }
 
+    @ApiOperation(value = "查询欧冶库房信息")
+    @PostMapping("/getOyeWarehouseSide")
+    public Map<String,Object>  getOyeWarehouseSide(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId){
+        if(mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return amsFeign.getOyeWarehouseSide(mapValue,pageNum,pageSize,apiId);
+    }
+
     @ApiOperation(value = "查询转运计划信息")
     @PostMapping("/getTransPlan")
     public Map<String,Object> getTransPlan(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -994,6 +994,12 @@ public class UniversalController extends BaseRESTfulController {
         return universalMapper.getSteelWarehouse();
     }
 
+    @ApiModelProperty(value = "获取仓库月台")
+    @GetMapping("/getSteelWarehouseSide")
+    public List<Map<String, Object>> getSteelWarehouseSide(){
+        return universalMapper.getSteelWarehouseSide();
+    }
+
 
     @ApiOperation(value = "查询运力联系方式")
     @GetMapping("/getCapacityTel")
@@ -1333,5 +1339,10 @@ public class UniversalController extends BaseRESTfulController {
         return success(universalMapper.getOyeSaleArea(map));
     }
 
+    @ApiOperation("查询厂外库仓库")
+    @GetMapping("/getInboundWarehouseList")
+    public List<Map<String, Object>> getInboundWarehouseList() {
+        return universalMapper.getInboundWarehouseList();
+    }
 
 }

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

@@ -1930,9 +1930,18 @@ public interface AmsFeign {
                                         @RequestParam Integer pageSize,
                                         @RequestParam Integer apiId);
 
+    @PostMapping("/api/v1/ams/OyeWarehouse/getOyeWarehouseSide")
+    Map<String, Object> getOyeWarehouseSide(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+
     @PostMapping("/api/v1/ams/OyeWarehouse/insertOyeWarehouse")
     Map<String, Object> insertOyeWarehouse(@RequestBody Map<String, Object> mapValue);
 
+    @PostMapping("/api/v1/ams/OyeWarehouse/insertOyeWarehouseSide")
+    Map<String, Object> insertOyeWarehouseSide(@RequestBody Map<String, Object> mapValue);
+
     @PostMapping("/api/v1/ams/OyeWarehouse/getTransPlan")
     Map<String, Object> getTransPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer pageNum,

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

@@ -197,6 +197,8 @@ public interface UniversalMapper {
     //仓库月台下拉框
     List<Map<String, Object>> getSteelWarehouse();
 
+    List<Map<String, Object>> getSteelWarehouseSide();
+
     List<Map<String, Object>> getShipNameMesByLike(Map<String, Object> map);
 
     //查询运力联系方式
@@ -315,4 +317,6 @@ public interface UniversalMapper {
 
     List<Map<String,Object>> getOyeSaleArea(Map<String, Object> map);
 
+    List<Map<String, Object>> getInboundWarehouseList();
+
 }

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

@@ -1050,6 +1050,13 @@
         WHERE RW.WAREHOUSE_TYPE_ID = 9
     </select>
 
+    <select id="getSteelWarehouseSide" resultType="java.util.Map">
+        SELECT RW.WAREHOUSE_ID   "id",
+               RW.WAREHOUSE_NAME "value"
+        FROM RMS_WAREHOUSE RW
+        WHERE RW.WAREHOUSE_TYPE_ID = 9 and RW.PORT_ID = 500
+    </select>
+
     <select id="getShipNameMesByLike" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT DB.RESULT_FOREIGN_SHIP_NAME "value",
                RS.SUPPLIER_ID "supplierId",
@@ -1778,4 +1785,13 @@
             AND ORI.CONSIGNEE_ID = #{consigneeId}
         </if>
     </select>
+
+    <select id="getInboundWarehouseList" resultType="java.util.Map">
+        SELECT RRP.place_id "id",
+               RRP.ADDRESS_DELIVERY_ADDRESS "value",
+               RRP.ADDRESS_DELIVERY_ADDRESS "label"
+        FROM RMS_RECEIVE_PLACE RRP
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON RRP.ADDRESS_ID = RRA.ADDRESS_ID
+        WHERE RRA.INSERT_UPDATE_REMARK = '麻柳厂区厂外库'
+    </select>
 </mapper>