合并冲突

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

@@ -1205,4 +1205,72 @@ public class AMScontroller{
     public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId){
         return amsFeign.finishTruckPlan(planId);
     }
+
+
+    //零星订单=======================================================================================================================================================
+
+    @ApiModelProperty(value = "查询零星物资订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "384", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getSporadicOrdersList")
+    public RESTfulResult getSporadicOrdersList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer orderType,
+                                            Integer issueStatus,
+                                            String con) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con);
+    }
+
+    @ApiModelProperty(value = "查看物资详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "385", required = false, dataType = "Integer")
+    })
+    @PostMapping("/seeAllMaterials")
+    public RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer sporadicOrderId,
+                                                     String con){
+        return amsFeign.seeAllMaterials(mapValue,apiId,pageNum,pageSize,sporadicOrderId,con);
+    }
+
+    @ApiOperation(value="逻辑删除零星物资订单")
+    @PostMapping("/deleteSporadicOrders")
+    public Map<String, Object> deleteSporadicOrders(@RequestParam Integer sporadicOrderId) {
+        return amsFeign.deleteSporadicOrders(sporadicOrderId);
+    }
+
+    @ApiOperation(value="下发零星物资订单")
+    @PostMapping("/issueSporadicOrders")
+    public Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList) {
+        return amsFeign.issueSporadicOrders(mapList);
+    }
+
+    @ApiOperation(value="新增零星物资进出厂（以及销售钢材退货）")
+    @PostMapping("/addSporadicOrders")
+    public Map<String, Object> addSporadicOrders(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addSporadicOrders(mapValue);
+    }
+
+    @ApiOperation(value="查询修改渲染")
+    @PostMapping("/selectSporadicOrder")
+    public RESTfulResult selectSporadicOrder(@RequestParam Integer sporadicOrderId) {
+        return amsFeign.selectSporadicOrder(sporadicOrderId);
+    }
+
+    @ApiOperation(value="修改零星物资订单")
+    @PostMapping("/updateSporadicOrder")
+    public Map<String,Object> updateSporadicOrder(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.updateSporadicOrder(mapValue);
+    }
+
+
 }

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

@@ -180,6 +180,23 @@ public class RMScontroller {
     public Map<String, Object> getCarrierById(@PathVariable("id")BigDecimal id){
         return rmsFeign.getCarrierById(id);
     }
+//    获取中标区域
+    @ApiOperation(value="展示中标区域信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "406", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "id", value = "中标id", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getCarrierBidAreaList")
+    public Map<String, Object> getCarrierBidAreaList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
+    ){
+        return   rmsFeign.getCarrierBidAreaList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
 
     //获取物资列表
     @ApiOperation(value="获取物资列表")
@@ -242,7 +259,6 @@ public class RMScontroller {
                                                 Integer apiId,
                                                 Integer pageNum,
                                                 Integer pageSize,
-
                                                 String con
     ){
 
@@ -718,7 +734,7 @@ public class RMScontroller {
         return rmsFeign.insertNotice(map);
     }
 
-    @ApiOperation(value = "更新油价信息", notes = "根据dilNotice对象创建")
+    @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
     @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
     @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
     public Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map) {
@@ -741,6 +757,58 @@ public class RMScontroller {
         return rmsFeign.getNoticeById(id);
     }
 
+    //油价
+    @ApiOperation(value = "获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+
+    @PostMapping(value = "/getOilPriceResultList")
+    public Map<String, Object> getOilPriceResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return rmsFeign.getOilPriceResultList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="新增油价信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "addOilPrice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/insertOilPrice")
+    public Map<String, Object> insertOilPrice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertOilPrice(map);
+    }
+
+    @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
+    @PostMapping(value = "/updateOilPrice", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.updateOilPrice(map);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/deleteOilPrice/{id}")//BigDecimal
+    public Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id) {
+        return rmsFeign.deleteOilPrice(id);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getOilPriceById/{id}")
+    public Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getOilPriceById(id);
+    }
+
 
 //*******************************下拉框************************
 

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

@@ -143,7 +143,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiOperation(value="通过订单ID查询订单下所有物资")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(395)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
@@ -311,4 +311,57 @@ public class UniversalController extends BaseRESTfulController {
         List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index);
         return success(list);
     }
+
+    @ApiModelProperty(value = "模糊查询收货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "396", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryConsigneeByLike")
+    public RESTfulResult queryConsigneeByLike(@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.queryConsigneeByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryConsigneeByLike(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 = "395", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/selectAllMaterialName")
+    public RESTfulResult selectAllMaterialName(@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.selectAllMaterialName(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.selectAllMaterialName(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
 }

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

@@ -372,12 +372,11 @@ public class WMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
     })
     public RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer apiId,
-                                                          Integer pageNum,
-                                                          Integer pageSize,
-                                                          Integer inboundId
+                                                          @RequestParam Integer apiId,
+                                                          @RequestParam Integer pageNum,
+                                                          @RequestParam Integer pageSize,
+                                                          @RequestParam Integer inboundId
     ) {
-
         return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
     }
     //根据物资信息获取原来垛位信息

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

@@ -5,9 +5,7 @@ import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -18,6 +16,8 @@ import java.util.Map;
  * @GreateTime:2021/10/12 9:54
  * @Version:V2.0
  */
+@RestController
+@RequestMapping("${api.version}/wmsh")
 public class WMSHController extends BaseRESTfulController {
 
     @Autowired

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

@@ -1235,4 +1235,37 @@ public interface AmsFeign {
 
     @PostMapping("/api/v1/ams/amstruckinwardplan/finishTruckPlan/{planId}")
     public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId);
+
+    //零星订单================================================================================================================================
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/getSporadicOrdersList")
+    RESTfulResult getSporadicOrdersList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer orderType,
+                                              @RequestParam Integer issueStatus,
+                                              @RequestParam String con);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
+    RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer sporadicOrderId,
+                                              @RequestParam String con);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/deleteSporadicOrders")
+    Map<String, Object> deleteSporadicOrders(@RequestParam Integer sporadicOrderId);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/issueSporadicOrders")
+    Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/addSporadicOrders")
+    Map<String, Object> addSporadicOrders(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/selectSporadicOrder")
+    RESTfulResult selectSporadicOrder(@RequestParam Integer sporadicOrderId);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/updateSporadicOrder")
+    Map<String, Object> updateSporadicOrder(@RequestBody Map<String, Object> mapValue);
 }

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

@@ -108,6 +108,13 @@ public interface RmsFeign {
     //    根据id获取承运商信息
     @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierById/{id}")
     Map<String, Object> getCarrierById(@PathVariable("id") BigDecimal id);
+//    展示中标区域
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierBidAreaList")
+    Map<String, Object> getCarrierBidAreaList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam String con);
 
     //获取物资列表
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialList")
@@ -416,6 +423,29 @@ public interface RmsFeign {
     Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);
 
 
+    //油价
+    @PostMapping(value = "/api/v1/rms/rmsoilprice/getOilPriceResultList")
+    Map<String, Object> getOilPriceResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("con") String con);
+    //新增油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/insertOilPrice")
+    Map<String,Object> insertOilPrice(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/deleteOilPrice/{id}")
+    Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id);
+
+    //更新油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/updateOilPrice")
+    Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据id获取油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/getOilPriceById/{id}")
+    Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id);
+
 //******************************************下拉框*******************************
 
 
@@ -424,4 +454,5 @@ public interface RmsFeign {
     Map<String,Object> getNoticeTypeId();
 
 
+
 }

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

@@ -350,7 +350,7 @@ public interface WMSFeign {
 
 
     @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
-    Map<String,Object> getScanResult(@RequestBody Map<String,Object> map);
+    Map<String,Object> getScanResult(@RequestBody(required = false) Map<String,Object> map);
     /**
      * 库管员下发倒垛单
      * @param mapList
@@ -374,7 +374,7 @@ public interface WMSFeign {
                                       @RequestParam String con);
 
 
-    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
     RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,

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

@@ -50,4 +50,9 @@ public interface UniversalMapper {
     //承运商边输边查
     List<Map<String, Object>> getCarrierMesByLike(String index);
 
+    // 收货单位
+    List<Map<String, Object>> queryConsigneeByLike(Map<String, Object> mapValue);
+
+    // 所有物资
+    List<Map<String, Object>> selectAllMaterialName(Map<String, Object> mapValue);
 }

src/main/resources/bootstrap.yml

@@ -50,7 +50,7 @@ openfeign:
     OMSFeign:
       url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
-      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
+      url: ${RMSFEIGN_URL:172.16.33.166:8060}
 
   #测试环境
 #  ColumnDataFeign:

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

@@ -172,7 +172,11 @@
                  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="orderId != null" >
+                         OOM.ORDER_ID = #{orderId}
+                     </if>
+                 </where>
              )
         <where>
             <if test="materialName != null">
@@ -198,7 +202,47 @@
             order by "materialName" desc
         </if>
     </select>
-
+    <!--查询所有物资-->
+    <select id="selectAllMaterialName" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM (
+        select distinct RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_ID AS "materialId"
+        from RMS_MATERIAL RM
+        <where>
+            <if test="index != null">
+                RM.MATERIAL_NAME like #{index}
+            </if>
+        </where>
+        )
+        <where>
+        <if test="materialName != null">
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+            "materialName" 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>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
 <!--  通过物资ID查询该物资的发货单位信息  -->
     <select id="getSupplierMesByMaterialId" parameterType="java.util.Map" resultType="java.util.Map">
         select *
@@ -355,17 +399,15 @@
         </if>
     </select>
 
-<!-- 边输边查承运商   -->
+    <!-- 边输边查承运商   -->
     <select id="getCarrierMesByLike" parameterType="string" resultType="java.util.Map">
         select
         *
         from(
         select
             RC.CARRIER_ID "carrierId",
-            RC.CARRIER_NAME "carrierName"
+            RC.CARRIER_NAME "value"
         from RMS_CARRIER RC
-        order by "carrierName"
-        )
         <where>
             <if test="index != null">
                 "carrierName"  like #{index}
@@ -375,6 +417,34 @@
                 rownum &lt; 10
             </if>
         </where>
+        order by "value"
+        )
+    </select>
+
+    <select id="queryConsigneeByLike" resultType="java.util.Map" parameterType="java.util.Map" >
+        SELECT * FROM (
+        SELECT
+        RCO.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
+        RCO.CONSIGNEE_CODE AS "consigneeCode",
+        RCO.CONSIGNEE_ID AS "consigneeId"
+        FROM RMS_CONSIGNEE RCO
+        <where>
+            <if test="index != null">
+                RCO.CONSIGNEE_COMPANY_NAME like #{index}
+            </if>
+        </where>
+        )
+        <if test="consigneeCompanyName != null">
+            <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                "consigneeCompanyName" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="consigneeCode != null">
+            and
+            <foreach collection="consigneeCode" item="item" open="(" separator="or" close=")">
+                "consigneeCode" like '%${item}%'
+            </foreach>
+        </if>
     </select>
 
 <!--  通过订单ID查询订单下所有物资  -->