'20点47分'

pom.xml

@@ -118,6 +118,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
+                        <table></table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -1108,20 +1108,20 @@ public class AMScontroller{
         return amsFeign.getArriveName();
     }
 
-    @ApiModelProperty(value = "查询所有的钢材物资")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping("/getAllSteelMaterialMes")
-    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer apiId,
-                                                String con) {
-        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-    }
+//    @ApiModelProperty(value = "查询所有的钢材物资")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
+//    })
+//    @PostMapping("/getAllSteelMaterialMes")
+//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//                                                Integer pageNum,
+//                                                Integer pageSize,
+//                                                Integer apiId,
+//                                                String con) {
+//        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+//    }
 
     @ApiModelProperty(value = "查询PC端公开抢单")
     @ApiImplicitParams({

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

@@ -10,6 +10,7 @@ import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -585,4 +586,39 @@ public class OMSController {
     public Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue) {
         return omsFeign.driverConfirmation(mapvalue);
     }
+    @ApiOperation(value = "通过运输订单号查询订单信息给司机")
+    @PostMapping("/getMessageToApp")
+    public Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        return omsFeign.getMessageToApp(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询所有已下发未接收的订单信息")
+    @PostMapping("/getAllOrderMessagesByCapacityNum")
+    public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue){
+        return  omsFeign.getAllOrderMessagesByCapacityNum(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("/getReceiveOrderIdListByCapacityNum")
+    public List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String, Object> mapvalue) {
+        return omsFeign.getReceiveOrderIdListByCapacityNum(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("/getAllRefuseOrderNumberByCapacity")
+    public List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue){
+        return omsFeign.getAllRefuseOrderNumberByCapacity(mapvalue);
+    }
+
+    @ApiOperation(value = "添加退货实绩关闭当前订单")
+    @PostMapping("/returnOrderCloseOrder")
+    public Map<String,Object> returnOrderCloseOrder(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.returnOrderCloseOrder(map);
+    }
+
+    @ApiOperation(value = "根据运单id查询实绩位置")
+    @PostMapping("/getOrderResult")
+    public List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map){
+        return omsFeign.getOrderResult(map);
+    }
 }

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

@@ -1771,4 +1771,14 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsTruckFeign.addSteelNzReceiptResult(map);
     }
+
+
+    @ApiOperation(value="更新计量实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "计量数据", required = false, dataType = "List<Map>"),
+    })
+    @PostMapping("/updateTruckWeight")
+    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList){
+        return tmsTruckFeign.updateTruckWeight(mapList);
+    }
 }

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

@@ -50,69 +50,67 @@ public class UniversalController extends BaseRESTfulController {
         return success(tiHuoDan);
     }
 
-    @ApiModelProperty(value = "模糊查询物资")
+
+    @ApiModelProperty(value = "模糊查询发货单位")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+            @ApiImplicitParam(name = "apiId", value = "247", required = false, dataType = "BigDecimal")
     })
-    @PostMapping("/queryMaterialByLike")
-    public RESTfulResult queryMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer apiId,
-                                           String index,
-                                           String startNum) {
-
+    @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(startNum != null){
-            mapValue.put("startNum", startNum + "%");
-        }
         if(index != null){
-            mapValue.put("index", "%" + index + "%");
+            mapValue.put("index","%" + index + "%");
         }
-        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(mapValue);
+        List<Map<String, Object>> list = universalMapper.querySupplierByLike(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
-        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(mapValue);
+        List<Map<String, Object>> columnList = universalMapper.querySupplierByLike(mapValue);
         PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
         return success(data);
     }
 
-    @ApiModelProperty(value = "模糊查询发货单位")
+    @ApiModelProperty(value = "通过物资ID查询该物资的发货单位信息")
     @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,
+    @PostMapping("/getSupplierMesByMaterialId")
+    public RESTfulResult getSupplierMesByMaterialId(@RequestBody(required = false) Map<String,Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
                                              Integer apiId,
-                                             String index) {
-        if(mapValue == null) {
+                                             String index, String materialId) {
+        if(mapValue == null)
             mapValue = new HashMap<>();
-        }
+
+        if(!"null".equals(materialId))
+            mapValue.put("materialId",materialId);
+
         if(index != null){
-            mapValue.put("index", index + "%");
-        }else {
-            mapValue.put("index", "aaaaa%");
+            mapValue.put("index","%" + index + "%");
         }
-        List<Map<String, Object>> list = universalMapper.querySupplierByLike(mapValue);
+        List<Map<String, Object>> list = universalMapper.getSupplierMesByMaterialId(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
-        List<Map<String, Object>> columnList = universalMapper.querySupplierByLike(mapValue);
+        List<Map<String, Object>> columnList = universalMapper.getSupplierMesByMaterialId(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 = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
@@ -128,8 +126,6 @@ public class UniversalController extends BaseRESTfulController {
         }
         if(index != null){
             mapValue.put("index", index + "%");
-        }else {
-            mapValue.put("index", "aaaaaa%");
         }
         //不分页筛选数据
         List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
@@ -169,4 +165,94 @@ public class UniversalController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
         return success(pageList);
     }
+
+    @ApiModelProperty(value = "模糊查询物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryAPOMaterialByLike")
+    public RESTfulResult queryMaterialByLike(@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 + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryAPOMaterialByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryAPOMaterialByLike(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 = "374", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getUnloadingMesByLike")
+    public RESTfulResult getUnloadingMesByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             Integer type,
+                                             String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(type != null){
+            mapValue.put("type", type);
+        }
+        if(index != null){
+            mapValue.put("index", "%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.getUnloadingMesByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getUnloadingMesByLike(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 = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryMaterialByLike")
+    public RESTfulResult queryMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index,
+                                             String startNum) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(startNum != null){
+            mapValue.put("startNum", startNum + "%");
+        }
+        if(index != null){
+            mapValue.put("index", "%" + index + "%");
+        }
+        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);
+    }
 }

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

@@ -62,12 +62,22 @@ public class WMSController extends BaseRESTfulController {
         return resTfulResult;
     }
 
-    @PostMapping("/insertWmspOutboundScanResult")
-    public Map<String, Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval) {
-        Map<String, Object> resTfulResult = wmsFeign.insertWmspOutboundScanResult(mapval);
+    @PostMapping(value = "/deletewmspOutboundResult")
+    public Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId){
+        return wmsFeign.deleteWmspOutboundResult(resultId);
+    }
+
+    @PostMapping("/insertwmspOutboundScanResult")
+    public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
         return resTfulResult;
     }
 
+    @PostMapping("/outbountResultToSuccess")
+    public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
+        return wmsFeign.outbountResultToSuccess(resultId);
+    }
+
     @PostMapping("/updataResultStatus")
     public Map<String, Object> updataResultStatus(@RequestParam Integer resultId) {
         Map<String, Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
@@ -84,7 +94,7 @@ public class WMSController extends BaseRESTfulController {
     @PostMapping("/selectGridMaterialList")
     @ApiOperation(value = "展示实时库存数据")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "216", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
     })
     public Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
                                                       Integer pageNum,
@@ -153,6 +163,20 @@ public class WMSController extends BaseRESTfulController {
         Map<String, Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
         return resTfulResult;
     }
+    //获取扫描实绩
+    //钢材异地库扫描入库
+    @PostMapping("/getScanResult")
+    public Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
+        return resTfulResult;
+    }
+
+    //更新状态
+    @PostMapping("/updateStatus")
+    public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.updateStatus(map);
+        return resTfulResult;
+    }
 
     //展示在途库存数据
     @ApiImplicitParams({
@@ -190,14 +214,14 @@ public class WMSController extends BaseRESTfulController {
                                                             Integer pageSize,
                                                             Integer apiId,
                                                             Integer warehouseid,
-                                                            Integer gradtionNumber,
-                                                            Integer stackingId) {
+                                                            Integer stackingId,
+                                                            Integer gradtionNumber) {
         return wmsFeign.getWmspRestackMakeResultList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
     }
 
-    //添加倒垛单实绩
+
     @PostMapping(value = "/addRestackMakeResult")
-    public Map<String,Object> addRestackMakeResult(@RequestBody(required = false) Map<String,Object> mapval){
+    public Map<String,Object> addRestackMakeResult(@RequestBody  Map<String,Object> mapval){
         return wmsFeign.addRestackMakeResult(mapval);
     }
 
@@ -246,7 +270,7 @@ public class WMSController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer apiId,
                                                  Integer DistrubtionStatus) {
-        return wmsFeign.selectRestackList(apiId, pageNum, pageSize, DistrubtionStatus);
+        return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
     }
 
 //    //修改倒垛单
@@ -290,6 +314,18 @@ public class WMSController extends BaseRESTfulController {
         Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
         return resTfulResult;
     }
+   @ApiImplicitParams({
+           @ApiImplicitParam(value = "395",name = "apiId")
+   })
+    @PostMapping(value = "/getRestackInfoByResultId")
+    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId
+
+    ){
+        return  wmsFeign.getRestackInfoByResultId(mapVal==null?new HashMap<>():mapVal, pageNum, pageSize, apiId);
+    }
 
     //PDA根据仓库id查找倒垛单
     @PostMapping("/selectRestackByWarehouseId")
@@ -333,6 +369,35 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getWmsReboundResult(mapValue, apiId, pageNum, pageSize);
     }
 
+    @PostMapping("/selectScanResultByIboundResultId")
+    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult selectScanResultByIboundResultId( Map<String, Object> mapValue,
+                                                           Integer apiId,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer inboundId) {
+
+        return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
+    }
+   //根据物资信息获取原来垛位信息
+   @PostMapping("/selectInfoByMaterialCode")
+   public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
+        if (mal == null) {
+            mal = new HashMap<>();
+        }
+       return  wmsFeign.selectInfoByMaterialCode(mal);
+   }
+   //根据仓库查询未接收的垛位
+   @PostMapping("/selectStackingInfoByWarehouseId")
+   public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
+       if (mal == null) {
+           mal = new HashMap<>();
+       }
+       return  wmsFeign.selectStackingInfoByWarehouseId(mal);
+   }
 
     @PostMapping("/getWmsIvboundResult")
     @ApiOperation(value = "展示倒库实绩信息")
@@ -490,7 +555,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增入库实绩")
     @PostMapping("/insertInboundResult")
     @Transactional
-    public String addInvoice(@RequestBody List<Map<String, Object>> mapList) {
+    public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -498,15 +563,15 @@ public class WMSController extends BaseRESTfulController {
         /*
         获取入库垛位
          */
-        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;
+//        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);
+//        }
+
+        return wmsFeign.insertInboundResult(mapList);
     }
 
     /**
@@ -637,5 +702,82 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.selectMaterialSteelIdByReusltId(map);
     }
 
+    //下发指令给行车工
+    @PostMapping("/updateInstruction")
+    public Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map) {
+        return wmsFeign.updateInstruction(map);
+    }
+
+//    @PostMapping("/selectScanResultByIboundResultId")
+//    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
+//    })
+//    public RESTfulResult selectScanResultByIboundResultId(Map<String, Object> mapValue,
+//                                                          Integer apiId,
+//                                                          Integer pageNum,
+//                                                          Integer pageSize) {
+//        return wmsFeign.selectScanResultByIboundResultId(mapValue, apiId, pageNum, pageSize);
+//    }
 
+    @PostMapping("/getIvboundMakeResultList")
+    @ApiOperation(value = "展示倒库列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                  Integer apiId,
+                                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getIvboundMakeResultList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    /**
+     * 新增倒库作业
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/addIvboundMakeResult")
+    public Map<String,Object> addIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
+        return wmsFeign.addIvboundMakeResult(mapValue);
+    }
+
+    /**
+     * 逻辑删除倒库作业
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/deleteIvboundMakeResult/{resultId}")
+    public Map<String,Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
+        return wmsFeign.deleteIvboundMakeResult(resultId);
+    }
+
+    /**
+     * 查询倒库作业
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/selectIvboundMakeResult/{resultId}")
+    public List<Map<String,Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
+        return wmsFeign.selectIvboundMakeResult(resultId);
+    }
+
+    /**
+     * 修改倒库作业
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/updateIvboundMakeResult")
+    public Map<String,Object> updateIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
+        return wmsFeign.updateIvboundMakeResult(mapValue);
+    }
+    //下发给行车工
+    @PostMapping("/IssueToCrane")
+    Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map){
+        return wmsFeign.IssueToCrane(map);
+    }
 }

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

@@ -1156,12 +1156,12 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
     Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
 
-    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
-    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                      @RequestParam Integer pageNum,
-                                                      @RequestParam Integer pageSize,
-                                                      @RequestParam Integer apiId,
-                                                      @RequestParam String con) ;
+//    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
+//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//                                                      @RequestParam Integer pageNum,
+//                                                      @RequestParam Integer pageSize,
+//                                                      @RequestParam Integer apiId,
+//                                                      @RequestParam String con) ;
 
     @PostMapping("/api/v1/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
     Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,

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

@@ -278,7 +278,7 @@ public interface OmsFeign {
     @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
     Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId);
 
-    @ApiOperation(value="根据运单id关闭订单")
+    @ApiOperation(value="车牌")
     @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityAndDriverList")
     Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                  @RequestParam Integer apiId,
@@ -327,5 +327,26 @@ public interface OmsFeign {
     List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber);
     @PostMapping("api/v1/oms/omstruckorders/driverConfirmation")
     Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @PostMapping("api/v1/oms/omstruckorders/getMessageToApp")
+    Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) ;
+
+    @PostMapping("api/v1/oms/omstruckorders/getAllOrderMessagesByCapacityNum")
+    List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @PostMapping("api/v1/oms/omstruckorders/getReceiveOrderIdListByCapacityNum")
+    List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("api/v1/oms/omstruckorders/getAllRefuseOrderNumberByCapacity")
+    List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @ApiOperation(value = "添加退货实绩关闭当前订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/returnOrderCloseOrder")
+    Map<String, Object> returnOrderCloseOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value = "根据运单id查询实绩位置")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderResult")
+    List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map);
 }
 

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

@@ -361,7 +361,6 @@ public interface RmsFeign {
     //运输类型下拉框
     @GetMapping(value = "api/v1/rms/rmscardriver/getTransportTypeId")
     Map<String,Object> getTransportTypeId();
-
     //    根据id下拉框获取车辆类型
     @GetMapping(value = "api/v1/rms/rmsgatepost/getVehicleTypeId")
     Map<String,Object> getVehicleTypeId();

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

@@ -318,8 +318,12 @@ public interface TmsTruckFeign {
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
-    @PostMapping("/addSteelNzReceiptResult")
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/addSteelNzReceiptResult")
     public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/updateTruckWeight")
+    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList);
 }
 
 

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.feign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -51,13 +52,29 @@ public interface WMSFeign {
     @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/insertWmspOutBoundResult",method = RequestMethod.POST)
     Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval);
 
+    /**
+     * 逻辑删除出库单
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/deletewmspOutboundResult")
+    Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId);
+
     /**
      * 新增出库扫描实绩
-     * @param mapval
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertwmspOutboundScanResult")
+    Map<String,Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 装卸工PDA前端点击出库
+     * @param resultId
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/insertWmspOutboundScanResult")
-    Map<String,Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval);
+    @PostMapping("/api/v1/wms/wmspoutboundresults/outbountResultToSuccess")
+    Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId);
 
     /**
      * 更新出库状态
@@ -190,8 +207,9 @@ public interface WMSFeign {
                                                     @RequestParam Integer pageNum,
                                                     @RequestParam Integer pageSize,
                                                     @RequestParam Integer warehouseid,
-                                                    @RequestParam Integer gradtionNumber,
-                                                    @RequestParam Integer stackingId);
+                                                    @RequestParam Integer stackingId,
+                                                    @RequestParam Integer gradtionNumber
+                                                   );
 
     /**
      *    添加倒垛单实绩
@@ -199,7 +217,12 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/addRestackMakeResult")
-    Map<String,Object> addRestackMakeResult(@RequestBody(required = false) Map<String,Object> mapval);
+    Map<String,Object> addRestackMakeResult(@RequestBody  Map<String,Object> mapval);
+
+
+    @PostMapping("/api/v1/wms/wmsprestackdrivingresults/updateInstruction")
+     Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map);
+
 
 
     /**
@@ -252,7 +275,7 @@ public interface WMSFeign {
      * @return
      */
    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
-   Map<String,Object> selectRestackList(@RequestBody(required = false)
+   Map<String,Object>       selectRestackList     (@RequestBody(required = false) Map<String,Object> map,
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
@@ -287,6 +310,17 @@ public interface WMSFeign {
      */
   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
   Map<String,Object> selectRestackForPDA(@RequestBody(required = false)Map<String,Object> map);
+
+
+
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getRestackInfoByResultId")
+    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam Integer apiId
+
+    );
     /**
      * PDA根据实绩id查找物资信息
      * @param map
@@ -308,6 +342,12 @@ public interface WMSFeign {
      */
    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
    Map<String,Object> ScanTagResult(@RequestBody(required = false)Map<String,Object> mal);
+
+
+
+
+    @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
+    Map<String,Object> getScanResult(@RequestBody Map<String,Object> map);
     /**
      * 库管员下发倒垛单
      * @param mapList
@@ -323,12 +363,30 @@ public interface WMSFeign {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsReboundResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getWmsReboundResult",method = RequestMethod.POST)
     RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize);
 
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer inboundId);
+    //根据物资信息查找暂存的垛位
+    @PostMapping("/api/v1/wms/reboundResult/selectInfoByMaterialCode")
+    Map<String,Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String,Object> mal);
+
+    //根据仓库id查询未接收的垛位
+    @PostMapping("/api/v1/wms/inboundScanResult/selectStackingInfoByWarehouseId")
+    Map<String,Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String,Object> mal);
+
+    //更新垛位
+    @PostMapping("/api/v1/wms/inboundScanResult/updateStatus")
+    Map<String,Object> updateStatus(@RequestBody(required = false) Map<String,Object> mal);
     /**
      * 展示倒库实绩
      * @param mapValue
@@ -344,6 +402,8 @@ public interface WMSFeign {
                                       @RequestParam Integer pageSize);
 
 
+
+
     /**
      * 展示倒库物资实绩
      * @param mapValue
@@ -416,14 +476,14 @@ public interface WMSFeign {
      * 展示退库已下发吊钢工扫描吊牌实绩
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getReIssuedResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getReIssuedResult",method = RequestMethod.POST)
     Map<String,Object>  getIssuedResult();
 
     /**
      * 展示未下发退库吊钢工扫描吊牌实绩
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getReTagResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getReTagResult",method = RequestMethod.POST)
     Map<String,Object>  getReTagResult();
 
     /**
@@ -446,14 +506,14 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/inboundResult/insertInboundResult",method = RequestMethod.POST)
-    String insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
+    Map<String,Object> insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
 
     /**
      * 新增退库实绩，返回选择垛位
      * @param mapList
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/insertReboundResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/insertReboundResult",method = RequestMethod.POST)
     String insertReboundResult(@RequestBody List<Map<String, Object>> mapList);
 
     /**
@@ -512,5 +572,36 @@ public interface WMSFeign {
      */
     @PostMapping(value = "/api/vi/wms/wmsprestackscanresults/selectMaterialSteelIdByReusltId")
     Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map);
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize);
+
+    @RequestMapping(value = "/api/v1/wms/wmspivboundmakeresult/getIvboundMakeResultList",method = RequestMethod.POST)
+    RESTfulResult getIvboundMakeResultList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/addIvboundMakeResult")
+    Map<String, Object> addIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/deleteIvboundMakeResult/{resultId}")
+    Map<String, Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/selectIvboundMakeResult/{resultId}")
+    List<Map<String, Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/updateIvboundMakeResult")
+    Map<String, Object> updateIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
+
+
+    //下发给行车工
+    @PostMapping("/api/v1/wms/reboundResult/IssueToCrane")
+    Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map);
+
 }
 

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

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

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

@@ -13,5 +13,6 @@ public interface UniversalService {
     //打印提货单
     Map<String, Object> printTiHuoDan(String orderNumber);
 
-
+    //查询路段顺序及当前路段顺序号
+    Map<String, Object> getNowLineMes(Map<String, Object> map);
 }

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

@@ -32,4 +32,18 @@ public class UniversalServiceImpl implements UniversalService {
         tiHuoDanMap.put("loadMes", oomMes);
         return tiHuoDanMap;
     }
+
+
+    /**
+     * 查询路段顺序及当前路段顺序号
+     * @param map
+     * @return
+     */
+    @Override
+    public Map<String, Object> getNowLineMes(Map<String, Object> map) {
+
+        return null;
+    }
+
+
 }

src/main/resources/bootstrap.yml

@@ -27,7 +27,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:192.168.1.104:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmstrainFeign:

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

@@ -57,30 +57,28 @@
     </sql>
 
     <!--  模糊查询所有物资  -->
-    <select id="queryMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
+    <select id="queryAPOMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-                SELECT RM.MATERIAL_ID "materialId",
+                SELECT DISTINCT RM.MATERIAL_ID "materialId",
                     RM.MATERIAL_NAME "materialName",
                     RM.MATERIAL_CODE "materialCode",
                     RM.MATERIAL_SPECIFICATION "materialSpecification",
                     RM.MATERIAL_MODEL "materialModel"
-                FROM RMS_MATERIAL RM
+                FROM AMS_PURCHASE_ORDER APO
+                    LEFT JOIN DIL_BATCH DB
+                        ON DB.BATCH_ID = APO.BATCH_ID
+                    LEFT JOIN RMS_MATERIAL RM
+                        ON RM.MATERIAL_ID = DB.MATERIAL_ID
                 <where>
-                    <if test="startNum != null">
-                        RM.MATERIAL_CODE LIKE #{startNum}
-                    </if>
-                    <if test="startNum == null">
-                        RM.MATERIAL_CODE LIKE '010%' OR RM.MATERIAL_CODE LIKE '0801%'
+                    <if test="index != null">
+                        RM.MATERIAL_NAME LIKE #{index}
                     </if>
                 </where>
         )
         <where>
-            <if test="index != null">
-                "materialName" LIKE #{index}
-            </if>
             <if test="materialName != null">
-                and
+
                 <foreach collection="materialName" item="item" open="(" separator="or" close=")">
                  "materialName" like '%${item}%'
                 </foreach>
@@ -117,7 +115,11 @@
         RS.SUPPLIER_NAME "supplierName",
         RS.SUPPLIER_ADDRESS "supplierAddress"
         FROM RMS_SUPPLIER RS
-        WHERE RS.SUPPLIER_NAME LIKE #{index}
+        <where>
+            <if test="index != null">
+                RS.SUPPLIER_NAME LIKE #{index}
+            </if>
+        </where>
         )
         <where>
             <if test="supplierName != null">
@@ -140,21 +142,24 @@
 
     <!--  获取所有的运力信息 -->
     <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 *
+        FROM (
+                 SELECT
+                        RC.CAPACITY_ID        "capacityId",
+                        RC.CAPACITY_NUMBER     "capacityNumber",
+                        RCA.CARRIER_NAME       "carrierName"
+                 FROM RMS_CAPACITY RC
+                          LEFT JOIN RMS_CARRIER RCA
+                                    ON RCA.CARRIER_ID = RC.CARRIER_ID
+                 WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1
+                   <if test="index != null">
+                       and RCA.CARRIER_NAME LIKE #{index}
+                   </if>
+                   <if test="index == null">
+                       and rownum &lt; 21
+                   </if>
+             )
     </select>
 
 <!--    通过订单ID查询物资子表信息  -->
@@ -197,4 +202,113 @@
         </if>
     </select>
 
+<!--  通过物资ID查询该物资的发货单位信息  -->
+    <select id="getSupplierMesByMaterialId" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+                 select distinct RS.SUPPLIER_ID      "supplierId",
+                                 RS.SUPPLIER_NAME    "supplierName",
+                                 RS.SUPPLIER_ADDRESS "supplierAddress"
+                 from DIL_BATCH DB
+                          left join AMS_PURCHASE_ORDER APO
+                                    on apo.BATCH_ID = DB.BATCH_ID
+                          left join RMS_SUPPLIER RS
+                                    on RS.SUPPLIER_ID = apo.SUPPLIER_UNIT_ID
+                 <where>
+                    <if test="materialId != null">
+                        DB.MATERIAL_ID = #{materialId}
+                    </if>
+                 </where>
+             )
+        <where>
+            <if test="index != null">
+                "supplierName" like #{index}
+            </if>
+        </where>
+    </select>
+
+<!--  模糊查询所有的卸货点信息  -->
+    <select id="getUnloadingMesByLike" parameterType="map" resultType="java.util.Map">
+
+        select *
+        from (
+                 select
+                        RW.WAREHOUSE_ID   "warehouseId",
+                        RW.WAREHOUSE_NAME "warehouseName"
+                 from RMS_WAREHOUSE RW
+                 <where>
+                     <if test="type != null">
+                         RW.WAREHOUSE_TYPE_ID = #{type}
+                     </if>
+                 </where>
+             )
+        <where>
+            <if test="index != null">
+                "warehouseName" like #{index}
+            </if>
+            <if test="warehouseName != null">
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "warehouseName" desc
+        </if>
+    </select>
+
+    <!--  模糊查询所有物资  -->
+    <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"
+        FROM RMS_MATERIAL RM
+        <where>
+            <if test="startNum != null">
+                RM.MATERIAL_CODE LIKE #{startNum}
+            </if>
+            <if test="startNum == null">
+                RM.MATERIAL_CODE LIKE '010%' OR RM.MATERIAL_CODE LIKE '0801%'
+            </if>
+        </where>
+        )
+        <where>
+            <if test="index != null">
+                "materialName" LIKE #{index}
+            </if>
+            <if test="materialName != null">
+                and
+                <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>
 </mapper>