tijiao

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

@@ -1167,11 +1167,12 @@ public class AMScontroller{
                                                        String enableStatus,
                                                        String planStatus,
                                                      String startTime,
-                                                     String endTime) {
+                                                     String endTime,
+                                                     BigDecimal planId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus,startTime,endTime);
+        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus,startTime,endTime,planId);
     }
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping("/getDispatchSaleOrderList")

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

@@ -2250,7 +2250,6 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getInwardReportForAssemble(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
 
-
     @ApiOperation("保卫部随机抽查车牌号")
     @PostMapping("/getCapacityByDefend")
     public Map<String,Object> getCapacityByDefend(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -2333,4 +2332,21 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.getPersonByName(personName);
 
     }
+
+    @ApiOperation(value="获取内转报表")
+    @PostMapping("/getOutFactoryInwardList")
+    public Map<String, Object> getOutFactoryInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String startTime,
+                                                     String endTime,
+                                                     String orgCode,
+                                                     String isPage,
+                                                     String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getOutFactoryInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
 }

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

@@ -1532,7 +1532,8 @@ public interface AmsFeign {
                                               @RequestParam String enableStatus,
                                               @RequestParam String planStatus,
                                               @RequestParam String startTime,
-                                              @RequestParam String endTime);
+                                              @RequestParam String endTime,
+                                              @RequestParam BigDecimal planId);
 
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRealAddressByLike")
     Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index);

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

@@ -687,6 +687,17 @@ public interface TmsTruckFeign {
                                            @RequestParam("orgCode") String orgCode,
                                            @RequestParam("isPage") String isPage,
                                            @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getOutFactoryInwardList")
+    Map<String, Object> getOutFactoryInwardList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                                @RequestParam("apiId")Integer apiId,
+                                                @RequestParam("pageNum")Integer pageNum,
+                                                @RequestParam("pageSize")Integer pageSize,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime,
+                                                @RequestParam("orgCode")String orgCode,
+                                                @RequestParam("isPage")String isPage,
+                                                @RequestParam("index")String index);
 }