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

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

@@ -286,6 +286,39 @@ public class OMSController {
                                                     ) {
         return omsFeign.selectAllOrderForSale(mapValue==null?new HashMap<>():mapValue, carrierId, apiId, pageNum, pageSize, orderType, orderStatus, saleOrderMaterialId, con);
     }
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     *
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/getTransportOrder")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getTransportOrder( @RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                   Integer orderId,
+                                                  Integer orderStatus
+    ) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return omsFeign.getTransportOrder(mapValue,apiId,pageNum,pageSize,orderId,orderStatus);
+    }
+
+
+
+
+
+
+
+
     /**
      * 销售物流：司机接单pc端
      */
@@ -299,15 +332,20 @@ public class OMSController {
     })
     @PostMapping("/getDriverInfoForSale")
     public Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer orderStatus,
-                                            String con,
-                                            @RequestParam Integer saleOrderId
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer orderType,
+                                                   Integer orderStatus,
+                                                   String con,
+                                                   String carrierSsoId,
+                                                   Integer shipperId
+
     )
+
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderStatus, con,saleOrderId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderType,orderStatus,con,carrierSsoId,shipperId);
+
     }
     @PostMapping("/getDriverInfoForSale1")
     public Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,

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

@@ -1106,4 +1106,10 @@ public class RMScontroller {
     public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map){
         return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());
     }
+
+    @ApiOperation("渲染运力修改数据")
+    @PostMapping("/getCapacityInfoById/{id}")
+    public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id){
+        return rmsFeign.getCapacityInfoById(id);
+    }
 }

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

@@ -152,7 +152,8 @@ public class UniversalController extends BaseRESTfulController {
                                         Integer pageSize,
                                         String carrierSsoId,
                                         String index,
-                                        String con
+                                        String con,
+                                        String indexText
     ){
         if(mapValue == null){
             mapValue = new HashMap<>();
@@ -163,6 +164,10 @@ public class UniversalController extends BaseRESTfulController {
         if (con != null&& !con.equals("undefined")){
             mapValue.put("con",con);
         }
+        if (indexText != null&& !indexText.equals("undefined")){
+            mapValue.put("indexText",indexText);
+        }
+
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;
         }

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

@@ -131,12 +131,15 @@ public interface OmsFeign {
      */
     @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale")
     Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            @RequestParam("apiId")      Integer apiId,
-                                            @RequestParam("pageNum")    Integer pageNum,
-                                            @RequestParam("pageSize")   Integer pageSize,
-                                            @RequestParam("orderStatus")Integer orderStatus,
-                                            @RequestParam("con")        String con,
-                                            @RequestParam("saleOrderId") Integer saleOrderId
+                                            @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("carrierSsoId") String carrierSsoId,
+                                            @RequestParam("shipperId") Integer shipperId
+
     );
 
 
@@ -494,5 +497,13 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckmatetialorders/updateMaterialMes")
     public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map);
 
+
+    @PostMapping("api/v1/oms/omstruckorders/getTransportOrder")
+    Map<String, Object> getTransportOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderId") Integer orderId,
+                                          @RequestParam("orderStatus") Integer orderStatus);
 }
 

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

@@ -605,4 +605,7 @@ public interface RmsFeign {
     @ApiOperation("解除承运商和车辆的绑定关系")
     @PostMapping("api/v1/rms/rmscapacity/deleteCapacityCarrier")
     public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscapacity/getCapacityInfoById/{id}")
+    Map<String,Object> getCapacityInfoById(@PathVariable("id") Integer id);
 }

src/main/resources/application-dev.yml

@@ -32,7 +32,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign:

src/main/resources/application-prod.yml

@@ -23,7 +23,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:

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

@@ -149,18 +149,18 @@
     <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
         SELECT *
         FROM (
-                 SELECT
-                        RC.CAPACITY_ID        "capacityId",
-                        RCC.CARRIER_ID         "carrierId",
-                        RC.CAPACITY_NUMBER     "capacityNumber",
-                        RCA.CARRIER_NAME       "carrierName",
-                        RC.INSERT_UPDATE_REMARK "remark"
-                 FROM RMS_CAPACITY_CARRIER RCC
-                            LEFT JOIN RMS_CAPACITY RC
-                     ON RCC.CAPACITY_ID = RC.CAPACITY_ID
-                          JOIN RMS_CARRIER RCA
-                                ON RCA.CARRIER_ID = RCC.CARRIER_ID
-                 WHERE RC.CAPACITY_SSO_ID is not NULL
+        SELECT
+        RC.CAPACITY_ID "capacityId",
+        RCC.CARRIER_ID "carrierId",
+        RCC.CAPACITY_CARRIER_ID,
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RCA.CARRIER_NAME "carrierName",
+        RCC.INSERT_UPDATE_REMARK "remark"
+        FROM
+        RMS_CAPACITY_CARRIER RCC
+        LEFT JOIN RMS_CAPACITY RC ON RCC.CAPACITY_ID = RC.CAPACITY_ID
+        JOIN RMS_CARRIER RCA ON RCA.CARRIER_ID = RCC.CARRIER_ID
+        WHERE RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
                 and RCC.CARRIER_ID = #{carrierId}
             </if>
@@ -168,7 +168,10 @@
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0 or  instr(RC.INSERT_UPDATE_REMARK, #{index})>0)
             </if>
             <if test="con != null">
-                and instr(RC.INSERT_UPDATE_REMARK, #{con}) > 0
+                and instr(RCA.INSERT_UPDATE_REMARK, #{con}) > 0
+            </if>
+            <if test="indexText!=null">
+                and instr(RCC.CAPACITY_USER_DEP, #{indexText}) > 0
             </if>
         )
         <where>