tijiao

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

@@ -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,
-                                                           String carrierSSOId){
-        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierSSOId);
+                                                           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) {
@@ -1498,36 +1517,11 @@ public class AMScontroller{
 
 
     //*******************************下拉框************************
+
+
     @GetMapping("getNoticeTypeId")
     @ApiOperation(value = "得到公告类型Id")
     public Map<String,Object> getNoticeTypeId(){
         return amsFeign.getNoticeTypeId();
     }
-
-
-    @ApiOperation(value = "展示车序号下的物资详情")
-    @PostMapping(value = "/getTruckNoMaterialList")
-    public RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId) {
-        return amsFeign.getTruckNoMaterialList(saleOrderMaterialId);
-    }
-
-    @ApiOperation(value = "展示销售派单下的物资详情")
-    @PostMapping(value = "/getDispatchMaterialList")
-    public RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId) {
-        return amsFeign.getDispatchMaterialList(dispatchId);
-    }
-
-
-    /**
-     * 展示销售订单下的物资详情
-     * @param saleOrderId
-     * @return
-     */
-    @ApiOperation(value="展示销售订单下的物资详情")
-    @PostMapping(value = "/getSaleMaterialList")
-    public RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId){
-        return amsFeign.getSaleMaterialList(saleOrderId);
-    }
-
-
 }

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

@@ -46,9 +46,9 @@ public class OMSController {
                                           Integer orderStatus,
                                           Integer planId,
                                           Integer orderType,
-                                          Integer fuelOrder, String con) {
+                                          Integer fuelOrder,String carrierSSOId,String con) {
         return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderStatus, planId, orderType, fuelOrder, con);
+                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con);
     }
 
     @ApiOperation(value = "不适用表头返回数据")
@@ -217,9 +217,9 @@ public class OMSController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer orderType,
-                                              Integer orderStatus, Integer fuelOrder,String con){
+                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                 orderType, orderStatus, fuelOrder, con);
+                 orderType, orderStatus, fuelOrder,carrierSSOId,con);
     }
 
     /**
@@ -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);
     }
 
 
@@ -665,4 +665,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

@@ -150,14 +150,21 @@ public class UniversalController extends BaseRESTfulController {
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
+                                        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);
+            }
         }
+
         //不分页筛选数据
         List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -394,18 +401,10 @@ public class UniversalController extends BaseRESTfulController {
         return universalService.sha1DigestUtils(text);
     }
 
-    @ApiModelProperty(value = "边输边查装货卸货点")
+    @ApiModelProperty(value = "查装货卸货点")
     @PostMapping("/selectUnloadingPoint")
-    public RESTfulResult selectUnloadingPoint(@RequestParam("index") String index) {
-        if(index != null){
-            if(index.length() == 0){
-                index = null;
-            }else {
-                index += "%";
-            }
-        }
-        List<Map<String, Object>> list = universalMapper.selectUnloadingPoint(index);
-        return success(list);
+    public List<Map<String, Object>> selectUnloadingPoint() {
+        return universalMapper.selectUnloadingPoint();
     }
 
     @ApiModelProperty(value = "模糊查询承运商")
@@ -439,6 +438,12 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "所有门岗下拉框")
+    @GetMapping("/getAllGatepost")
+    public List<Map<String,Object>> getAllGatepost(){
+        return universalMapper.getAllGatepost();
+    }
+
     @ApiModelProperty(value = "模糊查询收货单位")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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("carrierSSOId") String carrierSSOId);
+                                                   @RequestParam("carrierSsoId") String carrierSsoId);
 
     /**
      * 新增销售订单物资信息
@@ -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")

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

@@ -31,6 +31,7 @@ public interface OmsFeign {
                                           @RequestParam("planId") Integer planId,
                                           @RequestParam("orderType") Integer orderType,
                                           @RequestParam("fuelOrder") Integer fuelOrder,
+                                          @RequestParam("carrierSSOId")String carrierSSOId,
                                           @RequestParam("con")String con);
 
     @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
@@ -98,6 +99,7 @@ public interface OmsFeign {
                                               @RequestParam("orderType") Integer orderType,
                                               @RequestParam("orderStatus") Integer orderStatus,
                                               @RequestParam("fuelOrder") Integer fuelOrder,
+                                              @RequestParam("carrierSSOId") String carrierSSOId,
                                               @RequestParam("con")      String con);
     /**
      * 展示承运商接收销售公司已接受的销售订单
@@ -125,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
     );
 
     /**
@@ -376,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/mapper/UniversalMapper.java

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

src/main/resources/bootstrap.yml

@@ -46,7 +46,7 @@ openfeign:
     WMSFeign:
       url: ${WMSFEIGN_URL:172.16.33.166:8093}
     OMSFeign:
-      url: ${OMSFEIGN_URL:localhost:8095}
+      url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
       url: ${RMSFEIGN_URL:172.16.33.166:8060}
   #测试环境

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

@@ -149,16 +149,27 @@
                         RC.CAPACITY_ID        "capacityId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName"
+
                  FROM RMS_CAPACITY RC
                           JOIN RMS_CARRIER RCA
                                 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>
              )
     </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 *
@@ -480,16 +491,16 @@
         select Rw.WAREHOUSE_NAME "warehouseName",
                RW.WAREHOUSE_ID "warehouseId"
         from RMS_WAREHOUSE RW
-        where
-              <if test="index != null">
-                  RW.WAREHOUSE_NAME like #{index}
-              </if>
-              <if test="index == null">
-                  rownum &lt; 10
-              </if>
         order by "warehouseName"
     </select>
 
+    <select id="getAllGatepost" resultType="java.util.Map" >
+        SELECT
+            RG.GATEPOST_ID AS "gatepostId",
+            RG.GATEPOST_NAME AS "gatepostName"
+        FROM RMS_GATEPOST RG
+    </select>
+
     <!-- 模糊查询收货单位 -->
     <select id="getConsigneeListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
         SELECT
@@ -501,6 +512,7 @@
         </if>
         order by "consigneeCompanyName"
     </select>
+<<<<<<< HEAD
     <select id="queryAllSupplierByLike" resultType="java.util.Map">
         select *
         from (
@@ -515,4 +527,7 @@
             </if>
         </where>
     </select>
+=======
+
+>>>>>>> e7d114c738959299baef4ab05738fdac218aa6c7
 </mapper>