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

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

@@ -668,7 +668,13 @@ public class OMSController {
 
     @ApiOperation(value = "通过运单下的物资信息")
     @PostMapping("/getOrderMaterialList")
-    public RESTfulResult getOrderMaterialList(@RequestParam Integer orderId) {
+    public Map<String, Object> getOrderMaterialList(@RequestParam Integer orderId) {
         return omsFeign.getOrderMaterialList(orderId);
     }
+
+    @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
+    @PostMapping("/getCapacityAllOrder")
+    public Map<String, Object> getCapacityAllOrder(String capacityNumber){
+        return omsFeign.getCapacityAllOrder(capacityNumber);
+    }
 }

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

@@ -1055,7 +1055,10 @@ public class RMScontroller {
     public Map<String,Object> getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId){
         return rmsFeign.getCarrierNameBySSOId(carrierSSOId);
     }
-
-
+    //边输边查收货客户父节点
+    @PostMapping(value = "getConsigneeFarId")
+    public Map<String,Object> getConsigneeFarId(@RequestParam(value ="state") String state){
+        return rmsFeign.getConsigneeFarId(state);
+    }
 
 }

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -454,6 +455,23 @@ public class UniversalController extends BaseRESTfulController {
         return universalMapper.getAllGatepost();
     }
 
+    //通过承运商id获取userId
+    @PostMapping("/getUserIdByCarrierId")
+    public String getUserIdByCarrierId(@RequestBody Map<String,Object> map){
+        //获取承运商id
+        Integer carrierId =(Integer) map.get("carrierId");
+        return universalMapper.getUserIdbyCarrierId(carrierId);
+    }
+
+
+
+    @ApiModelProperty(value = "已经在sso权限模块承运商下拉框")
+    @GetMapping("/getAllCarrierIdForSso")
+    public List<Map<String,Object>> getAllCarrierIdForSso(){
+        return universalMapper.getAllCarrierIdForSso();
+    }
+
+
     @ApiModelProperty(value = "模糊查询收货单位")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -380,6 +380,11 @@ public interface OmsFeign {
 
     @ApiOperation(value = "根据运输订单id查询物资")
     @PostMapping("api/v1/oms/omstruckorders/getOrderMaterialList")
-    RESTfulResult getOrderMaterialList(@RequestParam Integer orderId);
+    Map<String, Object> getOrderMaterialList(@RequestParam Integer orderId);
+
+    @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityAllOrder")
+    Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber);
+
 }
 

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

@@ -571,4 +571,8 @@ public interface RmsFeign {
     @ApiOperation(value = "根据carrierSSOId查询承运商")
     @PostMapping(value = "api/v1/rms/rmscapacity/getCarrierNameBySSOId")
     Map<String, Object> getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId);
+
+    @ApiOperation(value = "边输边查收货客户父节点")
+    @PostMapping(value = "api/v1/rms/rmsconsignee/getConsigneeFarId")
+    Map<String, Object> getConsigneeFarId(@RequestParam("state") String state);
 }

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

@@ -71,6 +71,12 @@ public interface UniversalMapper {
     // 查询所有门岗
     List<Map<String, Object>> getAllGatepost();
 
+    //获取承运商下拉框
+    List<Map<String,Object>> getAllCarrierIdForSso();
+
+    //根据承运商id获取userId
+    String getUserIdbyCarrierId(Integer carrierId);
+
     // 模糊查询收货单位
     List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
 

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

@@ -18,9 +18,9 @@
                            on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
-    <select id="selectHuanPiaoDan">
+<!--    <select id="selectHuanPiaoDan">-->
 
-    </select>
+<!--    </select>-->
 
     <!--  查询订单子表关联的  -->
     <select id="getOOMMes" parameterType="string" resultType="java.util.Map">
@@ -447,6 +447,19 @@
         where instr(RS.SUPPLIER_NAME, #{index}) > 0 and rownum &lt; 10
         order by "value"
     </select>
+    <!--  获取承运商下拉框,并且判断ssoId是否为空，如果ssoId不为空就展示  -->
+    <select id="getAllCarrierIdForSso" resultType="java.util.LinkedHashMap">
+        select RC.CARRIER_ID "carrierId",
+               RC.CARRIER_NAME "carrierName"
+        from RMS_CARRIER RC
+         where RC.CARRIER_SSO_ID is not null
+    </select>
+   <!--  根据承运商id获取ssoId  -->
+    <select id="getUserIdbyCarrierId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
+     select RC.CARRIER_SSO_ID "carrierSsoId"
+     from RMS_CARRIER RC
+     where RC.CARRIER_ID=#{carrierId}
+    </select>
     <!--  边输边查收货单位 -->
     <select id="getConsigneeByLike" parameterType="string" resultType="java.util.Map">
         select