Merge branch 'master' into dev

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

@@ -1039,6 +1039,26 @@ public class AMScontroller{
         }
         return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId);
     }
+
+    @ApiModelProperty(value = "展示运输计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "0:257/1,2:258", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getPlanOrder")
+    public Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            Integer planId,
+                                            Integer requirementId,
+                                            Integer orderStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPlanOrder(mapValue, pageNum, pageSize, apiId,planId,requirementId,orderStatus);
+    }
     /**
      *用车单位提出需求
      *新增用车需求

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

@@ -36,5 +36,6 @@ public class DilVersionController {
     @PostMapping("/addAppVersion/{version}")
     public String addAppVersion(@PathVariable("version") String version) {
         return dilVersionService.addAppVersion(version);
+
     }
 }

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

@@ -2000,6 +2000,16 @@ public class TMSController extends BaseRESTfulController {
                                                           String endTime) {
         return tmsTruckFeign.getPurInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+    @ApiOperation(value="查询内转运输实绩")
+    @PostMapping("/getInwardReport")
+    public Map<String, Object> getInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime) {
+        return tmsTruckFeign.getInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
     @PostMapping("/sendMeasureCommission")
     public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
         return  tmsTruckFeign.sendMeasureCommission(map);
@@ -2010,4 +2020,28 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> sendLiuPiMeasureCommission(String capacityNumber){
         return tmsTruckFeign.sendLiuPiMeasureCommission(capacityNumber);
     }
+
+    @ApiOperation(value="对内转车辆装货点进行统计")
+    @PostMapping("/getLoading")
+    public Map<String, Object> getLoading(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String startTime,
+                                             String endTime
+    ){
+        return tmsTruckFeign.getLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+    @ApiOperation(value="对内转车辆装卸货点进行统计")
+    @PostMapping("/getUnLoading")
+    public Map<String, Object> getUnLoading(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String startTime,
+                                          String endTime
+    ){
+        return tmsTruckFeign.getUnLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
 }

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

@@ -30,7 +30,6 @@ public class WMSController extends BaseRESTfulController {
     WMSFeign wmsFeign;
     @Autowired
     QMSFeign qmsFeign;
-
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
@@ -1016,5 +1015,12 @@ public class WMSController extends BaseRESTfulController {
                                         String endTime) {
         return wmsFeign.getWmsOutboundResultStatistics(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con,startTime,endTime);
     }
+
+    //删除扫码吊牌
+    @PostMapping("/undoInbound")
+    @ApiOperation(value = "删除扫码吊牌")
+    public Map<String, Object> undoInbound(@RequestParam("inboundId") BigDecimal inboundId){
+        return wmsFeign.undoInbound(inboundId);
+    }
 }
 

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

@@ -1141,6 +1141,22 @@ public interface AmsFeign {
                                          @RequestParam Integer planStatus,
                                          @RequestParam String carrierId,
                                          @RequestParam Integer planId);
+
+    @ApiOperation(value="展示运输计划下的运输订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/getPlanOrder")
+    Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer planId,
+                                        @RequestParam Integer requirementId,
+                                         @RequestParam Integer orderStatus
+
+                                     );
+
     /**
      *新增用车需求
      */

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

@@ -436,6 +436,14 @@ public interface TmsTruckFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam String startTime,
                                            @RequestParam String endTime);
+//内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReport")
+    Map<String, Object> getInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
 
     @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
     Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
@@ -444,6 +452,27 @@ public interface TmsTruckFeign {
     //发送留皮计量委托
     @GetMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendLiuPiMeasureCommission")
     Map<String, Object> sendLiuPiMeasureCommission(@RequestParam("capacityNumber")String capacityNumber);
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoading")
+    Map<String, Object> getLoading(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer apiId,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam String startTime,
+                                   @RequestParam String endTime);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getUnLoading")
+    Map<String, Object> getUnLoading(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
     }
 
 
+
+
+
+

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

@@ -875,4 +875,6 @@ public interface WMSFeign {
                                  @RequestParam String startTime,
                                  @RequestParam String endTime);
 
+    @PostMapping("/api/v1/wms/inboundResult/undoInbound")
+    Map<String, Object> undoInbound(@RequestParam BigDecimal inboundId);
 }

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

@@ -545,9 +545,10 @@
 
 <!--  边输边查卸货点  -->
     <select id="selectUnloadingPoint" parameterType="string" resultType="java.util.Map">
-        select Rw.WAREHOUSE_NAME "warehouseName",
+        select RW.WAREHOUSE_NAME "warehouseName",
                RW.WAREHOUSE_ID "warehouseId"
         from RMS_WAREHOUSE RW
+        where RW.DELETED = 0
         order by "warehouseName"
     </select>