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

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

@@ -1506,8 +1506,27 @@ public class AMScontroller{
         return amsFeign.dispatchTruckOrderBySale(mapValue);
     }
 
+    @ApiOperation(value="展示销售焦炭订单")
+    @PostMapping("/getCokeSaleOrderList")
+    public RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         String con) {
+        return amsFeign.getCokeSaleOrderList(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con);
+    }
 
+    @ApiOperation(value="承运商直接选择车牌号派发运输订单")
+    @PostMapping("/dispatchTruckOrderByCarrier")
+    public Map<String,Object> dispatchTruckOrderByCarrier(@RequestBody Map<String,Object> mapValue){
+        return amsFeign.dispatchTruckOrderByCarrier(mapValue);
+    }
 
+    @ApiOperation(value="关闭销售订单")
+    @PostMapping("closeSaleOrder")
+    public Map<String,Object> closeSaleOrder(@RequestParam Integer saleOrderId){
+        return amsFeign.closeSaleOrder(saleOrderId);
+    }
 
 
     @ApiOperation(value="新增公告信息", notes="根据DilNotice对象创建")
@@ -1557,4 +1576,10 @@ public class AMScontroller{
     public Map<String,Object> getNoticeTypeId(){
         return amsFeign.getNoticeTypeId();
     }
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping("/lockDispatchSaleOrderList")
+    public Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.lockDispatchSaleOrderList(mapValue);
+    }
 }

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

@@ -1940,32 +1940,36 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
+                                             String startTime, String endTime,
                                                Integer orderType
     ){
-        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType);
+        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
     }
     @ApiOperation(value="查询辅料燃料统计报表")
     @PostMapping("/getAllSaleReport")
     public Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize, String carrierSsoId
+                                          Integer pageSize,
+                                          String startTime, String endTime,
+                                          String carrierSsoId
     ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
     }
     @ApiOperation(value="查询零星物资进厂统计报表")
     @PostMapping("/getSporadicSuppliesReport1")
     public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                          Integer apiId,
-                                                          Integer pageNum,
-                                                          Integer pageSize,
-                                                          String carrierSsoId,
-                                                          String userId,
-                                                          String userIds,
-                                                          String con,
-                                                          Integer orderType
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                String startTime, String endTime,
+                                                String carrierSsoId,
+                                               String userId,
+                                               String userIds,
+                                               String con,
+                                               Integer orderType
     ){
-        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId,userId,userIds,con,orderType);
+        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
     }
     @ApiOperation(value="查询零星物资出厂统计报表")
     @PostMapping("/getSporadicSuppliesReport2")
@@ -1973,12 +1977,14 @@ public class TMSController extends BaseRESTfulController {
                                                           Integer apiId,
                                                           Integer pageNum,
                                                           Integer pageSize,
+                                                          String startTime,
+                                                          String endTime,
                                                           String carrierSsoId,
                                                           String userId,
                                                           String userIds,
                                                           String con,
                                                           Integer orderType
     ){
-        return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId,userId,userIds,con,orderType);
+        return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
     }
 }

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

@@ -1435,4 +1435,20 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchTruckOrderBySale")
     Map<String, Object> dispatchTruckOrderBySale(Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/ams/amssaleorders/getCokeSaleOrderList")
+    RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchTruckOrderByCarrier")
+    Map<String, Object> dispatchTruckOrderByCarrier(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/closeSaleOrder")
+    Map<String, Object> closeSaleOrder(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrderList")
+    Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String, Object> mapValue);
 }

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

@@ -358,6 +358,8 @@ public interface TmsTruckFeign {
                                       @RequestParam("apiId") Integer apiId,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("startTime") String startTime,
+                                      @RequestParam("endTime")   String endTime,
                                       @RequestParam("orderType") Integer orderType
     );
 
@@ -374,29 +376,35 @@ public interface TmsTruckFeign {
                                       @RequestParam("apiId") Integer apiId,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
                                       @RequestParam("carrierSsoId")   String carrierSsoId
     );
     @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport1")
     Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam("apiId") Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("carrierSsoId")   String carrierSsoId,
-                                         @RequestParam("userId")String userId,
-                                         @RequestParam("userIds")String userIds,
-                                         @RequestParam("con")String con,
-                                                   @RequestParam("orderType")Integer orderType
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("startTime") String startTime,
+                                                   @RequestParam("endTime") String endTime,
+                                                   @RequestParam("carrierSsoId") String carrierSsoId,
+                                                   @RequestParam("userId") String userId,
+                                                   @RequestParam("userIds") String userIds,
+                                                   @RequestParam("con") String con,
+                                                   @RequestParam("orderType") Integer orderType
     );
     @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport2")
     Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
                                                    @RequestParam("apiId") Integer apiId,
                                                    @RequestParam("pageNum") Integer pageNum,
                                                    @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("carrierSsoId")   String carrierSsoId,
-                                                   @RequestParam("userId")String userId,
-                                                   @RequestParam("userIds")String userIds,
-                                                   @RequestParam("con")String con,
-                                                   @RequestParam("orderType")Integer orderType
+                                                   @RequestParam("startTime") String startTime,
+                                                   @RequestParam("endTime") String endTime,
+                                                   @RequestParam("carrierSsoId") String carrierSsoId,
+                                                   @RequestParam("userId") String userId,
+                                                   @RequestParam("userIds") String userIds,
+                                                   @RequestParam("con") String con,
+                                                   @RequestParam("orderType") Integer orderType
     );
 }