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

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

@@ -878,9 +878,9 @@ public class AMScontroller{
         return amsFeign.addRailOffsetDayplan(mapVal);
     }
     //删除钢材发往异地库计划
-    @PostMapping("/deleteRailOffsetDayplan/{dayPlanId}")
-    public Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayPlanId") BigDecimal dayPlanId) {
-        return amsFeign.deleteRailOffsetDayplan(dayPlanId);
+    @PostMapping("/deleteRailOffsetDayplan/{dayplanId}")
+    public Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayplanId") Integer dayplanId) {
+        return amsFeign.deleteRailOffsetDayplan(dayplanId);
     }
     //修改钢材发往异地库计划
     @PostMapping("/updateRailOffsetDayplan")
@@ -888,10 +888,14 @@ public class AMScontroller{
         return amsFeign.updateRailOffsetDayplan(mapVal);
     }
 
-    //修改钢材发往异地库计划
-    @PostMapping("/getMaterialMesByDayPlanId/{dayPlanId}")
-    public Map<String,Object> getMaterialMesByDayPlanId(@PathVariable("dayPlanId")  Integer dayPlanId){
-        return amsFeign.getMaterialMesByDayPlanId(dayPlanId);
+    //钢材发运到异地库查询物资
+    @PostMapping("/getMaterialMesByDayPlanId")
+    public Map<String,Object> getMaterialMesByDayPlanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer apiId,
+                                                        Integer dayplanId){
+        return amsFeign.getMaterialMesByDayPlanId(mapValue,pageNum,pageSize,apiId,dayplanId);
     }
 
     //展示钢材发往异地库计划
@@ -900,11 +904,19 @@ public class AMScontroller{
     public Map<String, Object> getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              Integer apiId) {
+                                              Integer apiId,
+                                              Integer dayplanReceiveStatus,
+                                              Integer carrierId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getRailOffsetDayplan(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getRailOffsetDayplan(mapValue, pageNum, pageSize, apiId,dayplanReceiveStatus,carrierId);
+    }
+
+    @ApiModelProperty(value = "下发钢材发往异地库计划")
+    @PostMapping("/issueRailOffsetDayplan")
+    public RESTfulResult issueRailOffsetDayplan(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.issueRailOffsetDayplan(mapList);
     }
 
     ////************************************内转物流***************************************************
@@ -1159,7 +1171,9 @@ public class AMScontroller{
         return amsFeign.getCarrierList();
     }
 
-
-
-
+    @ApiModelProperty(value = "到站下拉")
+    @GetMapping("/getdayPlanToTheStationId")
+    public Map<String,Object> getdayPlanToTheStationId() {
+        return amsFeign.getdayPlanToTheStationId();
+    }
 }

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

@@ -562,9 +562,9 @@ public class OMSController {
         return map;
     }
 
-    @ApiModelProperty(value = "司机APP端查询下发给自己运输订单")
+    @ApiOperation(value = "司机APP端查询下发给自己运输订单")
     @PostMapping("/sendOrderToApp")
-    public Map<String,Object> sendOrderToApp(@RequestParam String capacityNumber) {
+    public List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber) {
         return omsFeign.sendOrderToApp(capacityNumber);
     }
 }

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

@@ -1046,8 +1046,12 @@ public interface AmsFeign {
     Map<String,Object> addRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapVal);
 
     //删除钢材发往异地库计划
-    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/deleteRailOffsetDayplan/{dayPlanId}")
-    Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayPlanId") BigDecimal dayPlanId);
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/deleteRailOffsetDayplan/{dayplanId}")
+    Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayplanId") Integer dayplanId);
+
+    //接收钢材发往异地库计划
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/receiveRailOffsetDayplan/{dayplanId}")
+    Map<String,Object> receiveRailOffsetDayplan(@PathVariable("dayplanId") Integer dayplanId);
 
     //修改钢材发往异地库计划
     @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/addRailOffsetDayplan")
@@ -1062,7 +1066,9 @@ public interface AmsFeign {
     Map<String, Object> getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId);
+                                       @RequestParam Integer apiId,
+                                       @RequestParam Integer dayplanReceiveStatus,
+                                       @RequestParam Integer carrierId);
 
     /**
      *新增运输计划
@@ -1190,11 +1196,28 @@ public interface AmsFeign {
 
     /**
      * 钢材发运到异地库查询物资
-     * @param dayPlanId
+     * @param dayplanId
      * @return
      */
-    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getMaterialMesByDayPlanId/{dayPlanId}")
-    Map<String, Object> getMaterialMesByDayPlanId(@PathVariable("dayPlanId") Integer dayPlanId);
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getMaterialMesByDayPlanId")
+    Map<String, Object> getMaterialMesByDayPlanId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer dayplanId);
 
+    /**
+     * 下发钢材发往异地库计划
+     * @param mapList
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/issueRailOffsetDayplan")
+    RESTfulResult issueRailOffsetDayplan(@RequestBody List<Map<String, Object>> mapList);
 
+    /**
+     * 到站下拉
+     * @return
+     */
+    @GetMapping("/api/v1/ams/amsrailoffsetdayplan/getdayPlanToTheStationId")
+    Map<String, Object> getdayPlanToTheStationId();
 }

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

@@ -316,6 +316,6 @@ public interface OmsFeign {
 
     // 司机APP端查询下发给自己运输订单
     @PostMapping("api/v1/oms/omstruckorders/sendOrderToApp")
-    Map<String, Object> sendOrderToApp(@RequestParam String capacityNumber);
+    List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber);
 }