txf hace 3 años
padre
commit
9e89d659be

+ 1 - 1
pom.xml

@@ -118,7 +118,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>[table-name]</param>&lt;!&ndash;运力&ndash;&gt;-->
+<!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;运力&ndash;&gt;-->
                     </tables>
                 </configuration>
                 <executions>

+ 30 - 4
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -796,17 +796,42 @@ public class AMScontroller{
     public Map<String,Object> updateTruckRailDayPlan(@RequestBody  Map<String, Object> mapVal) {
         return amsFeign.updateTruckRailDayPlan(mapVal);
     }
+    @PostMapping("getDayPlanByDayPlanId/{dayplanId}")
+    Map<String,Object> getDayPlanByDayPlanId(@PathVariable("dayplanId") Integer dayplanId){
+        return amsFeign.getDayPlanByDayPlanId(dayplanId);
+    }
+
+    /**
+     * 修改日期计划 2021年11月20日03:18:05
+     * @param map
+     * @return
+     */
+    @PostMapping("/updateDayPlan")
+    public Map<String,Object> updateDayPlan(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.updateDayPlan(map);
+    }
+
+    /**
+     * 查询所有的承运商
+     * @return
+     */
+    @GetMapping("/getCarrierMes")
+    public  Map<String,Object> getCarrierMes() {
+        return amsFeign.getCarrierMes();
+    }
+
     //展示日计划
     @PostMapping("/getTruckRailDayPlanList")
     @ApiOperation(value = "焦炭日计划")
     public Map<String, Object> getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId) {
+                                             Integer apiId,
+                                                   Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRailDayPlan(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getTruckRailDayPlan(mapValue, pageNum, pageSize, apiId, status);
     }
     //展示日计划
     @PostMapping("/getSzTruckRailDayPlanList")
@@ -814,11 +839,12 @@ public class AMScontroller{
     public Map<String, Object> getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSzTruckRailDayPlan(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getSzTruckRailDayPlan(mapValue, pageNum, pageSize, apiId, status);
     }
 
     //新增钢材发往异地库计划

+ 21 - 6
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -974,6 +974,18 @@ public interface AmsFeign {
     //删除日计划
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/deleteTruckRailDayPlan/{dayPlanId}")
     Map<String,Object> deleteTruckRailDayPlan(@PathVariable("dayPlanId") BigDecimal dayPlanId);
+    //通过计划Id查询修改数据
+    @PostMapping("/api/v1/ams/amstruckraildayplans/getDayPlanByDayPlanId/{dayplanId}")
+    Map<String,Object> getDayPlanByDayPlanId(@PathVariable("dayplanId") Integer dayplanId);
+
+    //修改日计划  2021年11月20日03:17:37
+    @PostMapping("/api/v1/ams/amstruckraildayplans/updateDayPlan")
+    public Map<String,Object> updateDayPlan(@RequestBody(required = false) Map<String, Object> map);
+
+    //查询所有承运商
+    @GetMapping("/api/v1/ams/amstruckraildayplans/getCarrierMes")
+    public  Map<String,Object> getCarrierMes();
+
     //修改日计划
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/updateTruckRailDayPlan")
     Map<String,Object> updateTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapVal);
@@ -984,9 +996,11 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getTruckRailDayPlanList")
     Map<String, Object> getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize,
-                                      @RequestParam Integer apiId);
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("status") Integer status
+    );
     //查询日计划
     @ApiOperation(value="展示水渣日计划")
     @ApiImplicitParams({
@@ -994,9 +1008,10 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getSzTruckRailDayPlanList")
     Map<String, Object> getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("status") Integer status);
 
     //新增钢材发往异地库日计划
     @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/addRailOffsetDayplan")