修改ams

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

@@ -1078,6 +1078,13 @@ public class AMScontroller{
         return amsFeign.selectRequirement(requirementId);
     }
 
+    /*
+    查询需求物资详情
+     */
+    @PostMapping("/getRequirementMaterial/{requirementId}")
+    public Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.getRequirementMaterial(requirementId);
+    }
     /**
      * 展示用车需求
      * @param mapValue
@@ -1098,11 +1105,11 @@ public class AMScontroller{
                                           Integer pageSize,
                                           Integer apiId,
                                           Integer requirementStatus,
-                                          String con) {
+                                          String orgCode) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode);
     }
 
     @PostMapping("/getPurRequirementList")
@@ -1182,9 +1189,8 @@ 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,carrierSsoId, con);
+                                                      @RequestParam String carrierSsoId) {
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId);
     }
 
     @ApiModelProperty(value = "展示批次信息")
@@ -1357,12 +1363,11 @@ public class AMScontroller{
                                          Integer apiId,
                                          Integer pageNum,
                                          Integer pageSize,
-                                         Integer issueStatus,
-                                         String con){
+                                         Integer issueStatus){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus,con);
+        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus);
     }
 
     @PostMapping("getSaleOrderInfoes")
@@ -1647,6 +1652,29 @@ public class AMScontroller{
 
                                                         Integer apiId,
                                                         String con) {
-        return amsFeign.getSaleOrderListByCarrierSsoId(mapValue!=null?mapValue:new HashMap<>(),carrierSsoId,pageNum,pageSize,apiId,con);
+        return amsFeign.getSaleOrderListByCarrierSsoId(mapValue != null ? mapValue : new HashMap<>(), carrierSsoId, pageNum, pageSize, apiId, con);
+    }
+    @ApiOperation(value="边输边查具体地址")
+    @PostMapping("/getRealAddressByLike")
+    public Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index){
+        return amsFeign.getRealAddressByLike(addressId,index);
+    }
+
+    @ApiOperation(value="得到单价和单价id")
+    @PostMapping("/getPriceMap")
+    public Map<String, Object> getPriceMap(@RequestBody Map<String,Object> map){
+        return amsFeign.getPriceMap(map);
+    }
+
+    @ApiOperation(value="得到单价和单价id")
+    @PostMapping("/getBenPrice")
+    public Map<String, Object> getBenPrice(@RequestBody Map<String,Object> map){
+        return amsFeign.getBenPrice(map);
+    }
+
+    @ApiOperation(value="批量拒绝定向派单")
+    @PostMapping(value = "/refuseDispatchSaleOrderList")
+    public Map<String, Object> refuseDispatchSaleOrderList(@RequestBody List<Map<String, Object>> mapList) {
+        return amsFeign.refuseDispatchSaleOrderList(mapList);
     }
 }

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

@@ -378,11 +378,11 @@ public class BMSController extends BaseRESTfulController {
                                                   Integer pageSize,
                                                   Integer apiId,
                                                   Integer orderType,
-                                                  String con) {
+                                                  String carrierSsoId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType, con);
+        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType,carrierSsoId);
     }
 
     @PostMapping("getTruckResultList")
@@ -403,12 +403,11 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
+                                               Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId, con);
+        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getInvoiceList")
@@ -430,12 +429,11 @@ public class BMSController extends BaseRESTfulController {
                                                                Integer pageNum,
                                                                Integer pageSize,
                                                                Integer apiId,
-                                                               Integer statementId,
-                                                               String con) {
+                                                               Integer statementId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getSaleTruckStatementDetailsOrderList(mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
+        return bmstruckFeign.getSaleTruckStatementDetailsOrderList(mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId));
     }
 
     @PostMapping("getUnFinishedTruckDetailsOrderList")
@@ -445,11 +443,11 @@ public class BMSController extends BaseRESTfulController {
                                                             Integer pageSize,
                                                             Integer apiId,
                                                             Integer orderType,
-                                                            String con) {
+                                                            String carrierSsoId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType, con);
+        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType,carrierSsoId);
     }
 
     @PostMapping("addBmstruckInvoice")
@@ -551,4 +549,16 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.update(statementId);
     }
 
+    @PostMapping("/updateDetailsOrder")
+    @ApiOperation(value = "修改详单")
+    public RESTfulResult updateDetailsOrder(@RequestBody Map<String, Object> mapValue) {
+        return bmstruckFeign.updateDetailsOrder(mapValue);
+    }
+
+    @PostMapping("/addLossFeeOfCoke")
+    @ApiOperation(value = "增加焦炭途损费")
+    public RESTfulResult addLossFeeOfCoke(@RequestBody Map<String, Object> map) {
+        return bmstruckFeign.addLossFeeOfCoke(map);
+    }
+
 }

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

@@ -0,0 +1,30 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.JoinFeign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2022/2/24 18:09
+ */
+
+@RestController
+@RequestMapping("${api.version}/join")
+public class JoinController {
+
+    @Autowired
+    JoinFeign joinFeign;
+
+    @PostMapping("/receiveTmsTruckWeightResult")
+    public Map<String, Object> receiveTmsTruckWeightResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        return joinFeign.receiveTmsTruckWeightResult(mapList);
+    }
+}

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

@@ -743,4 +743,30 @@ public class OMSController {
     public Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue){
         return omsFeign.getAllLoadUnloadResult(mapValue);
     }
+
+    @ApiOperation(value="批量关闭运输订单")
+    @PostMapping("/batchCloseOrder")
+    public Map<String, Object> batchCloseOrder(@RequestBody List<Map<String,Object>> mapList) {
+        return omsFeign.batchCloseOrder(mapList);
+    }
+
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("/getOrderMaterial/{orderId}")
+    public Map<String,Object> getOrderMaterial(@PathVariable("orderId")Integer orderId){
+        return omsFeign.getOrderMaterial(orderId);
+    }
+
+
+    @ApiOperation(value = "查看所有实绩点")
+    @PostMapping("/getAllResultLineMes")
+    public Map<String, Object> getAllResultLineMes(Integer orderId, String orderNumber){
+        return omsFeign.getAllResultLineMes(orderId, orderNumber);
+    }
+
+    @ApiOperation(value = "正常关闭运输订单")
+    @PostMapping("/closeInwardOrder")
+    public Map<String, Object> closeInwardOrder(Integer orderId){
+        return omsFeign.closeInwardOrder(orderId);
+    }
+
 }

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

@@ -58,6 +58,12 @@ public class RMScontroller {
         return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, lineType, con);
     }
 
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/getGateCalculateMes")
+    public Map<String, Object> getGateCalculateMes(@RequestParam Integer lineId){
+        return rmsFeign.getGateCalculateMes(lineId);
+    }
+
     @ApiOperation(value = "根据主键查询出数据以供修改")
     @PostMapping("/getLinkToUpdate")
     public Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId) {

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

@@ -51,12 +51,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer apiId,
-                                                     String con) {
+                                                     Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("selectBargeOperation/{bargeOperationId}")
@@ -115,12 +114,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
+                                               Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getLoadShip/{resultId}")
@@ -212,12 +210,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId,
-                                             String con) {
+                                             Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
 
@@ -225,9 +222,8 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             Integer pageNum,
                                             Integer pageSize,
-                                            Integer apiId,
-                                            String con){
-        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+                                            Integer apiId){
+        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
 
@@ -256,12 +252,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
+                                               Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId);
     }
 
     /**
@@ -277,10 +272,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
-                                                 Integer apiId,
-                                                 String con) {
+                                                 Integer apiId) {
 
-        return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getUnloadShip/{resultId}")
@@ -327,10 +321,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          Integer pageNum,
                                                          Integer pageSize,
-                                                         Integer apiId,
-                                                         String con) {
+                                                         Integer apiId) {
 
-        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getWaterQuality/{resultId}")
@@ -425,12 +418,11 @@ public class TMSController extends BaseRESTfulController {
                                                            Integer pageNum,
                                                            Integer pageSize,
                                                            Integer apiId,
-                                                           String con,
                                                            String status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
     }
 
     @PostMapping("getShipmentInstructions/{instructionsId}")
@@ -477,12 +469,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                                 Integer pageNum,
                                                                 Integer pageSize,
-                                                                Integer apiId,
-                                                                String con) {
+                                                                Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
     @PostMapping("getGroupList")
     @ApiOperation(value = "展示收货人列表")
@@ -566,12 +557,11 @@ public class TMSController extends BaseRESTfulController {
                                                               Integer pageNum,
                                                               Integer pageSize,
                                                               Integer apiId,
-                                                              String con,
                                                               Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
     }
 
     @PostMapping("insertshipDeliveryAttorney")
@@ -619,12 +609,11 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageNum,
                                                          Integer pageSize,
                                                          Integer apiId,
-                                                         String con,
                                                          Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
     }
 
     @PostMapping("insertDeliveryNotice")
@@ -2005,7 +1994,11 @@ public class TMSController extends BaseRESTfulController {
                                                           Integer pageNum,
                                                           Integer pageSize,
                                                           String startTime,
-                                                          String endTime){
-        return tmsTruckFeign.getPurInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+                                                          String endTime) {
+        return tmsTruckFeign.getPurInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+    @PostMapping("/sendMeasureCommission")
+    public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.sendMeasureCommission(map);
     }
 }

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 io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -213,6 +214,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查用车单位")
+    @PostMapping("/getRequireUnitName")
+    public RESTfulResult getRequireUnitName(@RequestParam("index") String index) {
+        List<Map<String,Object>>list = universalMapper.getRequireUnitName(index == null ? "" : "%" + index + "%");
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查收货单位")
     @PostMapping("/getConsigneeByLike")
     public RESTfulResult getConsigneeByLike(@RequestParam("index") String index) {
@@ -236,10 +244,11 @@ public class UniversalController extends BaseRESTfulController {
     })
     @PostMapping("/queryAPOMaterialByLike")
     public RESTfulResult queryAPOMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId,
-                                             String index) {
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String index,
+                                                Integer supplierId) {
 
         if(mapValue == null) {
             mapValue = new HashMap<>();
@@ -247,6 +256,9 @@ public class UniversalController extends BaseRESTfulController {
         if(index != null && !"".equals(index) &&!"null".equals(index)){
             mapValue.put("index", index);
         }
+        if(supplierId != null){
+            mapValue.put("supplierId", supplierId);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.queryAPOMaterialByLike(mapValue);
@@ -507,4 +519,108 @@ public class UniversalController extends BaseRESTfulController {
     public List<Map<String, Object>> getAllMaterialCoke() {
         return universalMapper.getAllMaterialCoke();
     }
+
+    @ApiModelProperty(value = "边输边查车牌号")
+    @PostMapping("/getCapacityByLike")
+    public RESTfulResult getCapacityByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getCapacityByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查批次")
+    @GetMapping("/getBatchByLike")
+    public RESTfulResult getBatchByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getBatchByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "根据运力id查询所有承运商（下拉框）")
+    @GetMapping("/getCarrierByCapacityId")
+    public RESTfulResult getCarrierByCapacityId(@RequestParam("capacityId") Integer capacityId) {
+        List<Map<String, Object>> list = universalMapper.getCarrierByCapacityId(new BigDecimal(capacityId));
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "根据收货客户查询承运商")
+    @PostMapping("/getCarrierByConsignee")
+    public RESTfulResult getCarrierByConsignee(@RequestBody Map<String,Object> mapValue) {
+        Map<String, Object> map = universalService.getCarrierByConsignee(mapValue);
+        return success(map);
+    }
+
+    @ApiModelProperty(value = "确认车牌号与承运商关系是否存在")
+    @PostMapping("/isInCapacityCarrier")
+    public RESTfulResult isInCapacityCarrier(@RequestBody Map<String,Object> mapValue) {
+        Map<String,Object> map = universalService.isInCapacityCarrier(mapValue);
+        BigDecimal capacityId = (BigDecimal) map.get("capacityId");
+        BigDecimal capacityCarrierId = (BigDecimal) map.get("capacityCarrierId");
+        if (capacityId == null) {
+            return failed();
+        }
+        if (capacityCarrierId == null) {
+            return failed(capacityId);
+        }
+        return success(map);
+    }
+
+    @ApiModelProperty(value = "得到所有油价联动计费公式（apiId：444）")
+    @PostMapping("/getOilFormula")
+    public RESTfulResult getOilFormula(@RequestBody(required = false) Map<String,Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("con", "%执行运价公式");
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getOilFormula(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "获得港口下拉框")
+    @GetMapping("/getPortId")
+    public RESTfulResult getPortId() {
+        return success(universalService.getPortId());
+    }
+
+    @ApiModelProperty(value = "获取车牌号边输边查")
+    @GetMapping("/getCapacityNumber")
+    public RESTfulResult getCapacityNumber(String index) {
+        if(index.length() < 3){
+            return failed();
+        }
+        return success(universalService.getCapacityNumber(index));
+    }
+
+    @ApiModelProperty(value = "获得订单号及订单号下面物资")
+    @GetMapping("/getOrderNumber")
+    public RESTfulResult getOrderNumber(String capacityId) {
+        return success(universalService.getOrderNumber(capacityId));
+    }
+
+    @ApiModelProperty(value = "根据订单查询物资")
+    @GetMapping("/getMaterialIdByOrderId")
+    public RESTfulResult getMaterialIdByOrderId(Integer orderId) {
+        return success(universalService.getMaterialIdByOrderId(orderId));
+    }
+
+    @ApiOperation(value = "修改路段顺序号")
+    @PostMapping("/updateLineSqe")
+    public RESTfulResult updateLineSqe(@RequestBody Map<String,Object> map) {
+        int i = universalMapper.updateLineSqe(map);
+        return success(i);
+    }
+
+    @ApiOperation(value="通过一个carrierSsoId获得承运商对象")
+    @GetMapping("/getRmsCarrierByCarrierSsoId")
+    public RESTfulResult getRmsCarrierByCarrierSsoId(String carrierSsoId){
+       Map<String,Object> carrier= universalMapper.getRmsCarrierByCarrierSsoId(carrierSsoId);
+       if (carrier==null){
+           failed();
+       }
+       return success(carrier);
+    }
 }

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

@@ -40,14 +40,15 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
+                                                   Integer warehouseId,
                                                    String startTime,
                                                    String endTime) {
-        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime);
+        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
     @PostMapping("getWmsInboundResultStatistics")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "apiId", value = "445", required = false, dataType = "BigDecimal"),
     })
     public Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    Integer apiId,
@@ -67,9 +68,10 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
+                                                   Integer warehouseId,
                                                    String startTime,
                                                    String endTime) {
-        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime);
+        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
     @PostMapping("getWmsReservedResult")
     @ApiOperation(value = "展示预留入库实绩信息")
@@ -80,8 +82,9 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
+                                                    Integer warehouseId,
                                                     String con) {
-        return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+        return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con);
     }
     @PostMapping("getWmspOutboundResult")
     @ApiOperation(value = "展示出库实绩信息")
@@ -92,8 +95,10 @@ public class WMSController extends BaseRESTfulController {
                                                      Integer pageNum,
                                                      Integer pageSize,
                                                      Integer apiId,
-                                                     String  con) {
-        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
+                                                     Integer warehouseId,
+                                                     String startTime,
+                                                     String endTime) {
+        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
 
     @PostMapping("/wmspoutboundresults/insertWmspOutBoundResult")
@@ -141,11 +146,23 @@ public class WMSController extends BaseRESTfulController {
                                                       Integer pageNum,
                                                       Integer pageSize,
                                                       Integer apiId,
+                                                      String warehouseId,
+                                                      String time,
                                                       String con) {
-        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,time,con);
 
     }
+//    查询仓库中超过库龄预警的物资
+    @PostMapping("/getGridMaterialAgeList")
+    @ApiOperation(value = "查询仓库中超过库龄预警的物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer warehouseId) {
+        return wmsFeign.getGridMaterialAgeList(mapVal==null?new HashMap<>():mapVal,warehouseId);
 
+    }
 
     //通过成品仓库网格ID查询实时库存数据
     @PostMapping("/selectGridMaterialListByGridId")
@@ -409,7 +426,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsReboundResult(Map<String, Object> mapValue,
+    public RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize,
@@ -452,7 +469,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundResult(Map<String, Object> mapValue,
+    public RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize) {
@@ -474,7 +491,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundMaterial(Map<String, Object> mapValue,
+    public RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize) {
@@ -486,7 +503,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryCheck(Map<String, Object> mapValue,
+    public RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
@@ -499,12 +516,18 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryClose(Map<String, Object> mapValue,
+    public RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           String  con) {
-        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+                                           String  value) {
+        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,value);
+    }
+    //库存结转定时器
+    @PostMapping("/addInventoryClose")
+    @ApiOperation(value = "库存结转定时器")
+    public RESTfulResult addInventoryClose(){
+        return wmsFeign.addInventoryClose();
     }
 
     @PostMapping("/getSendReceive")
@@ -512,13 +535,14 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getSendReceive(Map<String, Object> mapValue,
+    public RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
                                         String con,
                                         String startTime,
-                                        String endTime) {
+                                        String endTime
+                                      ) {
         return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
     }
 
@@ -608,7 +632,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增入库实绩")
     @PostMapping("/insertInboundResult")
     @Transactional
-    public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
+    public Map<String,Object> addInvoice(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         return wmsFeign.insertInboundResult(mapList);
     }
 
@@ -621,7 +645,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增退库实绩")
     @PostMapping("/insertReboundResult")
     @Transactional
-    public String addReboundResult(@RequestBody List<Map<String, Object>> mapList) {
+    public String addReboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -649,7 +673,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增倒库入库实绩")
     @PostMapping("/insertIvboundResult")
     @Transactional
-    public String addIvboundResult(@RequestBody List<Map<String, Object>> mapList) {
+    public String addIvboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -753,7 +777,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
+    public RESTfulResult getIvboundMakeResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                           Integer pageNum,
                                                           Integer pageSize,
                                                           Integer apiId,
@@ -937,19 +961,33 @@ public class WMSController extends BaseRESTfulController {
     }
 //    查询所有的钢材物资信息
     @PostMapping(value = "/getSteelMaterialList")
-    public Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
-                                                 @RequestParam(value = "pageSize") Integer pageSize,
-                                                 @RequestParam(value = "apiId") Integer apiId) {
-        return wmsFeign.getSteelMaterialList(pageNum,pageSize,apiId);
+    public Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  Integer warehouseId,
+                                                   String con) {
+        return wmsFeign.getSteelMaterialList(mapVal ==null? new HashMap<>():mapVal,pageNum,pageSize,apiId,warehouseId,con);
+    }
+    //    查询所有的钢材物资信息
+    @PostMapping(value = "/getSteelWarehouseList")
+    public Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                   Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                   String con) {
+        return wmsFeign.getSteelWarehouseList(mapVal ==null? new HashMap<>():mapVal,apiId,pageNum,pageSize,con);
     }
     //    查询所有的钢材物资规格型号信息
     @PostMapping(value = "/getSteelMaterialModelList")
-    public Map<String,Object> getSteelMaterialModelList(@RequestParam(value = "pageNum") Integer pageNum,
-                                                   @RequestParam(value = "pageSize") Integer pageSize,
-                                                   @RequestParam(value = "apiId") Integer apiId,
+    public Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        @RequestParam(value = "pageNum") Integer pageNum,
+                                                        @RequestParam(value = "pageSize") Integer pageSize,
+                                                        @RequestParam(value = "apiId") Integer apiId,
                                                         @RequestParam(value = "warehouseId") Integer warehouseId,
-                                                        @RequestParam(value = "status") Integer status) {
-        return wmsFeign.getSteelMaterialModelList(pageNum,pageSize,apiId,warehouseId,status);
+                                                        @RequestParam(value = "status") Integer status,
+                                                        @RequestParam(value = "con") String con) {
+        return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,con);
     }
 //    根据对应的入库实绩id修改入库状态为预留
     @PostMapping("/changeReserved")
@@ -963,7 +1001,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "446", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsOutboundResultStatistics(Map<String, Object> mapValue,
+    public RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,

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

@@ -1173,8 +1173,8 @@ public interface AmsFeign {
                                    @RequestParam Integer pageNum,
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId,
-                                                @RequestParam Integer requirementStatus,
-                                                @RequestParam String con);
+                                   @RequestParam Integer requirementStatus,
+                                   @RequestParam String orgCode);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
@@ -1202,8 +1202,7 @@ public interface AmsFeign {
                                                       @RequestParam Integer pageSize,
                                                       @RequestParam Integer apiId,
                                                       @RequestParam Integer dispatchType,
-                                                      @RequestParam String carrierSsoId,
-                                                      @RequestParam String con) ;
+                                                      @RequestParam String carrierSsoId) ;
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getPurchaseIdByBatch")
     Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1323,8 +1322,7 @@ public interface AmsFeign {
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize,
-                                 @RequestParam Integer issueStatus,
-                                 @RequestParam String con);
+                                 @RequestParam Integer issueStatus);
 
 
     @ApiOperation(value="查询未上报的销售订单信息")
@@ -1500,6 +1498,8 @@ public interface AmsFeign {
                                               @RequestParam String enableStatus,
                                               @RequestParam String planStatus);
 
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRealAddressByLike")
+    Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index);
 
     @PostMapping("/api/v1/ams/amssaleorders/saleOrderEmpowerCarrier")
     public RESTfulResult saleOrderEmpowerCarrier(@RequestBody(required = false) Map<String,Object> mapValue);
@@ -1511,4 +1511,15 @@ public interface AmsFeign {
                                                         @RequestParam Integer pageSize,
                                                         @RequestParam Integer apiId,
                                                         @RequestParam String con);
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getPriceMap")
+    Map<String, Object> getPriceMap(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getRequirementMaterial/{requirementId}")
+    Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getBenPrice")
+    Map<String, Object> getBenPrice(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/refuseDispatchSaleOrderList")
+    Map<String, Object> refuseDispatchSaleOrderList(List<Map<String, Object>> mapList);
 }

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

@@ -32,7 +32,7 @@ public interface BmstruckFeign {
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("orderType") Integer orderType,
-                                           @RequestParam("con") String con);
+                                           @RequestParam("carrierSsoId") String carrierSsoId);
 
     /**
      * 展示汽运实绩信息
@@ -117,8 +117,7 @@ public interface BmstruckFeign {
     RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("con") String con);
+                                        @RequestParam("apiId") Integer apiId);
 
     /**
      * 生成销售汽运计费账单
@@ -144,8 +143,7 @@ public interface BmstruckFeign {
                                                         @RequestParam("pageNum") Integer pageNum,
                                                         @RequestParam("pageSize") Integer pageSize,
                                                         @RequestParam("apiId") Integer apiId,
-                                                        @RequestParam("statementId") BigDecimal statementId,
-                                                        @RequestParam("con") String con);
+                                                        @RequestParam("statementId") BigDecimal statementId);
 
     /**
      * 审核
@@ -217,5 +215,11 @@ public interface BmstruckFeign {
                                                      @RequestParam("pageSize") Integer pageSize,
                                                      @RequestParam("apiId") Integer apiId,
                                                      @RequestParam("orderType") Integer orderType,
-                                                     @RequestParam("con") String con);
+                                                     @RequestParam("carrierSsoId") String carrierSsoId);
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateDetailsOrder")
+    RESTfulResult updateDetailsOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addLossFeeOfCoke")
+    RESTfulResult addLossFeeOfCoke(@RequestBody Map<String, Object> map);
 }

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2022/2/24 18:07
+ */
+
+@FeignClient(value = "dal-dazhou-join-api",url = "${openfeign.JoinFeign.url}")
+public interface JoinFeign {
+
+    @PostMapping("api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult")
+    Map<String, Object> receiveTmsTruckWeightResult(@RequestBody List<Map<String, Object>> mapList);
+
+}

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

@@ -436,5 +436,20 @@ public interface OmsFeign {
     @ApiOperation(value = "撤销已拒绝")
     @PostMapping("api/v1/oms/omstruckorders/refuseCtrlZ")
     Map<String, Object> refuseCtrlZ(Map<String, Object> map);
+
+    @ApiOperation(value = "批量关闭运输订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/batchCloseOrder")
+    Map<String, Object> batchCloseOrder(@RequestBody List<Map<String, Object>> mapList);
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderMaterial/{orderId}")
+    Map<String, Object> getOrderMaterial(@PathVariable Integer orderId);
+
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getAllResultLineMes")
+    Map<String, Object> getAllResultLineMes(@RequestParam("orderId") Integer orderId, @RequestParam("orderNumber") String orderNumber);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
+    Map<String, Object> closeInwardOrder(@RequestParam("orderId") Integer orderId);
+
 }
 

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

@@ -48,6 +48,10 @@ public interface RmsFeign {
                                         @RequestParam("lineType")Integer lineType,
                                         @RequestParam("con")String con);
 
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/api/v1/rms/rmslines/getGateCalculateMes")
+    Map<String, Object> getGateCalculateMes(@RequestParam("lineId")Integer lineId);
+
     @ApiOperation(value = "根据主键查询出数据以供修改")
     @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
     Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);

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

@@ -433,6 +433,10 @@ public interface TmsTruckFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam String startTime,
                                            @RequestParam String endTime);
-}
+
+    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
+    Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
+    }
 
 

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

@@ -28,8 +28,7 @@ public interface TmsshipFeign {
     Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId,
-                                              @RequestParam String con);
+                                        @RequestParam Integer apiId);
 
     /**
      * 查询驳船作业信息
@@ -107,8 +106,7 @@ public interface TmsshipFeign {
     Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                   @RequestParam Integer pageNum,
                                   @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId,
-                                        @RequestParam String con);
+                                  @RequestParam Integer apiId);
 
     /**
      * 查询装船作业表单
@@ -234,8 +232,7 @@ public interface TmsshipFeign {
     Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                 @RequestParam Integer pageNum,
                                 @RequestParam Integer pageSize,
-                                @RequestParam Integer apiId,
-                                      @RequestParam String con);
+                                @RequestParam Integer apiId);
 
     /**
      * 展示船只信息
@@ -250,8 +247,7 @@ public interface TmsshipFeign {
     Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId,
-                                        @RequestParam String con);
+                                        @RequestParam Integer apiId);
 
     /**
      * 展示卸船作业信息列表
@@ -266,8 +262,7 @@ public interface TmsshipFeign {
     Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam String con);
+                                          @RequestParam Integer apiId);
 
     /**
      * 查询卸船作业信息
@@ -327,8 +322,7 @@ public interface TmsshipFeign {
     Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId,
-                                                  @RequestParam String con);
+                                            @RequestParam Integer apiId);
 
     /**
      * 查询水分质检信息
@@ -441,7 +435,6 @@ public interface TmsshipFeign {
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
                                               @RequestParam Integer apiId,
-                                                    @RequestParam String con,
                                                     @RequestParam String status);
 
     /**
@@ -543,8 +536,7 @@ public interface TmsshipFeign {
     Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam String con);
+                                     @RequestParam Integer apiId);
 
 
 
@@ -572,8 +564,7 @@ public interface TmsshipFeign {
     Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          @RequestParam Integer pageNum,
                                                          @RequestParam Integer pageSize,
-                                                         @RequestParam Integer apiId,
-                                                         @RequestParam String con);
+                                                         @RequestParam Integer apiId);
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectShippeByName")
     Map<String, Object>   selectShippeByName(@RequestBody(required = false) Map<String, Object> mapValue,
                                              @RequestParam Integer pageNum,
@@ -643,7 +634,6 @@ public interface TmsshipFeign {
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
                                                  @RequestParam Integer apiId,
-                                                 @RequestParam String con,
                                                  @RequestParam Integer status);
 
     /**
@@ -705,7 +695,6 @@ public interface TmsshipFeign {
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
-                                            @RequestParam String con,
                                             @RequestParam Integer  status);
 
     /**

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -34,6 +35,7 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime);
 
@@ -53,6 +55,7 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime);
 
@@ -71,7 +74,8 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                             @RequestParam String con);
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String con);
     /**
      * 展示出库实绩
      *
@@ -85,7 +89,9 @@ public interface WMSFeign {
                                               @RequestParam Integer apiId,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
-                                              @RequestParam String con);
+                                              @RequestParam Integer warehouseId,
+                                              @RequestParam String  startTime,
+                                              @RequestParam String  endTime);
 
     /**
      * 新增出库实绩
@@ -148,8 +154,22 @@ public interface WMSFeign {
                                                @RequestParam Integer apiId,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
+                                               @RequestParam String warehouseId,
+                                               @RequestParam String time,
                                                @RequestParam String con);
 
+    /**
+     * 展示实时库存数据
+     *
+     * @param
+     * @param
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/getGridMaterialAgeList", method = RequestMethod.POST)
+    Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> map,
+                                               @RequestParam Integer warehouseId);
+
     /**
      * 通过成品仓库网格ID查询实时库存数据
      *
@@ -535,7 +555,11 @@ public interface WMSFeign {
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
-                                    @RequestParam String con);
+                                    @RequestParam String value);
+
+    //库存结转定时器
+    @PostMapping(value = "/api/v1/wms/inventoryClose/addInventoryClose")
+    RESTfulResult addInventoryClose();
 
     /**
      * 收发存报表
@@ -547,7 +571,8 @@ public interface WMSFeign {
                                  @RequestParam Integer pageSize,
                                  @RequestParam String con,
                                  @RequestParam String startTime,
-                                 @RequestParam String endTime);
+                                 @RequestParam String endTime
+                                 );
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩
@@ -741,9 +766,6 @@ public interface WMSFeign {
     @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
 
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
-    //收发存定时器
-    @PostMapping("/api/v1/wms/sendReceive/addSendReceive")
-    public RESTfulResult addSendReceive();
 
 
 //
@@ -813,15 +835,27 @@ public interface WMSFeign {
                                           @RequestParam(value = "pageSize") Integer pageSize,
                                           @RequestParam(value = "apiId") Integer apiId);
     @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialList")
-    Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
-                                          @RequestParam(value = "pageSize") Integer pageSize,
-                                          @RequestParam(value = "apiId") Integer apiId);
+    Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String con);
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelWarehouseList")
+    Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con);
+
     @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialModelList")
-    Map<String,Object> getSteelMaterialModelList(@RequestParam(value = "pageNum") Integer pageNum,
-                                            @RequestParam(value = "pageSize") Integer pageSize,
-                                            @RequestParam(value = "apiId") Integer apiId,
+    Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam(value = "pageNum") Integer pageNum,
+                                                @RequestParam(value = "pageSize") Integer pageSize,
+                                                @RequestParam(value = "apiId") Integer apiId,
                                                  @RequestParam(value = "warehouseId") Integer warehouseId,
-                                                 @RequestParam(value = "status") Integer status);
+                                                 @RequestParam(value = "status") Integer status,
+                                                 @RequestParam(value = "con") String con);
 
 
     @PostMapping("/api/v1/wms/inboundResult/changeReserved")

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

@@ -14,6 +14,8 @@ import java.util.Map;
 
 @Mapper
 public interface UniversalMapper {
+     int updateLineSqe(Map<String, Object> map);
+
     //通过运输订单号查询订单信息
     Map<String, Object> getTiHuoDan(String orderNumber);
 
@@ -96,4 +98,41 @@ public interface UniversalMapper {
 
     //查询所有的焦炭子类
     List<Map<String, Object>> getAllMaterialCoke();
+
+
+    //边输边查发货单位
+    List<Map<String, Object>> getCapacityByLike(String index);
+
+    //模糊查询批次品名
+    List<Map<String, Object>> getBatchByLike(String index);
+
+    // 根据运力id查询所有承运商
+    List<Map<String, Object>> getCarrierByCapacityId(BigDecimal capacityId);
+
+    // 根据收货客户查询承运商
+    Map<String, Object> getCarrierByConsignee(String consigneeName);
+
+    // 确认车牌号与承运商关系是否存在
+    BigDecimal isInCapacityCarrier(Map<String, Object> mapValue);
+
+    BigDecimal isInCapacity(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getOilFormula(Map<String, Object> mapValue);
+
+    //边输边查用车单位
+    List<Map<String, Object>> getRequireUnitName(String index);
+
+    //获得港口下拉框
+    List<Map<String, Object>> getPortId();
+
+    //根据车牌号查询正在运输的订单号
+    Map<String, Object> getOrderNumber(String num);
+
+    //查询车牌号
+    List<Map<String, Object>> getCapacityNumber(String num);
+
+    //根据订单Id查询物资
+    List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId);
+
+    Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -5,6 +5,8 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -55,4 +57,53 @@ public class UniversalServiceImpl implements UniversalService {
     public String sha1DigestUtils(String text){
         return DigestUtils.sha1Hex(text);
     }
+
+    /**
+     * 根据收货客户查询承运商
+      */
+    public Map<String, Object> getCarrierByConsignee(Map<String, Object> mapValue){
+        String isSelfMention = (String) mapValue.get("isSelfMention");
+        String consigneeName = (String) mapValue.get("consigneeName");
+        Map<String, Object> map = new HashMap<>();
+        if (isSelfMention.equals("是")) {
+            map = universalMapper.getCarrierByConsignee(consigneeName);
+        }
+        else {
+            map.put("carrierId",null);
+            map.put("carrierName",null);
+        }
+        return map;
+    }
+
+    /**
+     *
+     * @param mapValue
+     * @return
+     */
+    public Map<String, Object> isInCapacityCarrier(Map<String, Object> mapValue) {
+        BigDecimal capacityCarrierId = universalMapper.isInCapacityCarrier(mapValue);
+        BigDecimal capacityId = universalMapper.isInCapacity(mapValue);
+        Map<String,Object> map = new HashMap<>();
+        map.put("capacityCarrierId",capacityCarrierId);
+        map.put("capacityId",capacityId);
+        return map;
+    }
+
+    public List<Map<String, Object>> getPortId() {
+        return universalMapper.getPortId();
+    }
+
+    //获取订单号以及订单号下的物资
+    public Map<String, Object> getOrderNumber(String num) {
+        return universalMapper.getOrderNumber(num);
+    }
+
+    public List<Map<String, Object>> getCapacityNumber(String num) {
+        return universalMapper.getCapacityNumber(num);
+    }
+
+
+    public List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId) {
+        return universalMapper.getMaterialIdByOrderId(orderId);
+    }
 }

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: DAGANG
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api
@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -33,6 +33,7 @@ openfeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
-
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server:
   port: 8019

src/main/resources/application-prod.yml

@@ -29,11 +29,12 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
-
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server:
-  port: 8082
+  port: 8080

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.UniversalMapper">
+    <update id="updateLineSqe" parameterType="java.util.Map">
+        update omstruck_order oo
+        set oo.order_line_sequence = #{orderLineSqe}
+        where oo.order_id = #{orderId}
+    </update>
     <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
         select OO.ORDER_NUMBER             "orderNumber",
                RC.CAPACITY_NUMBER          "capacityNumber",
@@ -70,11 +75,14 @@
                         ON DB.BATCH_ID = APO.BATCH_ID
                     JOIN RMS_MATERIAL RM
                         ON RM.MATERIAL_ID = DB.MATERIAL_ID
-                <where>
+                where APO.DELETED = 0
+                    <if test="supplierId != null">
+                        and APO.SUPPLIER_UNIT_ID = #{supplierId}
+                    </if>
                     <if test="index != null">
-                        instr(RM.MATERIAL_NAME, #{index}) > 0
+                        and (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
                     </if>
-                </where>
+
                  group by RM.MATERIAL_ID,RM.MATERIAL_NAME,RM.MATERIAL_CODE,RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL
         )
         <where>
@@ -144,22 +152,24 @@
         FROM (
                  SELECT
                         RC.CAPACITY_ID        "capacityId",
-                        RC.CARRIER_ID         "carrierId",
+                        RCC.CARRIER_ID         "carrierId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName",
                         RC.INSERT_UPDATE_REMARK "remark"
-                 FROM RMS_CAPACITY RC
+                 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 = RC.CARRIER_ID
+                                ON RCA.CARRIER_ID = RCC.CARRIER_ID
                  WHERE RC.CAPACITY_TYPE_ID = 1 AND RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
-                and RC.CARRIER_ID = #{carrierId}
+                and RCC.CARRIER_ID = #{carrierId}
             </if>
             <if test="index != null">
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
             </if>
             <if test="con != null">
-                and instr(RC.INSERT_UPDATE_REMARK,#{con}) > 0
+                and instr(RC.INSERT_UPDATE_REMARK, #{con}) > 0
             </if>
         )
         <where>
@@ -290,11 +300,10 @@
                                     on apo.BATCH_ID = DB.BATCH_ID
                           join RMS_SUPPLIER RS
                                     on RS.SUPPLIER_ID = apo.SUPPLIER_UNIT_ID
-                 <where>
+                    where APO.DELETED = 0
                     <if test="materialId != null">
-                        DB.MATERIAL_ID = #{materialId}
+                      and  DB.MATERIAL_ID = #{materialId}
                     </if>
-                 </where>
              )
         <where>
             <if test="index != null">
@@ -346,7 +355,7 @@
         FROM RMS_MATERIAL RM
         <where>
             <if test="index != null">
-                instr(RM.MATERIAL_NAM, #{index}) > 0
+                (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
             </if>
         </where>
         )
@@ -472,9 +481,6 @@
         where instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum &lt; 10
         order by "value"
     </select>
-
-
-
     <select id="getCarrierListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
         select
         *
@@ -612,5 +618,119 @@
                RMC.MATERIAL_COKE_NAME "label"
         FROM RMS_MATERIAL_COKE RMC
     </select>
+    <select id="getRequireUnitName" resultType="java.util.Map">
+        SELECT
+	    RS.SHIPPER_ID "shipperId",
+	    RS.SHIPPER_NAME "shipperName"
+        FROM
+	    RMS_SHIPPER RS
+        <where>
+            <if test="index != null">
+                RS.SHIPPER_NAME like #{index}
+            </if>
+        </where>
+    </select>
+
+    <!--  边输边查车牌号  -->
+    <select id="getCapacityByLike" parameterType="string" resultType="java.util.Map">
+        select
+            RC.CAPACITY_ID "capacityId",
+            RC.CAPACITY_NUMBER "value",
+            RC.CAPACITY_NUMBER "capacityNumber"
+        from RMS_CAPACITY RC
+        where instr(RC.CAPACITY_NUMBER, #{index}) > 0
+        order by "value"
+    </select>
 
+    <select id="getCarrierByCapacityId" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RC.CARRIER_ID   AS "id",
+               RC.CARRIER_ID   AS "value",
+               RC.CARRIER_NAME AS "label"
+        FROM RMS_CAPACITY_CARRIER RCC
+                 LEFT JOIN RMS_CARRIER RC
+                           ON RC.CARRIER_ID = RCC.CARRIER_ID
+        WHERE RCC.CAPACITY_ID = #{capacityId}
+    </select>
+
+    <select id="getCarrierByConsignee" parameterType="String" resultType="java.util.Map">
+        SELECT RC.CARRIER_ID   AS "carrierId",
+               RC.CARRIER_NAME AS "carrierName"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_NAME = #{consigneeName}
+    </select>
+
+    <select id="isInCapacityCarrier" parameterType="java.util.Map" resultType="DECIMAL">
+        SELECT RCC.CAPACITY_CARRIER_ID AS "capacityCarrierId"
+        FROM RMS_CAPACITY RCA
+                 LEFT JOIN RMS_CAPACITY_CARRIER RCC
+                           ON RCC.CAPACITY_ID = RCA.CAPACITY_ID
+        WHERE RCA.CAPACITY_NUMBER = #{capacityNumber}
+          <if test="carrierId != null" >
+              AND RCC.CARRIER_ID = #{carrierId}
+          </if>
+        AND rownum = 1
+    </select>
+
+    <select id="isInCapacity" parameterType="java.util.Map" resultType="DECIMAL">
+        SELECT RC.CAPACITY_ID AS "capacityId"
+        FROM RMS_CAPACITY RC
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+    </select>
+
+    <select id="getOilFormula" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT BF.FORMULA_ID     AS "formulaId",
+               BF.FORMULA_NAME   AS "formulaName",
+               BF.FORMULA_STRING AS "formulaString"
+        FROM BMSTRUCK_FORMULA BF
+        WHERE FORMULA_NAME LIKE #{con}
+    </select>
+
+    <select id="getBatchByLike" parameterType="string" resultType="java.util.Map">
+        select *
+        from (
+                 select DB.BATCH_ID                                                         "batchId",
+                        DB.RESULT_FOREIGN_SHIP_NAME                                         "foreignShipName",
+                        CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"') "value"
+                 from DIL_BATCH DB
+                          left join RMS_MATERIAL RM on RM.MATERIAL_ID = DB.MATERIAL_ID
+                 where DB.RESULT_FOREIGN_SHIP_NAME is not null
+             )
+        where instr("foreignShipName", #{index}) > 0
+    </select>
+
+    <select id="getPortId" resultType="java.util.Map">
+        SELECT rp.PORT_ID   "id",
+               rp.PORT_ID   "value",
+               rp.PORT_NAME "label"
+        FROM RMS_PORT rp
+    </select>
+
+
+    <select id="getOrderNumber" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_NUMBER  "orderNumber",
+               OO.ORDER_ID      "orderId"
+        from OMSTRUCK_ORDER OO
+        left join RMS_CAPACITY RC
+            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        where OO.CAPACITY_ID = #{capacityId} and OO.ORDER_STATUS = 5
+    </select>
+
+    <select id="getCapacityNumber" parameterType="string" resultType="java.util.Map">
+        select RC.CAPACITY_NUMBER "capacityNumber",
+               RC.CAPACITY_ID   "capacityId"
+        from RMS_CAPACITY RC
+        where instr(RC.CAPACITY_NUMBER, #{num}) > 0
+    </select>
+
+    <select id="getMaterialIdByOrderId" resultType="java.util.Map">
+        select OOM.MATERIAL_ID "materialId",
+              CONCAT(CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION),RM.MATERIAL_MODEL) "materialName"
+        from OMSTRUCK_ORDER_MATERIAL  OOM
+            left join RMS_MATERIAL RM
+                on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        where OOM.ORDER_ID = #{orderId}
+    </select>
+    <select id="getRmsCarrierByCarrierSsoId" resultType="java.util.Map">
+        select r_carrier.CARRIER_NAME "carrierName",r_carrier.CARRIER_ID "carrierId" from RMS_CARRIER r_carrier where  r_carrier.CARRIER_SSO_ID=#{carrierSsoId}
+    </select>
 </mapper>