'销售运输订单master'

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

@@ -290,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);
     }
 
 
@@ -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/UniversalController.java

@@ -122,6 +122,7 @@ public class UniversalController extends BaseRESTfulController {
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
+                                        String carrierSsoId,
                                         String index
     ){
         if(mapValue == null){
@@ -130,6 +131,8 @@ public class UniversalController extends BaseRESTfulController {
         if(index != null){
             mapValue.put("index", index + "%");
         }
+        BigDecimal carrierId = universalMapper.getCarrierIdBySSO(carrierSsoId);
+        mapValue.put("carrierId",carrierId);
         //不分页筛选数据
         List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -442,4 +445,5 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+
 }

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

@@ -125,11 +125,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
     );
 
     /**
@@ -376,5 +375,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/mapper/UniversalMapper.java

@@ -64,4 +64,8 @@ public interface UniversalMapper {
 
     // 模糊查询收货单位
     List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
+
+    // 通过ssoId查询承运商id
+    BigDecimal getCarrierIdBySSO(String carrierSsoId);
+    
 }

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

@@ -156,9 +156,19 @@
                    <if test="index != null">
                        and RCA.CARRIER_NAME LIKE #{index}
                    </if>
+            <if test="carrierId != null" >
+                and RC.CARRIER_ID = #{carrierId}
+            </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 *
@@ -501,4 +511,5 @@
         </if>
         order by "consigneeCompanyName"
     </select>
+
 </mapper>