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

pom.xml

@@ -118,7 +118,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;运力&ndash;&gt;-->
+                    <param>AMSTRUCK_RAIL_DAYPLAN</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -336,13 +337,18 @@ public class AMScontroller{
     }
 
     /**
-     * 下拉框
+     * 获取收货地址
      * @return
      */
-    @GetMapping("getAddressDeliveryAddress")
+    @PostMapping("getAddressDeliveryAddress")
     @ApiOperation(value = "得到地址下拉")
-    public Map<String, Object> getAddressDeliveryAddress(){
-        return amsFeign.getAddressDeliveryAddress();
+    @ApiImplicitParam(name = "apiId",value = "255")
+    public Map<String, Object> getAddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         String con){
+        return amsFeign.getAddressDeliveryAddress(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @GetMapping("getShipperId")
@@ -490,7 +496,7 @@ public class AMScontroller{
         return amsFeign.getSaleOrderReported(mapValue,pageNum,pageSize,apiId);
     }
     @PostMapping("getAmsSaleOrderApproved")
-    @ApiOperation(value = "查询汽运单价信息")
+    @ApiOperation(value = "查询财务已审批销售订单信息")
     public Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
@@ -517,7 +523,7 @@ public class AMScontroller{
     }
     @PostMapping("/addAmsSaleOrder")
     Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.addAmsSaleOrder(mapVal);
+        return amsFeign.addAmsSaleOrder(mapVal==null?new HashMap<>():mapVal);
     }
     @PostMapping("getAmsSaleOrderBySaleOrderId")
     Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
@@ -542,7 +548,6 @@ public class AMScontroller{
         }
         return amsFeign.getSaleOrderUpdateLog(saleOrderId,mapValue, pageNum, pageSize, apiId);
     }
-
     @GetMapping(value = "getSalePlanName")
     @ApiOperation(value="获取销售计划名称")
     public Map<String, Object> getSalePlanName(){return amsFeign.getSalePlanName();}
@@ -716,6 +721,23 @@ public class AMScontroller{
 
     //销售订单-固定派单-公开派单-日计划
 
+    @ApiModelProperty(value = "展示销售公司已审核的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "105", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListBySaleCompany")
+    public Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con){
+      return   amsFeign.getSaleOrderListBySaleCompany(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+
 
     //展示销售公司已审核销售订单的车序号列表
     @PostMapping("/getSaleOrderList")

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

@@ -335,6 +335,7 @@ public class OMSController {
                                                                  @RequestParam Integer pageSize) {
         return omsFeign.getWaterSlagDayPlanAndRecivedList(map==null?new HashMap<>():map, carrierId, apiId, pageNum, pageSize);
     }
+    @ApiOperation(value="通过物资ID和发货单位ID查找采购订单号")
     @PostMapping("/selectNewOrderId")
     public Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map){
         return omsFeign.selectNewOrderId(map);

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

@@ -294,5 +294,66 @@ public class RMScontroller {
         return rmsFeign.getCapacityId();
     }
 
+    /**
+     * @author huk
+     * @return
+     */
+    //查询所有作业环节
+    @ApiOperation(value="查询所有作业环节")
+    @PostMapping("/getLink")
+    public Map<String, Object> getlink(){
+        return  rmsFeign.getlink();
+    }
+
+    /**
+     * @author huk
+     * @return
+     */
+    //新增运输路线
+    @ApiOperation(value="新增运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/insertSelective")
+    public Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal){
+        return rmsFeign.insertSelective(mapVal);
+    }
 
+
+    @ApiOperation(value="查询运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "249", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getAllLineDesk")
+    public Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer apiId,
+                                        String con){
+        return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @ApiOperation(value = "根据主键查询出数据以供修改")
+    @PostMapping("/getLinkToUpdate")
+    public Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId) {
+        return rmsFeign.getLinkToUpdate(lineId);
+    }
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据")
+    @PostMapping("/updateByPrimaryKeySelective")
+    public Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal) {
+        return rmsFeign.updateByPrimaryKeySelective(mapVal);
+    }
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
+    @PostMapping("/updateRmsLine")
+    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal){
+        return  rmsFeign.updateRmsLine(mapVal);
+    }
+
+    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
+    @PostMapping("/getCountNumber")
+    public Map<String, Object> getCountNumber(@RequestParam Integer lineId) {
+        return rmsFeign.getCountNumber(lineId);
+    }
 }

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

@@ -987,9 +987,10 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer status,
                                                  Integer resultType,
+                                                 Integer resultId,
                                                  String con) {
 
-        return tmsTrainFeign.getAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, resultType,con);
+        return tmsTrainFeign.getAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, resultType,resultId,con);
     }
 
     @ApiOperation(value = "通过Id查询请车作业")
@@ -1056,8 +1057,9 @@ public class TMSController extends BaseRESTfulController {
                                                         Integer pageNum,
                                                         Integer pageSize,
                                                         Integer resultType,
+                                                        Integer status,
                                                         String con) {
-        return tmsTrainFeign.getApproveAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,con);
+        return tmsTrainFeign.getApproveAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,status,con);
     }
 
     @ApiOperation(value = "通过Id查询批车作业")
@@ -1452,9 +1454,31 @@ public class TMSController extends BaseRESTfulController {
     //*********************************内转物流tms-train*********************************************************************
     @PostMapping("/addTrainLoadResultForConverted")
     @ApiOperation(value = "内转物流新增装车")
-    public Map<String, Object> addTrainLoadResultForConverted(Map<String, Object> tmstrainLoadingResult) {
-        Map<String, Object> mes = tmsTrainFeign.addTrainLoadResultForConverted(tmstrainLoadingResult);
-        return mes;
+    public Map<String, Object> addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
+        return tmsTrainFeign.addTrainLoadResultForConverted(tmstrainLoadingResult);
+    }
+
+    @ApiOperation(value = "内转新增卸车实绩")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/addTmsTrainUnloadResultForNZ")
+    public Map<String, Object> addTmsTrainUnloadResultForNZ(@RequestBody(required = false)Map<String, Object> map) {
+        return tmsTrainFeign.addTmsTrainUnloadResultForNZ(map);
+    }
+
+    @ApiOperation(value = "查询车皮物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(213)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getMaterialAndCarByLoadingId")
+    public Map<String, Object> getMaterialAndCarByLoadingId(
+            @RequestBody(required = false) Map<String, Object> mapValue,
+            Integer apiId,
+            Integer pageNum,
+            Integer pageSize,
+            Integer loadingId,
+            Integer unloadingId) {
+        return tmsTrainFeign.getMaterialAndCarByLoadingId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, loadingId, unloadingId);
     }
 
     @PostMapping("/selectLoadByResultId/{resultId}")
@@ -1482,11 +1506,10 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize,con);
     }
 
-    @PostMapping("/addWagonApprove")
-    @ApiOperation(value = "内转物流新增装车")
-    public Map<String, Object> addWagonApprove(Map<String, Object> tmstrainLoadingResult) {
-        Map<String, Object> mes = tmsTrainFeign.addWagonApprove(tmstrainLoadingResult);
-        return mes;
+    @PostMapping("/addWagonPleaseForNZ")
+    @ApiOperation(value = "内转物流新增请车")
+    public Map<String, Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
+        return tmsTrainFeign.addPleaseForNZ(tmstrainLoadingResult);
     }
 
     @ApiOperation(value = "内转查询请车作业信息")

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -61,12 +62,109 @@ public class UniversalController extends BaseRESTfulController {
                                            Integer pageSize,
                                            Integer apiId,
                                            String index) {
-        index = index + "%";
-        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(index);
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index + "%");
+        }else {
+            mapValue.put("index", "aaaaa%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "模糊查询发货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "247", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/querySupplierByLike")
+    public RESTfulResult querySupplierByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index + "%");
+        }else {
+            mapValue.put("index", "aaaaa%");
+        }
+        List<Map<String, Object>> list = universalMapper.querySupplierByLike(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
-        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(index);
+        List<Map<String, Object>> columnList = universalMapper.querySupplierByLike(mapValue);
         PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
         return success(data);
     }
+
+    @ApiOperation(value="查询所有空闲的运力信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllCapacityByCarrierLike")
+    public RESTfulResult getAllCapacityByCarrierLike(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        String index
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index + "%");
+        }else {
+            mapValue.put("index", "aaaaaa%");
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
+        return success(pageList);
+    }
+
+
+    @ApiOperation(value="查询所有空闲的运力信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getMaterialMesByOrderId")
+    public RESTfulResult getMaterialMesByOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String orderId
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(orderId != null){
+            mapValue.put("orderId", orderId);
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allCapacity = universalMapper.getMaterialMesByOrderId(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getMaterialMesByOrderId(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
+        return success(pageList);
+    }
 }

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,227 +29,261 @@ public class WMSController extends BaseRESTfulController {
     WMSFeign wmsFeign;
     @Autowired
     QMSFeign qmsFeign;
+
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
     })
-    public Map<String,Object> getWmsInboundResult( Map<String, Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize){
-        return wmsFeign.getWmsInboundResult(mapValue,apiId,pageNum,pageSize);
+    public Map<String, Object> getWmsInboundResult(Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return wmsFeign.getWmsInboundResult(mapValue, apiId, pageNum, pageSize);
     }
+
     @PostMapping("getWmspOutboundResult")
     @ApiOperation(value = "展示出库实绩信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "152", required = false, dataType = "BigDecimal"),
     })
-    public Map<String,Object> getWmspOutboundResult(@RequestBody(required = false)
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId){
-        return wmsFeign.getWmspOutboundResult(apiId,pageNum,pageSize);
+    public Map<String, Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     String con) {
+        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
     }
+
     @PostMapping("/insertWmspOutBoundResult")
     @ApiOperation(value = "新增出单实绩并返回出库单详情")
-    public Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false)Map<String,Object> mapval){
-        Map<String,Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
+    public Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
         return resTfulResult;
     }
+
     @PostMapping("/insertWmspOutboundScanResult")
-    public Map<String,Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String,Object> mapval){
-        Map<String,Object> resTfulResult = wmsFeign.insertWmspOutboundScanResult(mapval);
+    public Map<String, Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.insertWmspOutboundScanResult(mapval);
         return resTfulResult;
     }
+
     @PostMapping("/updataResultStatus")
-    public Map<String,Object> updataResultStatus(@RequestParam Integer resultId){
-        Map<String,Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
+    public Map<String, Object> updataResultStatus(@RequestParam Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
         return resTfulResult;
     }
+
     @PostMapping("/getRmsMaterial")
-    public Map<String,Object> getRmsMaterial(@RequestBody(required = false) Map<String,Object> mapval){
-        Map<String,Object> resTfulResult = wmsFeign.getRmsMaterial(mapval);
+    public Map<String, Object> getRmsMaterial(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.getRmsMaterial(mapval);
         return resTfulResult;
     }
-   //查询实时库存数据
-   @PostMapping("/selectGridMaterialList")
-   @ApiOperation(value = "展示实时库存数据")
-   @ApiImplicitParams({
-           @ApiImplicitParam(name = "apiId", value = "216", required = false, dataType = "BigDecimal"),
-   })
-   public Map<String,Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId) {
-       return wmsFeign.selectGridMaterialList(apiId, pageNum, pageSize);
-
-   }
-  //钢材异地库出库扫描
-  @PostMapping("/OutScanResultTag")
-  public Map<String,Object> OutScanResultTag(@RequestBody(required = false) Map<String,Object> mapval){
-      Map<String,Object> resTfulResult = wmsFeign.OutScanResultTag(mapval);
-      return resTfulResult;
-  }
-  //钢材异地库出库展示实绩
-  @PostMapping("/getWmsOffsiteLibaryOutboundList")
-  @ApiOperation(value = "展示实时库存数据")
-  @ApiImplicitParams({
-          @ApiImplicitParam(name = "apiId", value = "164", required = false, dataType = "BigDecimal"),
-  })
-  public Map<String,Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                   Integer apiId) {
-      return wmsFeign.getWmsOffsiteLibaryOutboundList(apiId,pageNum,pageSize);
-  }
- //展示钢材扫描入库实绩列表
- @ApiImplicitParams({
-         @ApiImplicitParam(name = "apiId", value = "165", required = false, dataType = "BigDecimal"),
- })
- @PostMapping("/getWmsOffsiteLibaryInboundList")
- public Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer apiId) {
-     return wmsFeign.getWmsOffsiteLibaryOutboundList(apiId,pageNum,pageSize);
- }
-//钢材异地库扫描入库
-@PostMapping("/ScanResultTag")
-public Map<String,Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String,Object> map){
-    Map<String,Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
-    return resTfulResult;
-}
-//展示在途库存数据
-@ApiImplicitParams({
-        @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
-})
-@PostMapping("/getWmspIntransitInventory")
-public Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                             Integer pageNum,
-                                                             Integer pageSize,
-                                                             Integer apiId) {
-        return wmsFeign.getWmspIntransitInventory(apiId,pageNum,pageSize);
-    }
-//新增倒库出库实绩
-@PostMapping("/insertOutBoundResult")
-public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Map<String,Object> map){
-        Map<String,Object> resTfulResult = wmsFeign.insertOutBoundResult(map);
+
+    //查询实时库存数据
+    @PostMapping("/selectGridMaterialList")
+    @ApiOperation(value = "展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "216", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      String con) {
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
+
+    }
+
+    //钢材异地库出库扫描
+    @PostMapping("/OutScanResultTag")
+    public Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.OutScanResultTag(mapval);
         return resTfulResult;
     }
-  //新增倒库出库扫描实绩
-  @PostMapping("/AddWmspOutboundScanResult")
-  public Map<String,Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String,Object> mapVal){
-    Map<String,Object> resTfulResult = wmsFeign.AddWmspOutboundScanResult(mapVal);
-    return resTfulResult;
-}
-   //通过下拉框筛选数据
+
+    //钢材异地库出库展示实绩
+    @PostMapping("/getWmsOffsiteLibaryOutboundList")
+    @ApiOperation(value = "展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "164", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                               Integer pageNum,
+                                                               Integer pageSize,
+                                                               Integer apiId,
+                                                               String con) {
+        return wmsFeign.getWmsOffsiteLibaryOutboundList(mapVal == null ? new HashMap<>() : mapVal, pageNum, pageSize, apiId, con);
+    }
+
+    //展示钢材扫描入库实绩列表
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "165", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getWmsOffsiteLibaryInboundList")
+    public Map<String, Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> map,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              Integer apiId,
+                                                              String con) {
+        return wmsFeign.getWmsOffsiteLibaryInboundList(map == null ? new HashMap<>() : map, pageNum, pageSize, apiId, con);
+    }
+
+    //钢材异地库扫描入库
+    @PostMapping("/ScanResultTag")
+    public Map<String, Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
+        return resTfulResult;
+    }
+
+    //展示在途库存数据
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getWmspIntransitInventory")
+    public Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId) {
+        return wmsFeign.getWmspIntransitInventory(apiId, pageNum, pageSize);
+    }
+
+    //新增倒库出库实绩
+    @PostMapping("/insertOutBoundResult")
+    public Map<String, Object> insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertOutBoundResult(map);
+        return resTfulResult;
+    }
+
+    //新增倒库出库扫描实绩
+    @PostMapping("/AddWmspOutboundScanResult")
+    public Map<String, Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapVal) {
+        Map<String, Object> resTfulResult = wmsFeign.AddWmspOutboundScanResult(mapVal);
+        return resTfulResult;
+    }
+
+    //通过下拉框筛选数据
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/getWmspRestackMakeResultList")
-    public Map<String,Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer apiId,
-                                                           Integer warehouseid,
-                                                           Integer gradtionNumber,
-                                                           Integer stackingId) {
-        return wmsFeign.getWmspRestackMakeResultList(apiId,pageNum,pageSize,warehouseid,stackingId,gradtionNumber);
-    }
-
-  //删除倒垛单
- @PostMapping("/deleteByResultId/{resultId}")
- public Map<String,Object> deleteByResultId(@PathVariable Integer resultId){
-     Map<String,Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
-     return resTfulResult;
- }
-   //下发倒垛单
+    public Map<String, Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                            Integer pageNum,
+                                                            Integer pageSize,
+                                                            Integer apiId,
+                                                            Integer warehouseid,
+                                                            Integer gradtionNumber,
+                                                            Integer stackingId) {
+        return wmsFeign.getWmspRestackMakeResultList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
+    }
+
+    //删除倒垛单
+    @PostMapping("/deleteByResultId/{resultId}")
+    public Map<String, Object> deleteByResultId(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
+        return resTfulResult;
+    }
+
+    //下发倒垛单
     @PostMapping("/dispatchDistrubtionStatus/{resultId}")
-    public Map<String,Object> dispatchDistrubtionStatus(@PathVariable Integer resultId){
-        Map<String,Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
+    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
         return resTfulResult;
     }
-  //下拉框获取层次
+
+    //下拉框获取层次
     @GetMapping("/selectGardationNumber")
-    public Map<String,Object> selectGardationNumber(Integer warehouseid, Integer stackingId){
-        Map<String,Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid,stackingId);
+    public Map<String, Object> selectGardationNumber(Integer warehouseid, Integer stackingId) {
+        Map<String, Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid, stackingId);
         return resTfulResult;
     }
+
     //下拉框获取仓库名称
     @GetMapping("/selectWarehouse")
-    public Map<String,Object> selectWarehouse(){
-        Map<String,Object> resTfulResult = wmsFeign.selectWarehouse();
+    public Map<String, Object> selectWarehouse() {
+        Map<String, Object> resTfulResult = wmsFeign.selectWarehouse();
         return resTfulResult;
     }
+
     //下拉框获取仓库名称
     @GetMapping("/selectStackingId")
-    public Map<String,Object> selectStackingId(Integer warehouseid){
-        Map<String,Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
+    public Map<String, Object> selectStackingId(Integer warehouseid) {
+        Map<String, Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
         return resTfulResult;
     }
+
     //展示倒垛单
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/selectRestackList")
-    public Map<String,Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                        Integer pageNum,
-                                                        Integer pageSize,
-                                                        Integer apiId,
-                                                        Integer DistrubtionStatus) {
-        return wmsFeign.selectRestackList(apiId,pageNum,pageSize,DistrubtionStatus);
-    }
-  //修改倒垛单
-  @PostMapping("/addRestackMakeResult")
-  public Map<String,Object> editRestackMakeResult(@RequestBody(required = false) Map<String,Object> mapVal){
-      Map<String,Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
-      return resTfulResult;
-  }
-  //渲染倒垛后的仓库信息
-  @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
-  public Map<String,Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId){
-      Map<String,Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
-      return resTfulResult;
-  }
-  //渲染倒垛后的垛位信息
-  @PostMapping("/selectAfterstackingByResultId/{resultId}")
-  public Map<String,Object> selectAfterstackingByResultId(@PathVariable Integer resultId){
-      Map<String,Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
-      return resTfulResult;
-  }
-  //PDA展示倒垛单
-  @PostMapping("/selectRestackForPDA")
-  public Map<String,Object> selectRestackForPDA(@RequestBody(required = false) Map<String,Object> map){
-      Map<String,Object> resTfulResult = wmsFeign.selectRestackForPDA(map);
-      return resTfulResult;
-  }
-  //PDA根据实绩id查找物资信息
-  @PostMapping("/selectMaterialInfoByResultId")
-  public Map<String,Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String,Object> map){
-        Map<String,Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
+    public Map<String, Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 Integer DistrubtionStatus) {
+        return wmsFeign.selectRestackList(apiId, pageNum, pageSize, DistrubtionStatus);
+    }
+
+    //修改倒垛单
+    @PostMapping("/addRestackMakeResult")
+    public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
+        Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
+        return resTfulResult;
+    }
+
+    //渲染倒垛后的仓库信息
+    @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
+    public Map<String, Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
+        return resTfulResult;
+    }
+
+    //渲染倒垛后的垛位信息
+    @PostMapping("/selectAfterstackingByResultId/{resultId}")
+    public Map<String, Object> selectAfterstackingByResultId(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
+        return resTfulResult;
+    }
+
+    //PDA展示倒垛单
+    @PostMapping("/selectRestackForPDA")
+    public Map<String, Object> selectRestackForPDA(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.selectRestackForPDA(map);
+        return resTfulResult;
+    }
+
+    //PDA根据实绩id查找物资信息
+    @PostMapping("/selectMaterialInfoByResultId")
+    public Map<String, Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
+        return resTfulResult;
+    }
+
+    //PDA根据仓库id查找倒垛单
+    @PostMapping("/selectRestackByWarehouseId")
+    public Map<String, Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.selectRestackByWarehouseId(map);
         return resTfulResult;
-  }
-  //PDA根据仓库id查找倒垛单
-  @PostMapping("/selectRestackByWarehouseId")
-  public Map<String,Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String,Object> map){
-      Map<String,Object> resTfulResult = wmsFeign.selectRestackByWarehouseId(map);
-      return resTfulResult;
-  }
-  //扫描吊牌添加扫描实绩
-  @PostMapping("/ScanTagResult")
-  public Map<String,Object> ScanTagResult(@RequestBody(required = false) Map<String,Object> mal){
-      Map<String,Object> resTfulResult = wmsFeign.ScanTagResult(mal);
-      return resTfulResult;
-  }
-  //下发
-  @PostMapping("/Issue")
-  public Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList){
-      Map<String,Object> resTfulResult = wmsFeign.Issue(mapList);
-      return resTfulResult;
-  }
+    }
+
+    //扫描吊牌添加扫描实绩
+    @PostMapping("/ScanTagResult")
+    public Map<String, Object> ScanTagResult(@RequestBody(required = false) Map<String, Object> mal) {
+        Map<String, Object> resTfulResult = wmsFeign.ScanTagResult(mal);
+        return resTfulResult;
+    }
+
+    //下发
+    @PostMapping("/Issue")
+    public Map<String, Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        Map<String, Object> resTfulResult = wmsFeign.Issue(mapList);
+        return resTfulResult;
+    }
+
     /**
      * 2.展示退库实绩信息
+     *
      * @param mapValue
      * @param apiId
      * @param pageNum
@@ -260,11 +295,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsReboundResult( Map<String, Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize){
-        return wmsFeign.getWmsReboundResult(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getWmsReboundResult(Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize) {
+        return wmsFeign.getWmsReboundResult(mapValue, apiId, pageNum, pageSize);
     }
 
 
@@ -273,16 +308,17 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundResult( Map<String, Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize){
-        return wmsFeign.getWmsIvboundResult(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getWmsIvboundResult(Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize) {
+        return wmsFeign.getWmsIvboundResult(mapValue, apiId, pageNum, pageSize);
     }
 
 
     /**
      * 展示倒库物资实绩
+     *
      * @param mapValue
      * @param apiId
      * @param pageNum
@@ -294,11 +330,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundMaterial( Map<String, Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize){
-        return wmsFeign.getWmsIvboundMaterial(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getWmsIvboundMaterial(Map<String, Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return wmsFeign.getWmsIvboundMaterial(mapValue, apiId, pageNum, pageSize);
     }
 
     @PostMapping("/getInventoryCheck")
@@ -306,11 +342,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryCheck( Map<String, Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize){
-        return wmsFeign.getInventoryCheck(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getInventoryCheck(Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        return wmsFeign.getInventoryCheck(mapValue, apiId, pageNum, pageSize);
     }
 
     @PostMapping("/getInventoryClose")
@@ -318,11 +354,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryClose( Map<String, Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize){
-        return wmsFeign.getInventoryClose(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getInventoryClose(Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        return wmsFeign.getInventoryClose(mapValue, apiId, pageNum, pageSize);
     }
 
     @PostMapping("/getSendReceive")
@@ -330,85 +366,93 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getSendReceive( Map<String, Object> mapValue,
-                                         Integer apiId,
-                                         Integer pageNum,
-                                         Integer pageSize){
-        return wmsFeign.getSendReceive(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getSendReceive(Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize) {
+        return wmsFeign.getSendReceive(mapValue, apiId, pageNum, pageSize);
     }
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示未下发吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示未下发吊钢工扫描吊牌实绩")
     @PostMapping("/getTagResult")
-    public Map<String,Object> getTagResult(){
+    public Map<String, Object> getTagResult() {
         return wmsFeign.getTagResult();
     }
 
     /**
-     *  展示正常入库吊钢工扫描吊牌实绩
+     * 展示正常入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示正常入库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示正常入库吊钢工扫描吊牌实绩")
     @PostMapping("/getIssuedTagResult")
-    public Map getIssuedTagResult(){
+    public Map getIssuedTagResult() {
         return wmsFeign.getIssuedTagResult();
     }
 
     /**
      * 展示异常入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示异常入库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示异常入库吊钢工扫描吊牌实绩")
     @PostMapping("/getIssuedTagNoResult")
-    public Map getIssuedTagNoResult(){
+    public Map getIssuedTagNoResult() {
         return wmsFeign.getIssuedTagNoResult();
     }
 
     /**
      * 展示已退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示已退库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示已退库吊钢工扫描吊牌实绩")
     @PostMapping("/getReIssuedResult")
-    public Map getReIssuedResult(){
+    public Map getReIssuedResult() {
         return wmsFeign.getIssuedResult();
     }
 
     /**
      * 展示未下发退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示未下发退库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
     @PostMapping("/getReTagResult")
-    public Map getReTagResult(){
+    public Map getReTagResult() {
         return wmsFeign.getReTagResult();
     }
 
     /**
      * 展示已倒库入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示已倒库入库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示已倒库入库吊钢工扫描吊牌实绩")
     @PostMapping("/getIvIssuedResult")
-    public Map getIvIssuedResult(){
+    public Map getIvIssuedResult() {
         return wmsFeign.getIvIssuedResult();
     }
 
     /**
      * 展示未下发退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示未下发退库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
     @PostMapping("/getIvTagResult")
-    public Map getIvTagResult(){
+    public Map getIvTagResult() {
         return wmsFeign.getIvTagResult();
     }
 
     /**
      * 新增入库实绩
+     *
      * @param mapList
      * @return
      */
@@ -423,12 +467,12 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
         /*
         获取入库垛位
          */
-        Map<String,Object> map1=qmsFeign.getStackingId(new BigDecimal(1),size);
-        String stackNo=(String) map1.get("stackNo");
-        BigDecimal stackId=new BigDecimal(map1.get("stackId").toString());
-        for (Map<String,Object> map:mapList
-        ){
-            map.put("stackingId",stackId);
+        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+        String stackNo = (String) map1.get("stackNo");
+        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+        for (Map<String, Object> map : mapList
+        ) {
+            map.put("stackingId", stackId);
         }
         wmsFeign.insertInboundResult(mapList);
         return stackNo;
@@ -436,6 +480,7 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
 
     /**
      * 新增退库实绩
+     *
      * @param mapList
      * @return
      */
@@ -450,12 +495,12 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
         /*
         获取入库垛位
          */
-        Map<String,Object> map1=qmsFeign.getStackingId(new BigDecimal(1),size);
-        String stackNo=(String) map1.get("stackNo");
-        BigDecimal stackId=new BigDecimal(map1.get("stackId").toString());
-        for (Map<String,Object> map:mapList
-        ){
-            map.put("stackingId",stackId);
+        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+        String stackNo = (String) map1.get("stackNo");
+        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+        for (Map<String, Object> map : mapList
+        ) {
+            map.put("stackingId", stackId);
         }
         wmsFeign.insertReboundResult(mapList);
         return stackNo;
@@ -463,6 +508,7 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
 
     /**
      * 新增倒库入库实绩
+     *
      * @param mapList
      * @return
      */
@@ -477,80 +523,88 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
         /*
         获取入库垛位
          */
-        Map<String,Object> map1=qmsFeign.getStackingId(new BigDecimal(1),size);
-        String stackNo=(String) map1.get("stackNo");
-        BigDecimal stackId=new BigDecimal(map1.get("stackId").toString());
-        for (Map<String,Object> map:mapList
-        ){
-            map.put("stackingId",stackId);
+        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+        String stackNo = (String) map1.get("stackNo");
+        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+        for (Map<String, Object> map : mapList
+        ) {
+            map.put("stackingId", stackId);
         }
         wmsFeign.insertIvboundResult(mapList);
         return stackNo;
     }
+
     /**
-     *展示入库垛位
+     * 展示入库垛位
+     *
      * @param DriverId
      * @return
      */
     @PostMapping("/getInboundStack")
     @ApiOperation(value = "展示入库垛位")
-    public Integer getInboundStack(Integer DriverId){
+    public Integer getInboundStack(Integer DriverId) {
         return wmsFeign.getInboundStack(DriverId);
     }
+
     /**
      * 新增库存盘点
+     *
      * @param map
      * @return
      */
     @PostMapping("/inventoryCheck")
     @ApiOperation(value = "新增库存盘点")
-    public Map<String, Object> inventoryCheck(@RequestBody(required = false) Map<String,Object> map) {
+    public Map<String, Object> inventoryCheck(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.inventoryCheck(map);
     }
 
     /**
      * 新增入库扫描吊牌实绩
+     *
      * @param map
      * @return
      */
     @ApiOperation(value = "新增入库扫描吊牌实绩")
     @PostMapping("/insertResult")
     @Transactional
-    public Map<String,Object> insertResult(@RequestBody(required = false)Map<String,Object>map){
+    public Map<String, Object> insertResult(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.insertResult(map);
     }
 
     /**
      * 新增退库扫描吊牌实绩
+     *
      * @param map
      * @return
      */
     @ApiOperation(value = "新增退库扫描吊牌实绩")
     @PostMapping("/insertReboundScanResult")
     @Transactional
-    public Map<String,Object> insertReboundScanResult(@RequestBody(required = false)Map<String,Object>map){
+    public Map<String, Object> insertReboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.insertReboundScanResult(map);
     }
 
     /**
      * 新增倒库入库扫描吊牌实绩
+     *
      * @param map
      * @return
      */
     @ApiOperation(value = "新增倒库入库扫描吊牌实绩")
     @PostMapping("/insertIvboundScanResult")
     @Transactional
-    public Map<String,Object> insertIvboundScanResult(@RequestBody(required = false)Map<String,Object>map){
+    public Map<String, Object> insertIvboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.insertIvboundScanResult(map);
     }
-/**
- *  根据实绩id查找物资唯一编码是否已经稽核完成
- */
-@PostMapping("/selectMaterialSteelIdByReusltId")
-@Transactional
-public Map<String,Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false)Map<String,Object>map){
-    return wmsFeign.selectMaterialSteelIdByReusltId(map);
-}
+
+    /**
+     * 根据实绩id查找物资唯一编码是否已经稽核完成
+     */
+    @PostMapping("/selectMaterialSteelIdByReusltId")
+    @Transactional
+    public Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map) {
+        return wmsFeign.selectMaterialSteelIdByReusltId(map);
+    }
 
 
 }

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

@@ -285,12 +285,18 @@ public interface AmsFeign {
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
 
+
+
     /**
      * 下拉框
      * @return
      */
-    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getAddressDeliveryAddress")
-    Map<String, Object> getAddressDeliveryAddress();
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAddressDeliveryAddress")
+    Map<String, Object> getAddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam String con);
 
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getShipperId")
     Map<String, Object> getShipperId();
@@ -447,6 +453,15 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId);
 
+
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompany")
+     Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("con") String con);
+
     /**
      * 查询财务已审批销售订单信息
      * @param mapValue

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

@@ -1,4 +1,8 @@
 package com.steerinfo.dil.feign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -133,4 +137,45 @@ public interface RmsFeign {
     @GetMapping(value = "/api/v1/rms/rmscapacity/getCapacityId")
     Map<String, Object> getCapacityId();
 
+    /**
+     * @author huk
+     * @return
+     */
+    @PostMapping("/api/v1/rms/rmslinks/getLink")
+    Map<String, Object> getlink();
+
+    /**
+     * @author huk
+     * @return
+     */
+    //新增运输路线
+    @ApiOperation(value="新增运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/api/v1/rms/rmslines/insertSelective")
+    Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @PostMapping(value = "/api/v1/rms/rmslines/getAllLineDesk")
+    Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize")Integer pageSize,
+                                        @RequestParam("apiId")Integer apiId,
+                                        @RequestParam("con")String con);
+
+    @ApiOperation(value = "根据主键查询出数据以供修改")
+    @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
+    Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据")
+    @PostMapping("/api/v1/rms/rmslines/updateByPrimaryKeySelective")
+    Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
+    @PostMapping("/api/v1/rms/rmslines/updateRmsLine")
+    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
+    @PostMapping("/api/v1/rms/rmslines/getCountNumber")
+    Map<String, Object> getCountNumber(@RequestParam Integer lineId);
 }

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

@@ -125,8 +125,9 @@ public interface TmsTrainFeign {
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("status") Integer status,
-                                                 @RequestParam("resultType") Integer resultType,
-                                                 @RequestParam("con") String con
+                                           @RequestParam("resultType") Integer resultType,
+                                           @RequestParam("resultId") Integer resultId,
+                                           @RequestParam("con") String con
                                                  );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getWagonPleaseById/{resultId}")
@@ -160,8 +161,9 @@ public interface TmsTrainFeign {
                                                   @RequestParam("apiId") Integer apiId,
                                                   @RequestParam("pageNum") Integer pageNum,
                                                   @RequestParam("pageSize") Integer pageSize,
-                                                        @RequestParam("resultType") Integer resultType,
-                                                        @RequestParam("con") String con
+                                                  @RequestParam("resultType") Integer resultType,
+                                                  @RequestParam("status") Integer status,
+                                                  @RequestParam("con") String con
     );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveWagonPleaseById/{resultId}")
@@ -176,19 +178,25 @@ public interface TmsTrainFeign {
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteApproveWagonPlease/{resultId}")
     public Map<String, Object> deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId);
+
     //*****************************************内转物流***************************************************
+
     @PostMapping("api/v1/trainTms/tmstrainloadingresults/addTrainLoadResultForConverted")
     Map<String,Object>  addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
     @PostMapping ("api/v1/trainTms/tmstrainloadingresults/selectLoadByResultId/{resultId}")
     Map<String,Object> selectLoadByResultId(@PathVariable("resultId")BigDecimal resultId);
+
     @PostMapping("api/v1/trainTms/tmstrainloadingresults/getTmstrainWagonLoadForConverted")
     Map<String,Object> getTmstrainWagonLoadForConverted(@RequestBody(required=false)
                                                         @RequestParam("apiId") Integer apiId,
                                                         @RequestParam("pageNum") Integer pageNum,
                                                         @RequestParam("pageSize") Integer pageSize,
                                                         @RequestParam("con") String con);
+
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getPleasePlanByResultId/{resultId}")
     Map<String,Object> getPleasePlanByResultId(@PathVariable("resultId")BigDecimal resultId);
+
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveByResultId/{resultId}")
     Map<String,Object> getApproveByResultId(@PathVariable("resultId")BigDecimal resultId);
 
@@ -198,11 +206,25 @@ public interface TmsTrainFeign {
                                                             @RequestParam("pageNum") Integer pageNum,
                                                             @RequestParam("pageSize") Integer pageSize,
                                                             @RequestParam("con") String con);
+
     @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectTrainUnLoadResultForConverted")
-    Map<String,Object>  selectTrainUnLoadResultForConverted(@RequestParam("apiId") Integer apiId,
+    Map<String,Object>  selectTrainUnLoadResultForConverted(
+                                                            @RequestParam("apiId") Integer apiId,
                                                             @RequestParam("pageNum") Integer pageNum,
                                                             @RequestParam("pageSize") Integer pageSize,
                                                             @RequestParam("con") String con);
-    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonApprove")
-    Map<String,Object> addWagonApprove(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonPleaseForNZ")
+    Map<String,Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/addTmsTrainUnloadResultForNZ")
+    Map<String, Object> addTmsTrainUnloadResultForNZ(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getMaterialAndCarByLoadingId")
+    Map<String, Object> getMaterialAndCarByLoadingId(
+            @RequestBody(required = false) Map<String, Object> mapValue,
+            @RequestParam("apiId") Integer apiId,
+            @RequestParam("pageNum") Integer pageNum,
+            @RequestParam("pageSize") Integer pageSize,
+            @RequestParam("loadingId")Integer loadingId,
+            @RequestParam("unloadingId")Integer unloadingId);
 }

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

@@ -36,10 +36,11 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/getWmspOutboundResult",method = RequestMethod.POST)
-    Map<String,Object> getWmspOutboundResult(@RequestBody(required = false)
-                                      @RequestParam Integer apiId,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize);
+    Map<String,Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam String con);
 
     /**
      * 新增出库实绩
@@ -76,10 +77,11 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialList",method = RequestMethod.POST)
-    Map<String,Object> selectGridMaterialList(@RequestBody(required = false)
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize);
+    Map<String,Object> selectGridMaterialList(@RequestBody(required = false) Map<String,Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam String con);
 
     /**
      * 钢材异地库出库扫描
@@ -97,10 +99,11 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getWmsOffsiteLibaryOutboundList",method = RequestMethod.POST)
-    Map<String,Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false)
-                                              @RequestParam Integer apiId,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize);
+    Map<String,Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String,Object> map,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("con") String con);
 
     /**
      * 展示钢材异地库入库实绩表
@@ -110,10 +113,11 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/getWmsOffsiteLibaryInboundList",method = RequestMethod.POST)
-    Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false)
+    Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String,Object> map,
                                                        @RequestParam Integer apiId,
                                                        @RequestParam Integer pageNum,
-                                                       @RequestParam Integer pageSize);
+                                                       @RequestParam Integer pageSize,
+                                                      @RequestParam String con);
 
     /**
      *   钢材异地库入库扫描新增异地库入库实绩
@@ -164,7 +168,7 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getWmspRestackMakeResultList")
-    Map<String,Object> getWmspRestackMakeResultList(@RequestBody(required = false)
+    Map<String,Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String,Object> map,
                                                     @RequestParam Integer apiId,
                                                     @RequestParam Integer pageNum,
                                                     @RequestParam Integer pageSize,
@@ -202,7 +206,7 @@ public interface WMSFeign {
      * @param stackingId
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectGardationNumber")
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectGardationNumber")
     Map<String,Object> selectGardationNumber(@RequestParam Integer warehouseid,
                                              @RequestParam  Integer stackingId );
 
@@ -211,14 +215,14 @@ public interface WMSFeign {
      * @param warehouseid
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
     Map<String,Object> selectStackingId(@RequestParam Integer warehouseid);
 
     /**
      * 下拉框获取仓库名称
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
     Map<String,Object> selectWarehouse();
 
     /**
@@ -373,7 +377,7 @@ public interface WMSFeign {
      * 展示未下发吊钢工扫描吊牌实绩
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getTagResult",method = RequestMethod.POST)
+    @PostMapping(value = "/api/v1/wms/inboundScanResult/getTagResult")
     Map<String,Object>  getTagResult();
 
     /**

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

@@ -20,7 +20,14 @@ public interface UniversalMapper {
     List<Map<String, Object>> getOOMMes(String orderNumber);
 
     //模糊查询所有物资
-    List<Map<String, Object>> queryMaterialByLike(String index);
+    List<Map<String, Object>> queryMaterialByLike(Map<String, Object> map);
 
+    //模糊查询发货单位
+    List<Map<String, Object>> querySupplierByLike(Map<String, Object> map);
 
+    //模糊查询承运商的运力信息
+    List<Map<String, Object>> getAllCapacityByCarrierLike(Map<String, Object> map);
+
+    //通过运输订单ID查询物资子表（针对钢材）
+    List<Map<String, Object>> getMaterialMesByOrderId(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -13,4 +13,5 @@ public interface UniversalService {
     //打印提货单
     Map<String, Object> printTiHuoDan(String orderNumber);
 
+
 }

src/main/resources/bootstrap.yml

@@ -51,7 +51,6 @@ openfeign:
   RmsFeign:
     url: ${RMSFEIGN_HRL:localhost:8060}
 
-
 genxml:
   pth: com/a
 cache:

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

@@ -2,9 +2,9 @@
 <!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">
     <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
-        select OO.ORDER_NUMBER "orderNumber",
-               RC.CAPACITY_NUMBER "capacityNumber",
-               RCA.CARRIER_NAME "carrierName",
+        select OO.ORDER_NUMBER             "orderNumber",
+               RC.CAPACITY_NUMBER          "capacityNumber",
+               RCA.CARRIER_NAME            "carrierName",
                RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
 
         from OMSTRUCK_ORDER OO
@@ -22,18 +22,17 @@
 
     </select>
 
-<!--  查询订单子表关联的  -->
+    <!--  查询订单子表关联的  -->
     <select id="getOOMMes" parameterType="string" resultType="java.util.Map">
-        select
-               RM.MATERIAL_NAME                          "materialName",
-               RPP.PLATFORM_NAME                         "platformName",
-               RP.PERSONNEL_NAME                         "personnelName",
+        select RM.MATERIAL_NAME  "materialName",
+               RPP.PLATFORM_NAME "platformName",
+               RP.PERSONNEL_NAME "personnelName",
                (
-                 select ORDER_MATERIAL_NUMBER
-                 from OMSTRUCK_ORDER_MATERIAL OOM
-                 where OOM.ORDER_ID = OO.ORDER_ID
-                  and TLR.MATERIAL_ID = OOM.MATERIAL_ID
-                   ) "orderMaterialNumber"
+                   select ORDER_MATERIAL_NUMBER
+                   from OMSTRUCK_ORDER_MATERIAL OOM
+                   where OOM.ORDER_ID = OO.ORDER_ID
+                     and TLR.MATERIAL_ID = OOM.MATERIAL_ID
+               )                 "orderMaterialNumber"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on TTR.ORDER_ID = OO.ORDER_ID
@@ -47,14 +46,142 @@
                            on RP.PERSONNEL_ID = TLR.LOADER_ID
         where ORDER_NUMBER = #{orderNumber}
     </select>
-<!--  模糊查询所有物资  -->
-    <select id="queryMaterialByLike" parameterType="string" resultType="java.util.Map">
+
+    <sql id="orderBy">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+    </sql>
+
+    <!--  模糊查询所有物资  -->
+    <select id="queryMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
         SELECT RM.MATERIAL_ID "materialId",
-               RM.MATERIAL_NAME "materialName",
-               RM.MATERIAL_CODE "materialCode",
-               RM.MATERIAL_SPECIFICATION "materialSpecification",
-               RM.MATERIAL_MODEL "materialModel"
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel"
         FROM RMS_MATERIAL RM
         WHERE RM.MATERIAL_NAME LIKE #{index}
+        )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialSpecification != null">
+                and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialId" desc
+        </if>
+    </select>
+    <!--    模糊查询发货单位 -->
+    <select id="querySupplierByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RS.SUPPLIER_ID "supplierId",
+        RS.SUPPLIER_NAME "supplierName",
+        RS.SUPPLIER_ADDRESS "supplierAddress"
+        FROM RMS_SUPPLIER RS
+        WHERE RS.SUPPLIER_NAME LIKE #{index}
+        )
+        <where>
+            <if test="supplierName != null">
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierAddress != null">
+                and
+                <foreach collection="supplierAddress" item="item" open="(" separator="or" close=")">
+                    "supplierAddress" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "supplierId" desc
+        </if>
+    </select>
+
+    <!--  获取所有的运力信息 -->
+    <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+        SELECT
+            RDC.DRIVER_CAPACITY_ID "driverCapacityId",
+            RDC.CAPACITY_ID "capacityId",
+            RCD.DRIVER_NAME "driverName",
+            RC.CAPACITY_NUMBER "capacityNumber",
+            RCA.CARRIER_NAME "carrierName"
+        FROM RMS_DRIVER_CAPACITY RDC
+        LEFT JOIN RMS_CAR_DRIVER RCD
+            ON RCD.DRIVER_ID = RDC.DRIVER_ID
+        LEFT JOIN RMS_CAPACITY RC
+            ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+        LEFT JOIN RMS_CARRIER RCA
+            ON RCA.CARRIER_ID = RDC.CARRIER_ID
+        WHERE RC.CAPACITY_STATUS = 0
+            and RCA.CARRIER_NAME LIKE #{index}
     </select>
+
+<!--    通过订单ID查询物资子表信息  -->
+    <select id="getMaterialMesByOrderId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select RM.MATERIAL_NAME               "materialName",
+                        RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
+                        OOM.ORDER_MATERIAL_NUMBER      "orderMaterialNumber"
+
+                 from OMSTRUCK_ORDER_MATERIAL OOM
+                          left join RMS_MATERIAL RM
+                                    ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                 where OOM.ORDER_ID = #{orderId}
+             )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialTheoreticalWeight != null">
+            and
+                <foreach collection="materialTheoreticalWeight" item="item" open="(" separator="or" close=")">
+                    "materialTheoreticalWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialNumber != null">
+                and
+                <foreach collection="orderMaterialNumber" item="item" open="(" separator="or" close=")">
+                    "orderMaterialNumber" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialName" desc
+        </if>
+    </select>
+
 </mapper>