合并冲突

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

@@ -1004,7 +1004,7 @@ public class AMScontroller{
                                                 Integer pageSize,
                                                 Integer apiId,
                                                 Integer planStatus,
-                                                Integer carrierId,
+                                                String carrierId,
                                                 Integer planId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
@@ -1085,8 +1085,8 @@ public class AMScontroller{
 
     @ApiOperation(value="抢单/接收订单锁定")
     @PostMapping("/lockDispatchSaleOrder")
-    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,Integer carrierId) {
-        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierId);
+    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,String carrierSsoId) {
+        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierSsoId);
     }
 
     @ApiOperation(value="查询app端承运商已抢到的单")
@@ -1101,8 +1101,8 @@ public class AMScontroller{
                                                            Integer apiId,
                                                            Integer pageNum,
                                                            Integer pageSize,
-                                                           Integer carrierId){
-        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierId);
+                                                           String carrierSsoId){
+        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierSsoId);
     }
 
     //获取到站名称
@@ -1138,8 +1138,9 @@ public class AMScontroller{
                                                       Integer pageSize,
                                                       Integer apiId,
                                                       Integer dispatchType,
+                                                      @RequestParam String carrierSsoId,
                                                       String con) {
-        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType, con);
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId, con);
     }
 
     @ApiModelProperty(value = "展示批次信息")
@@ -1377,6 +1378,24 @@ public class AMScontroller{
         return amsFeign.issueTruckNo(mapList);
     }
 
+    @ApiOperation(value = "展示车序号下的物资详情")
+    @PostMapping("/getTruckNoMaterialList")
+    public RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId) {
+        return amsFeign.getTruckNoMaterialList(saleOrderMaterialId);
+    }
+
+    @ApiOperation(value = "展示销售订单下的物资详情")
+    @PostMapping("/getSaleMaterialList")
+    public RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId) {
+        return amsFeign.getSaleMaterialList(saleOrderId);
+    }
+
+    @ApiOperation(value = "展示销售派单物资信息")
+    @PostMapping("/getDispatchMaterialList")
+    public RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId) {
+        return amsFeign.getDispatchMaterialList(dispatchId);
+    }
+
     @ApiOperation(value="销售新增定向派单且直接下发")
     @PostMapping("/addDispatchSaleOrder")
     public Map<String,Object> addDispatchSaleOrder(@RequestBody Map<String,Object> mapValue) {

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

@@ -155,8 +155,7 @@ public class OMSController {
                                                Integer pageSize,
                                                @PathVariable Integer orderReceiveStatus,
                                                Integer orderType,
-                                               Integer orderStatus,
-                                                     String con
+                                               Integer orderStatus, String con
     ){
         return omsFeign.getReceiveRefuseOrder(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum,
                 pageSize, orderReceiveStatus, orderType, orderStatus, con);
@@ -291,10 +290,10 @@ public class OMSController {
                                             Integer orderType,
                                             Integer orderStatus,
                                             String con,
-                                            Integer carrierId
+                                            @RequestParam String carrierSsoId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierSsoId);
     }
 
 
@@ -516,11 +515,12 @@ public class OMSController {
                                                         Integer apiId,
                                                         Integer pageNum,
                                                         Integer pageSize,
-                                                        String con) {
+                                                        String con,
+                                                        String carrierId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con);
+        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con,carrierId);
         return map;
     }
 
@@ -562,7 +562,7 @@ public class OMSController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer orderStatus,
-                                                  Integer carrierId,
+                                                  String carrierId,
                                                   String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
@@ -662,4 +662,10 @@ public class OMSController {
         Map<String, Object> map = omsFeign.addSaleTruckOrder(mapValue);
         return map;
     }
+
+    @ApiOperation(value = "通过运单下的物资信息")
+    @PostMapping("/getOrderMaterialList")
+    public RESTfulResult getOrderMaterialList(@RequestParam Integer orderId) {
+        return omsFeign.getOrderMaterialList(orderId);
+    }
 }

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

@@ -987,6 +987,41 @@ public class RMScontroller {
         return rmsFeign.upLoadPhoto(file);
     }
 
+    /**
+     * 得到二级部门的下拉
+     * @return
+     */
+    @GetMapping("/getSecondShipper")
+    public Map<String,Object> getSecondShipper() {
+        return  rmsFeign.getSecondShipper();
+    }
+
+    /**
+     * 得到三级部门的下拉
+     * @return
+     */
+    @GetMapping("/getThirdShipper")
+    public Map<String,Object> getThirdShipper(@RequestParam Integer shipperId) {
+        return  rmsFeign.getThirdShipper(shipperId);
+    }
+
+    /**
+     * 新增人员权限
+     * @return
+     */
+    @PostMapping("/addPersonnel")
+    public Map<String,Object> addPersonnel(@RequestBody Map<String,Object> map) {
+        return  rmsFeign.addPersonnel(map);
+    }
+
+    /**
+     * 查询SSO主键和机构编码
+     * @return
+     */
+    @PostMapping("/getShipperMap")
+    public Map<String,Object> getShipperMap(@RequestParam Integer shipperId) {
+        return  rmsFeign.getShipperMap(shipperId);
+    }
     //根据运力id查询承运商
     @PostMapping(value = "getCarrierNameById/{id}")
     public Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id){
@@ -1020,5 +1055,4 @@ public class RMScontroller {
     public Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.deleteShipperResult(map);
     }
-
 }

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

@@ -1685,6 +1685,21 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.selectCountList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
     }
 
+    //采购内转待装车实绩
+    @ApiOperation(value = "查询待装车运单列表")
+    @PostMapping("/cgNzLoadingResult")
+    public Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               Integer orderStatus
+    ) {
+        return tmsTruckFeign.cgNzLoadingResult(mapVal==null?new HashMap<>():mapVal, apiId, pageNum, pageSize,orderType,orderStatus);
+    }
+
+
+
     /**
      * 内转物流卸货装车实绩
      *

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

@@ -122,20 +122,21 @@ public class UniversalController extends BaseRESTfulController {
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
-                                        String carrierSSOId,
+                                        String carrierSsoId,
                                         String index
     ){
         if(mapValue == null){
             mapValue = new HashMap<>();
         }
         if(index != null){
-            mapValue.put("index", index + "%");
+            mapValue.put("index", "%" + index + "%");
         }
-        if(carrierSSOId != null){
-            if(!"null".equals(carrierSSOId)){
-                mapValue.put("carrierSSOId", carrierSSOId);
+        if(carrierSsoId != null){
+            if(!"null".equals(carrierSsoId)){
+                mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
+
         //不分页筛选数据
         List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -306,7 +307,8 @@ public class UniversalController extends BaseRESTfulController {
             if(index.length() == 0){
                 index = null;
             }else {
-                index += "%";
+//                index += "%";
+                index = "%"+index+"%";
             }
         }
         List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index);
@@ -413,4 +415,36 @@ public class UniversalController extends BaseRESTfulController {
     public List<Map<String,Object>> getAllGatepost(){
         return universalMapper.getAllGatepost();
     }
+
+    @ApiModelProperty(value = "模糊查询收货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "418", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getConsigneeListByLike")
+    public RESTfulResult getConsigneeListByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index = "%" + index + "%";
+            }
+        }
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("index",index);
+        List<Map<String, Object>> list = universalMapper.getConsigneeListByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getConsigneeListByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
 }

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

@@ -596,7 +596,7 @@ public interface AmsFeign {
                                                    @RequestParam("apiId") Integer apiId,
                                                    @RequestParam("pageNum") Integer pageNum,
                                                    @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("carrierId") Integer carrierId);
+                                                   @RequestParam("carrierSsoId") String carrierSsoId);
 
     /**
      * 新增销售订单物资信息
@@ -1107,7 +1107,7 @@ public interface AmsFeign {
                                          @RequestParam Integer pageSize,
                                          @RequestParam Integer apiId,
                                          @RequestParam Integer planStatus,
-                                         @RequestParam Integer carrierId,
+                                         @RequestParam String carrierId,
                                          @RequestParam Integer planId);
     /**
      *新增用车需求
@@ -1151,7 +1151,7 @@ public interface AmsFeign {
     @ApiOperation(value="抢单/接收订单锁定")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrder")
     Map<String, Object> lockDispatchSaleOrder(@RequestParam Integer dispatchId,
-                                              @RequestParam Integer carrierId);
+                                              @RequestParam String carrierSsoId);
 
     @ApiOperation(value="查询app端承运商已抢到的单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
@@ -1170,6 +1170,7 @@ public interface AmsFeign {
                                                       @RequestParam Integer pageSize,
                                                       @RequestParam Integer apiId,
                                                       @RequestParam Integer dispatchType,
+                                                      @RequestParam String carrierSsoId,
                                                       @RequestParam String con) ;
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getPurchaseIdByBatch")
@@ -1192,7 +1193,7 @@ public interface AmsFeign {
 
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getWareHouse")
-    Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
+    Map<String, Object>getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
                                      @RequestParam Integer apiId,
@@ -1406,4 +1407,12 @@ public interface AmsFeign {
     @GetMapping(value = "api/v1/ams/dilnotices/getNoticeTypeId")
     Map<String,Object> getNoticeTypeId();
 
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/getTruckNoMaterialList")
+    RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/getSaleMaterialList")
+    RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "api/v1/ams/amsdispatchsaleorders/getDispatchMaterialList")
+    RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId);
 }

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

@@ -127,11 +127,10 @@ public interface OmsFeign {
                                             @RequestParam("apiId")      Integer apiId,
                                             @RequestParam("pageNum")    Integer pageNum,
                                             @RequestParam("pageSize")   Integer pageSize,
-
                                             @RequestParam("orderType")  Integer orderType,
                                             @RequestParam("orderStatus")Integer orderStatus,
                                             @RequestParam("con")        String con,
-                                            @RequestParam("carrierId")  Integer carrierId
+                                            @RequestParam("carrierSsoId")  String carrierSsoId
     );
 
     /**
@@ -286,7 +285,8 @@ public interface OmsFeign {
                                                  @RequestParam Integer apiId,
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
-                                                 @RequestParam String con);
+                                                 @RequestParam String con,
+                                                 @RequestParam String carrierId);
 
     @GetMapping("api/v1/oms/omstruckorders/getReceivingUnit")
     public Map<String, Object> getReceivingUnit();
@@ -309,7 +309,7 @@ public interface OmsFeign {
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer orderStatus,
-                                           @RequestParam Integer carrierId,
+                                           @RequestParam String carrierId,
                                            @RequestParam String con);
 
     // 分派计划
@@ -377,5 +377,9 @@ public interface OmsFeign {
     @ApiOperation(value = "根据运输订单号查询物资")
     @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderMaterial")
     Map<String, Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String, Object> map);
+
+    @ApiOperation(value = "根据运输订单id查询物资")
+    @PostMapping("api/v1/oms/omstruckorders/getOrderMaterialList")
+    RESTfulResult getOrderMaterialList(@RequestParam Integer orderId);
 }
 

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

@@ -536,6 +536,21 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscardriver/upload")
     Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file);
 
+    // 得到二级部门的下拉
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getSecondShipper")
+    Map<String, Object> getSecondShipper();
+
+    // 得到三级部门的下拉
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getThirdShipper")
+    Map<String, Object> getThirdShipper(@RequestParam Integer shipperId);
+
+    // 新增人员权限
+    @PostMapping(value = "api/v1/rms/rmspersonnel/addPersonnel")
+    Map<String, Object> addPersonnel(@RequestBody Map<String, Object> map);
+
+    // 查询SSO主键和机构编码
+    @PostMapping(value = "api/v1/rms/rmspersonnel/getShipperMap")
+    Map<String, Object> getShipperMap(@RequestParam Integer shipperId);
     //根据运力id查询承运商名称
     @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierNameById/{id}")
     Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id);

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

@@ -346,6 +346,14 @@ public interface TmsTruckFeign {
                                       @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("orderType") Integer orderType
     );
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/cgNzLoadingResult")
+    Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapval,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer orderType,
+                                          @RequestParam Integer orderStatus);
 }
 
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -59,9 +59,16 @@ public interface UniversalMapper {
     // 所有承运商
     List<Map<String, Object>> getCarrierListByLike(Map<String, Object> mapValue);
 
-    //边输边查卸货点
+    //查卸货点
     List<Map<String, Object>> selectUnloadingPoint();
 
     // 查询所有门岗
     List<Map<String, Object>> getAllGatepost();
+
+    // 模糊查询收货单位
+    List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
+
+    // 通过ssoId查询承运商id
+    BigDecimal getCarrierIdBySSO(String carrierSsoId);
+
 }

src/main/resources/bootstrap.yml

@@ -21,11 +21,8 @@ eureka:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-
-
 openfeign:
 #  正式环境
-
     ColumnDataFeign:
       url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     AmsFeign:
@@ -51,8 +48,7 @@ openfeign:
     OMSFeign:
       url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
-      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
-
+      url: ${RMSFEIGN_URL:172.16.33.166:8060}
   #测试环境
 #  ColumnDataFeign:
 #    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}

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

@@ -155,14 +155,21 @@
                                 ON RCA.CARRIER_ID = RC.CARRIER_ID
                  WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1
                    <if test="index != null">
-                       and RCA.CARRIER_NAME LIKE #{index}
+                       and RC.CAPACITY_NUMBER LIKE #{index}
                    </if>
-                   <if test="carrierSSOId != null">
-                       and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+                   <if test="carrierSsoId != null">
+                       and RCA.CARRIER_SSO_ID = #{carrierSsoId}
                    </if>
              )
     </select>
 
+    <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >
+        SELECT
+            RC.CARRIER_ID AS "carrierId"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
+
 <!--    通过订单ID查询物资子表信息  -->
     <select id="getMaterialMesByOrderId" parameterType="int" resultType="java.util.Map">
         select *
@@ -493,4 +500,17 @@
             RG.GATEPOST_NAME AS "gatepostName"
         FROM RMS_GATEPOST RG
     </select>
+
+    <!-- 模糊查询收货单位 -->
+    <select id="getConsigneeListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT
+        RC.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName"
+        FROM RMS_CONSIGNEE RC
+        WHERE
+        <if test="index != null">
+            RC.CONSIGNEE_COMPANY_NAME like #{index}
+        </if>
+        order by "consigneeCompanyName"
+    </select>
+
 </mapper>