合并冲突

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

@@ -1227,8 +1227,10 @@ public class AMScontroller{
                                                String con,
                                                Integer dispatchStatus,
                                                Integer sporadicStatus,
-                                               String carrierSsoId) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId);
+                                               String carrierSsoId,
+                                               String userId,
+                                               String userIds) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId,userIds);
     }
 
     @ApiModelProperty(value = "查看物资详情")
@@ -1253,12 +1255,28 @@ public class AMScontroller{
         return amsFeign.deleteSporadicOrders(sporadicOrderId);
     }
 
+
+
+
     @ApiOperation(value="下发零星物资订单")
     @PostMapping("/issueSporadicOrders")
     public Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList) {
         return amsFeign.issueSporadicOrders(mapList);
     }
 
+    @ApiOperation(value="停止零星订单一车多趟")
+    @PostMapping("/closeSporadicOrder")
+    public Map<String, Object> closeSporadicOrder(@RequestBody Map<String, Object> map) {
+        return amsFeign.closeSporadicOrder(map);
+    }
+
+
+    @ApiOperation(value="内转零星物流添加运输计划")
+    @PostMapping("/addInwardSporadicOrder")
+    public Map<String, Object> addInwardSporadicOrder(@RequestBody Map<String, Object> map) {
+        return amsFeign.addInwardSporadicOrder(map);
+    }
+
     @ApiOperation(value="新增零星物资进出厂（以及销售钢材退货）")
     @PostMapping("/addSporadicOrders")
     public Map<String, Object> addSporadicOrders(@RequestBody Map<String,Object> mapValue) {

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

@@ -139,7 +139,11 @@ public class OMSController {
     public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map) {
         return omsFeign.driverReceiveOrRefuse(map);
     }
-
+    @ApiOperation(value="撤销订单")
+    @PostMapping("/undoOrder")
+    public Map<String, Object> undoOrder(@RequestBody Map<String,Object> map) {
+        return omsFeign.undoOrder(map);
+    }
 
     @ApiOperation(value="司机接单信息")
     @ApiImplicitParams({
@@ -646,8 +650,11 @@ public class OMSController {
                                                  Integer type,
                                                  Integer orderStatus,
                                                  String carrierId,
-                                                 String  con) {
-        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con);
+                                                 String  con,
+                                                 String userId,
+                                                 String usersId,
+                                                       Integer type1) {
+        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con,userId,usersId,type1);
     }
 
     @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")

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

@@ -1061,4 +1061,9 @@ public class RMScontroller {
         return rmsFeign.getConsigneeFarId(state);
     }
 
+    @PostMapping("/isInHere")
+    public Integer isInHere(@RequestParam String personnelJobNumber) {
+        return rmsFeign.isInHere(personnelJobNumber);
+    }
+
 }

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

@@ -1165,8 +1165,11 @@ public class TMSController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer status,
-                                          Integer orderType, String con){
-        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con);
+                                          Integer orderType,
+                                          String con,
+                                          String userId,
+                                          String userIds){
+        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con,userId,userIds);
     }
 
     @ApiOperation(value = "新增采购汽车装车实绩")
@@ -1239,9 +1242,11 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer orderType,
-                                               String con
+                                               String con,
+                                               String userId,
+                                               String userIds
     ){
-        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
     }
 
     @ApiOperation(value="通过运输订单id查询物资信息")
@@ -1301,11 +1306,14 @@ public class TMSController extends BaseRESTfulController {
     })
     @PostMapping("/getAllJiMaoResult")
     public Map<String, Object> getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                                 Integer orderType,String con){
-        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer orderType,
+                                                 String con,
+                                                 String userId,
+                                                 String userIds){
+        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
     }
 
     @ApiOperation(value = "查询计皮实绩")
@@ -1318,12 +1326,14 @@ public class TMSController extends BaseRESTfulController {
     })
     @PostMapping("/getAllJiPiResult")
     public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderType,
-                                                String con) {
-        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderType,
+                                                String con,
+                                                String userId,
+                                                String userIds) {
+        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
     }
 
 
@@ -1357,13 +1367,15 @@ public class TMSController extends BaseRESTfulController {
     })
     @PostMapping("/getUnloadResult")
     public Map<String, Object> getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         Integer apiId,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer orderType,
-                                               String con
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               String con,
+                                               String userId,
+                                               String userIds
     ){
-        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
     }
 
     @ApiOperation(value = "添加卸货实绩")
@@ -1421,9 +1433,13 @@ public class TMSController extends BaseRESTfulController {
                                                      Integer apiId,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer orderType,String con, String carrierSsoId
+                                                     Integer orderType,
+                                                     String con,
+                                                     String carrierSsoId,
+                                                     String userId,
+                                                     String userIds
     ){
-        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con, carrierSsoId);
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con, carrierSsoId,userId,userIds);
     }
 
 
@@ -1947,17 +1963,28 @@ public class TMSController extends BaseRESTfulController {
                                                 Integer pageNum,
                                                 Integer pageSize,
                                                 String startTime, String endTime,
-                                                String carrierSsoId
+                                                String carrierSsoId,
+                                               String userId,
+                                               String userIds,
+                                               String con,
+                                               Integer orderType
     ){
-        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
+        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
     }
     @ApiOperation(value="查询零星物资出厂统计报表")
     @PostMapping("/getSporadicSuppliesReport2")
     public Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize, String startTime, String endTime, String carrierSsoId
+                                                          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,startTime,endTime, carrierSsoId);
+        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

@@ -1248,7 +1248,9 @@ public interface AmsFeign {
                                               @RequestParam String con,
                                               @RequestParam Integer dispatchStatus,
                                               @RequestParam Integer sporadicStatus,
-                                              @RequestParam String carrierSsoId);
+                                              @RequestParam String carrierSsoId,
+                                              @RequestParam String userId,
+                                              @RequestParam String userIds);
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
     RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1264,6 +1266,14 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amstrucksporadicorders/issueSporadicOrders")
     Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList);
 
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/closeSporadicOrder")
+    Map<String, Object> closeSporadicOrder(@RequestBody Map<String, Object> map);
+
+
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/addInwardSporadicOrder")
+    Map<String, Object> addInwardSporadicOrder(@RequestBody Map<String, Object> map);
+
     @PostMapping("/api/v1/ams/amstrucksporadicorders/addSporadicOrders")
     Map<String, Object> addSporadicOrders(@RequestBody Map<String, Object> mapValue);
 

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

@@ -63,6 +63,11 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorders/driverReceiveOrRefuse")
     public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/oms/omstruckorders/undoOrder")
+    Map<String, Object> undoOrder(@RequestBody Map<String, Object> map);
+
+
+
     @PostMapping("api/v1/oms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
     public Map<String, Object> getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
                                                @RequestParam("apiId") Integer apiId,
@@ -363,7 +368,10 @@ public interface OmsFeign {
                                                        @RequestParam("orderStatus") Integer orderStatus,
                                                        @RequestParam("carrierId") String carrierId,
                                                        @RequestParam("type") Integer type,
-                                                       @RequestParam("con") String con
+                                                       @RequestParam("con") String con,
+                                                       @RequestParam("userId") String userId,
+                                                       @RequestParam("usersId") String usersId,
+                                                       @RequestParam("type1")Integer type1
                                                        );
 
     @ApiOperation(value = "根据运输订单id修改运力id")

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

@@ -575,4 +575,8 @@ public interface RmsFeign {
     @ApiOperation(value = "边输边查收货客户父节点")
     @PostMapping(value = "api/v1/rms/rmsconsignee/getConsigneeFarId")
     Map<String, Object> getConsigneeFarId(@RequestParam("state") String state);
+
+    @ApiOperation(value = "边输边查收货客户父节点")
+    @PostMapping(value = "api/v1/rms/rmspersonnel/isInHere")
+    Integer isInHere(@RequestParam String personnelJobNumber);
 }

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

@@ -51,7 +51,10 @@ public interface TmsTruckFeign {
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("status") Integer status ,
                                           @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con") String con);
+                                          @RequestParam("con")   String con,
+                                          @RequestParam("userId") String userId,
+                                          @RequestParam("userIds") String userIds
+    );
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadResultForConverted")
     public Map<String,Object> selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -96,11 +99,13 @@ public interface TmsTruckFeign {
     })
     @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getAllEnFactoryResult")
     public Map<String, Object> getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType")Integer orderType,
-                                               @RequestParam("con")      String con
+                                                     @RequestParam("apiId")     Integer apiId,
+                                                     @RequestParam("pageNum")   Integer pageNum,
+                                                     @RequestParam("pageSize")  Integer pageSize,
+                                                     @RequestParam("orderType") Integer orderType,
+                                                     @RequestParam("con")       String con,
+                                                     @RequestParam("userId")    String userId,
+                                                     @RequestParam("userIds")   String userIds
     );
     @GetMapping("api/v1/truckTms/tmstruckenfactoryresults/getMaterial")
     public Map<String , Object> getMaterial(@RequestParam("orderId")  Integer orderId);
@@ -127,20 +132,24 @@ public interface TmsTruckFeign {
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiMaoResult")
     public Map<String, Object> getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("apiId") Integer apiId,
+                                                 @RequestParam("pageNum") Integer pageNum,
+                                                 @RequestParam("pageSize") Integer pageSize,
                                                  @RequestParam("orderType") Integer orderType,
-                                                 @RequestParam("con")     String con
+                                                 @RequestParam("con")     String con,
+                                                 @RequestParam("userId")  String userId,
+                                                 @RequestParam("userIds") String userIds
                                                  );
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
     public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize,
                                                 @RequestParam("orderType") Integer orderType,
-                                                @RequestParam("con") String con);
+                                                @RequestParam("con") String con,
+                                                @RequestParam("userId")String userId,
+                                                @RequestParam("userIds")String userIds);
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
     public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
@@ -155,11 +164,13 @@ public interface TmsTruckFeign {
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/getUnloadResult")
     public Map<String, Object> getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam("apiId") Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("orderType") Integer orderType,
-                                         @RequestParam("con")      String con
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("orderType") Integer orderType,
+                                               @RequestParam("con")      String con,
+                                               @RequestParam("userId") String userId,
+                                               @RequestParam("userIds") String userIds
     );
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
@@ -193,7 +204,9 @@ public interface TmsTruckFeign {
                                                @RequestParam("pageSize") Integer pageSize,
                                                @RequestParam("orderType") Integer orderType,
                                                @RequestParam("con") String con,
-                                               @RequestParam("carrierSsoId")String carrierSsoId
+                                               @RequestParam("carrierSsoId")String carrierSsoId,
+                                               @RequestParam("userId") String userId,
+                                               @RequestParam("userIds") String userIds
     );
 
     @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
@@ -369,21 +382,29 @@ public interface TmsTruckFeign {
     );
     @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("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
                                                    @RequestParam("startTime") String startTime,
-                                                   @RequestParam("endTime")   String endTime,
-                                         @RequestParam("carrierSsoId")   String carrierSsoId
+                                                   @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("startTime") String startTime,
-                                         @RequestParam("endTime")   String endTime,
-                                         @RequestParam("carrierSsoId")   String carrierSsoId
+                                                   @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
     );
 }
 

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

@@ -148,7 +148,8 @@
                  SELECT
                         RC.CAPACITY_ID        "capacityId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
-                        RCA.CARRIER_NAME       "carrierName"
+                        RCA.CARRIER_NAME       "carrierName",
+                        RC.INSERT_UPDATE_REMARK "remark"
                  FROM RMS_CAPACITY RC
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RC.CARRIER_ID