提交

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

@@ -713,8 +713,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,
@@ -750,6 +748,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,49 +852,9 @@ public class RMScontroller {
         return rmsFeign.getOilPriceById(id);
     }
 
-    //港口
-    @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);
-    }
+
 
 //*******************************下拉框************************
 
@@ -863,6 +865,7 @@ public class RMScontroller {
     }
 
 
+
     @GetMapping("getPortType")
     @ApiOperation(value = "得到港口类型Id")
     public Map<String,Object> getPortType(){
@@ -877,6 +880,7 @@ public class RMScontroller {
     }
 
 
+
     //展示收货客户信息
     @ApiOperation(value = "获取收货客户信息", notes = "分页查询")
     @ApiImplicitParams({
@@ -911,6 +915,7 @@ public class RMScontroller {
     }
 
 
+
     //港口
     @PostMapping("/insertPort")
     public Map<String, Object> insertPort(@RequestBody(required = false) Map<String, Object> map) {

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

@@ -293,12 +293,7 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
-    @ApiModelProperty(value = "模糊查询承运商")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
-    })
+    @ApiModelProperty(value = "边输边查承运商")
     @PostMapping("/getCarrierMesByLike")
     public RESTfulResult getCarrierMesByLike(@RequestParam("index") String index) {
         if(index != null){
@@ -364,4 +359,18 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "边输边查装货卸货点")
+    @PostMapping("/selectUnloadingPoint")
+    public RESTfulResult selectUnloadingPoint(@RequestParam("index") String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index += "%";
+            }
+        }
+        List<Map<String, Object>> list = universalMapper.selectUnloadingPoint(index);
+        return success(list);
+    }
+
 }

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

@@ -462,10 +462,12 @@ public interface RmsFeign {
                                             @RequestParam("con") String con);
 
 
+
   //边输入边搜索承运商
     @PostMapping(value = "/api/v1/rms/rmscardriver/getCarrierName")
     Map<String, Object> getCarrierName(@RequestParam(value = "state")String state);
 
+
     //港口
     @PostMapping(value = "api/v1/rms/rmsPort/insertPort")
     Map<String,Object> insertPort(@RequestBody(required = false) Map<String,Object> map);

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

@@ -55,4 +55,7 @@ public interface UniversalMapper {
 
     // 所有物资
     List<Map<String, Object>> selectAllMaterialName(Map<String, Object> mapValue);
+
+    //边输边查卸货点
+    List<Map<String, Object>> selectUnloadingPoint(String index);
 }

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 *
@@ -458,4 +457,19 @@
             on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where OOM.ORDER_ID = #{orderId}
     </select>
+
+<!--  边输边查卸货点  -->
+    <select id="selectUnloadingPoint" parameterType="string" resultType="java.util.Map">
+        select Rw.WAREHOUSE_NAME "warehouseName",
+               RW.WAREHOUSE_ID "warehouseId"
+        from RMS_WAREHOUSE RW
+        where
+              <if test="index != null">
+                  RW.WAREHOUSE_NAME like #{index}
+              </if>
+              <if test="index == null">
+                  rownum &lt; 10
+              </if>
+        order by "warehouseName"
+    </select>
 </mapper>