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

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

@@ -577,6 +577,13 @@ public class OMSController {
         return omsFeign.sendOrderToApp(capacityNumber);
     }
 
+    @ApiOperation(value = "根据运输订单号查询订单物资")
+    @PostMapping("/getUnloadOrderMaterial")
+    public Map<String,Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String,Object>map){
+        return omsFeign.getUnloadOrderMaterial(map);
+    }
+
+
     @ApiOperation(value = "分解异地库计划")
     @PostMapping("/apportionInwardOffsetOrder")
     public Map<String,Object> apportionInwardOffsetOrder(@RequestBody Map<String,Object> mapvalue) {

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

@@ -712,8 +712,6 @@ public class RMScontroller {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-
-
     @PostMapping(value = "/getNoticeList")
     public Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
@@ -749,6 +747,50 @@ public class RMScontroller {
     }
 
 
+    //港口
+    @ApiOperation(value = "获取港口", notes = "分页查询")
+    @PostMapping(value = "/getPort")
+    public Map<String, Object> getPortList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPortList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+    //码头
+    @ApiOperation(value = "获取码头", notes = "分页查询")
+    @PostMapping(value = "/getPier")
+    public Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPierList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value = "获取港存堆场", notes = "分页查询")
+    @PostMapping(value = "/getYardList")
+    public Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPortYardList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
 
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
@@ -810,6 +852,7 @@ public class RMScontroller {
     }
 
 
+
 //*******************************下拉框************************
 
     @GetMapping("getNoticeTypeId")
@@ -818,11 +861,49 @@ public class RMScontroller {
         return rmsFeign.getNoticeTypeId();
     }
 
+    @GetMapping("getPortType")
+    @ApiOperation(value = "得到港口类型Id")
+    public Map<String,Object> getPortType(){
+        return rmsFeign.getPortType();
+    }
+
     @ApiOperation(value="新增原料仓库信息", notes="根据rmsWarehouse对象创建")
     @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
-
     @PostMapping(value = "/insertWarehouse")
     public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertWarehouse(map);
     }
+
+    //港口
+    @PostMapping("/insertPort")
+    public Map<String, Object> insertPort(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPort(map);
+    }
+
+    //
+    @PostMapping("/insertPier")
+    public Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPier(map);
+    }
+
+    //港口
+    @PostMapping("/insertPortYard")
+    public Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPortYard(map);
+    }
+
+    @PostMapping(value = "/deletePort/{portId}")//BigDecimal
+    public Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId) {
+        return rmsFeign.deletePort(portId);
+    }
+
+    @PostMapping(value = "/deletePier/{pierId}")//BigDecimal
+    public Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId) {
+        return rmsFeign.deletePier(pierId);
+    }
+
+    @PostMapping(value = "/deletePortYard/{warehouseId}")//BigDecimal
+    public Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId) {
+        return rmsFeign.deletePortYard(warehouseId);
+    }
 }

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

@@ -367,5 +367,9 @@ public interface OmsFeign {
     @ApiOperation(value = "根据运输订单id修改运力id")
     @PostMapping("api/v1/oms/omstruckorderseparates/updateOmstruckOrder")
     Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map);
+
+    @ApiOperation(value = "根据运输订单号查询物资")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderMaterial")
+    Map<String, Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String, Object> map);
 }
 

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

@@ -453,6 +453,51 @@ public interface RmsFeign {
     @GetMapping(value = "api/v1/rms/dilnotices/getNoticeTypeId")
     Map<String,Object> getNoticeTypeId();
 
+    //港口
+    @PostMapping(value = "api/v1/rms/rmsPort/insertPort")
+    Map<String,Object> insertPort(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除港口
+    @PostMapping(value = "api/v1/rms/rmsPort//deletePort/{portId}")
+    Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId);
+
+    //删除码头
+    @PostMapping(value = "api/v1/rms/rmsPier//deletePier/{pierId}")
+    Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId);
+
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPort")
+    Map<String, Object> getPortList(@RequestBody(required = false) Map<String , Object> mapVal,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/rms/rmsPier/getPier")
+    Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/rms/rmsPortYard/getPortYard")
+    Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam String con);
+
+    @GetMapping(value = "api/v1/rms/rmsPort/getPortType")
+    Map<String, Object> getPortType();
+
+
+    @PostMapping(value = "api/v1/rms/rmsPier/insertPier")
+    Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsPortYard/insertPortYard")
+    Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map);
 
+    //删除港存堆场
+    @PostMapping(value = "api/v1/rms/rmsPortYard/deletePortYard/{warehouseId}")
+    Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId);
 
 }

src/main/resources/bootstrap.yml

@@ -52,6 +52,7 @@ openfeign:
     RmsFeign:
       url: ${RMSFEIGN_URL:172.16.33.166:8060}
 
+
   #测试环境
 #  ColumnDataFeign:
 #    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}

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

@@ -352,7 +352,6 @@
             order by "materialId" desc
         </if>
     </select>
-
 <!--  查询所有的批次及其关联的采购订单号  -->
     <select id="getBatchAndOrderMes" parameterType="map" resultType="java.util.Map">
         select *