修改条码库存记录与产品库存记录前端字段显示问题，添加导出功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/erp/ErpBarcodesInvController.java

@@ -4,22 +4,27 @@ import com.ruoyi.ams.erp.domain.ErpBarcodes;
 import com.ruoyi.ams.erp.service.IErpBarcodesInvService;
 import com.ruoyi.ams.erp.service.IErpBarcodesService;
 import com.ruoyi.ams.order.erp.ErpBarCodesVO;
+import com.ruoyi.ams.order.exceBean.ErpBarCodes;
+import com.ruoyi.ams.order.exceBean.ErpSku;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 条码库存记录表Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-03-10
  */
@@ -51,8 +56,13 @@ public class ErpBarcodesInvController extends BaseController
     public void export(HttpServletResponse response, ErpBarcodes erpBarcodes)
     {
         List<ErpBarCodesVO> list = erpBarcodesInvService.selectErpBarcodesList(erpBarcodes);
-        ExcelUtil<ErpBarCodesVO> util = new ExcelUtil<ErpBarCodesVO>(ErpBarCodesVO.class);
-        util.exportExcel(response, list, "条码扫描记录表数据");
+        List<ErpBarCodes> collect = list.stream().map(item -> {
+            ErpBarCodes erpBarCodes = new ErpBarCodes();
+            BeanUtils.copyBeanProp(erpBarCodes, item);
+            return erpBarCodes;
+        }).collect(Collectors.toList());
+        ExcelUtil<ErpBarCodes> util = new ExcelUtil<ErpBarCodes>(ErpBarCodes.class);
+        util.exportExcel(response, collect, "条码扫描记录表数据");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/erp/ErpSkuInvController.java

@@ -3,22 +3,26 @@ package com.ruoyi.web.controller.warewms.wms.erp;
 import com.ruoyi.ams.erp.domain.ErpBarcodes;
 import com.ruoyi.ams.erp.service.IErpSkuInvService;
 import com.ruoyi.ams.order.erp.ErpBarCodesVO;
+import com.ruoyi.ams.order.exceBean.ErpSku;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 产品库存记录 Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-03-10
  */
@@ -50,8 +54,13 @@ public class ErpSkuInvController extends BaseController
     public void export(HttpServletResponse response, ErpBarcodes erpBarcodes)
     {
         List<ErpBarCodesVO> list = erpSkuInvService.selectErpBarcodesList(erpBarcodes);
-        ExcelUtil<ErpBarCodesVO> util = new ExcelUtil<ErpBarCodesVO>(ErpBarCodesVO.class);
-        util.exportExcel(response, list, "条码扫描记录表数据");
+        List<ErpSku> collect = list.stream().map(item -> {
+            ErpSku erpSku = new ErpSku();
+            BeanUtils.copyBeanProp(erpSku, item);
+            return erpSku;
+        }).collect(Collectors.toList());
+        ExcelUtil<ErpSku> util = new ExcelUtil<ErpSku>(ErpSku.class);
+        util.exportExcel(response, collect, "条码扫描记录表数据");
     }
 
     /**

ruoyi-ui/src/views/wms/barcodesinv/index.vue

@@ -10,15 +10,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仓库id" prop="stockId">
-        <el-input
-          v-model="queryParams.stockId"
-          placeholder="请输入仓库id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="货架编号" prop="locationNo">
         <el-input
           v-model="queryParams.locationNo"
@@ -61,7 +52,7 @@
       </el-form-item>
     </el-form>
 
-<!--     <el-row :gutter="10" class="mb8">-->
+     <el-row :gutter="10" class="mb8">
 <!--       <el-col :span="1.5">-->
 <!--         <el-button-->
 <!--           type="primary"-->
@@ -94,22 +85,21 @@
 <!--           v-hasPermi="['system:barcodes:remove']"-->
 <!--         >删除</el-button>-->
 <!--       </el-col>-->
-<!--       <el-col :span="1.5">-->
-<!--         <el-button-->
-<!--           type="warning"-->
-<!--           plain-->
-<!--           icon="el-icon-download"-->
-<!--           size="mini"-->
-<!--           @click="handleExport"-->
-<!--           v-hasPermi="['system:skuinv:export']"-->
-<!--         >导出</el-button>-->
-<!--       </el-col>-->
+       <el-col :span="1.5">
+         <el-button
+           type="warning"
+           plain
+           icon="el-icon-download"
+           size="mini"
+           @click="handleExport"
+           v-hasPermi="['system:skuinv:export']"
+         >导出</el-button>
+       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-
+     </el-row>
     <el-table v-loading="loading" :data="barcodesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="条码号" align="center" prop="lotatt02" />
-      <el-table-column label="仓库id" align="center" prop="stockId" />
       <el-table-column label="货架编号" align="center" prop="locationNo" />
       <el-table-column label="栈板号" align="center" prop="boxNo" />
       <el-table-column label="批次" align="center" prop="lotnum" />
@@ -326,7 +316,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/barcodesinv/export', {
+      this.download('erp/barcodesinv/export', {
         ...this.queryParams
       }, `barcodes_${new Date().getTime()}.xlsx`)
     }

ruoyi-ui/src/views/wms/skuinv/index.vue

@@ -10,15 +10,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仓库id" prop="stockId">
-        <el-input
-          v-model="queryParams.stockId"
-          placeholder="请输入仓库id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="货架编号" prop="locationNo">
         <el-input
           v-model="queryParams.locationNo"
@@ -43,7 +34,7 @@
       </el-form-item>
     </el-form>
 
-<!--     <el-row :gutter="10" class="mb8">-->
+     <el-row :gutter="10" class="mb8">
 <!--       <el-col :span="1.5">-->
 <!--         <el-button-->
 <!--           type="primary"-->
@@ -76,23 +67,22 @@
 <!--           v-hasPermi="['system:barcodes:remove']"-->
 <!--         >删除</el-button>-->
 <!--       </el-col>-->
-<!--       <el-col :span="1.5">-->
-<!--         <el-button-->
-<!--           type="warning"-->
-<!--           plain-->
-<!--           icon="el-icon-download"-->
-<!--           size="mini"-->
-<!--           @click="handleExport"-->
-<!--           v-hasPermi="['system:skuinv:export']"-->
-<!--         >导出</el-button>-->
-<!--       </el-col>-->
+       <el-col :span="1.5">
+         <el-button
+           type="warning"
+           plain
+           icon="el-icon-download"
+           size="mini"
+           @click="handleExport"
+           v-hasPermi="['system:skuinv:export']"
+         >导出</el-button>
+       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="barcodesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ERP品号" align="center" prop="barcode" />
-      <el-table-column label="仓库id" align="center" prop="stockId" />
+      <el-table-column label="ERP品号" align="center" prop="sku" />
       <el-table-column label="货架编号" align="center" prop="locationNo" />
       <el-table-column label="栈板号" align="center" prop="boxNo" />
       <el-table-column label="单位" align="center" prop="userdefine1" />
@@ -314,7 +304,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/skuinv/export', {
+      this.download('erp/skuinv/export', {
         ...this.queryParams
       }, `barcodes_${new Date().getTime()}.xlsx`)
     }

warewms-ams/src/main/java/com/ruoyi/ams/erp/domain/ErpBarcodes.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 条码扫描记录表对象 erp_barcodes
- * 
+ *
  * @author ruoyi
  * @date 2023-03-10
  */
@@ -24,7 +24,6 @@ public class ErpBarcodes extends BaseEntity
     private String barcode;
 
     /** 仓库id */
-    @Excel(name = "仓库id")
     private String stockId;
 
     /** 货架编号 */
@@ -44,7 +43,6 @@ public class ErpBarcodes extends BaseEntity
     private BigDecimal qty;
 
     /** 入库/出库 */
-    @Excel(name = "入库/出库")
     private String type;
 
     /** erp单号 */
@@ -52,213 +50,203 @@ public class ErpBarcodes extends BaseEntity
     private String erpNo;
 
     /** 项次 */
-    @Excel(name = "项次")
     private String erpName;
 
     /** erp单据类型 */
-    @Excel(name = "erp单据类型")
     private String erpType;
 
     /** 预留字段1 */
-    @Excel(name = "预留字段1")
     private String userdefine1;
 
     /** 预留字段2 */
-    @Excel(name = "预留字段2")
     private String userdefine2;
 
     /** 预留字段3 */
-    @Excel(name = "预留字段3")
     private String userdefine3;
 
     /** 预留字段4 */
-    @Excel(name = "预留字段4")
     private String userdefine4;
 
     /** 预留字段5 */
-    @Excel(name = "预留字段5")
     private String userdefine5;
 
     /** 预留字段3 */
-    @Excel(name = "预留字段3")
     private String userdefine6;
 
     /** 预留字段4 */
-    @Excel(name = "预留字段4")
     private String userdefine7;
 
     /** 预留字段5 */
-    @Excel(name = "预留字段5")
     private String userdefine8;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setBarcode(String barcode) 
+    public void setBarcode(String barcode)
     {
         this.barcode = barcode;
     }
 
-    public String getBarcode() 
+    public String getBarcode()
     {
         return barcode;
     }
-    public void setStockId(String stockId) 
+    public void setStockId(String stockId)
     {
         this.stockId = stockId;
     }
 
-    public String getStockId() 
+    public String getStockId()
     {
         return stockId;
     }
-    public void setLocationNo(String locationNo) 
+    public void setLocationNo(String locationNo)
     {
         this.locationNo = locationNo;
     }
 
-    public String getLocationNo() 
+    public String getLocationNo()
     {
         return locationNo;
     }
-    public void setBoxNo(String boxNo) 
+    public void setBoxNo(String boxNo)
     {
         this.boxNo = boxNo;
     }
 
-    public String getBoxNo() 
+    public String getBoxNo()
     {
         return boxNo;
     }
-    public void setLotnum(String lotnum) 
+    public void setLotnum(String lotnum)
     {
         this.lotnum = lotnum;
     }
 
-    public String getLotnum() 
+    public String getLotnum()
     {
         return lotnum;
     }
-    public void setQty(BigDecimal qty) 
+    public void setQty(BigDecimal qty)
     {
         this.qty = qty;
     }
 
-    public BigDecimal getQty() 
+    public BigDecimal getQty()
     {
         return qty;
     }
-    public void setType(String type) 
+    public void setType(String type)
     {
         this.type = type;
     }
 
-    public String getType() 
+    public String getType()
     {
         return type;
     }
-    public void setErpNo(String erpNo) 
+    public void setErpNo(String erpNo)
     {
         this.erpNo = erpNo;
     }
 
-    public String getErpNo() 
+    public String getErpNo()
     {
         return erpNo;
     }
-    public void setErpName(String erpName) 
+    public void setErpName(String erpName)
     {
         this.erpName = erpName;
     }
 
-    public String getErpName() 
+    public String getErpName()
     {
         return erpName;
     }
-    public void setErpType(String erpType) 
+    public void setErpType(String erpType)
     {
         this.erpType = erpType;
     }
 
-    public String getErpType() 
+    public String getErpType()
     {
         return erpType;
     }
-    public void setUserdefine1(String userdefine1) 
+    public void setUserdefine1(String userdefine1)
     {
         this.userdefine1 = userdefine1;
     }
 
-    public String getUserdefine1() 
+    public String getUserdefine1()
     {
         return userdefine1;
     }
-    public void setUserdefine2(String userdefine2) 
+    public void setUserdefine2(String userdefine2)
     {
         this.userdefine2 = userdefine2;
     }
 
-    public String getUserdefine2() 
+    public String getUserdefine2()
     {
         return userdefine2;
     }
-    public void setUserdefine3(String userdefine3) 
+    public void setUserdefine3(String userdefine3)
     {
         this.userdefine3 = userdefine3;
     }
 
-    public String getUserdefine3() 
+    public String getUserdefine3()
     {
         return userdefine3;
     }
-    public void setUserdefine4(String userdefine4) 
+    public void setUserdefine4(String userdefine4)
     {
         this.userdefine4 = userdefine4;
     }
 
-    public String getUserdefine4() 
+    public String getUserdefine4()
     {
         return userdefine4;
     }
-    public void setUserdefine5(String userdefine5) 
+    public void setUserdefine5(String userdefine5)
     {
         this.userdefine5 = userdefine5;
     }
 
-    public String getUserdefine5() 
+    public String getUserdefine5()
     {
         return userdefine5;
     }
-    public void setUserdefine6(String userdefine6) 
+    public void setUserdefine6(String userdefine6)
     {
         this.userdefine6 = userdefine6;
     }
 
-    public String getUserdefine6() 
+    public String getUserdefine6()
     {
         return userdefine6;
     }
-    public void setUserdefine7(String userdefine7) 
+    public void setUserdefine7(String userdefine7)
     {
         this.userdefine7 = userdefine7;
     }
 
-    public String getUserdefine7() 
+    public String getUserdefine7()
     {
         return userdefine7;
     }
-    public void setUserdefine8(String userdefine8) 
+    public void setUserdefine8(String userdefine8)
     {
         this.userdefine8 = userdefine8;
     }
 
-    public String getUserdefine8() 
+    public String getUserdefine8()
     {
         return userdefine8;
     }

warewms-ams/src/main/java/com/ruoyi/ams/order/erp/ErpBarCodesVO.java

@@ -1,18 +1,26 @@
 package com.ruoyi.ams.order.erp;
 
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 
 
 @Data
 public class ErpBarCodesVO {
     private String stockId;     //仓库id
+    @Excel(name = "货架编号")
     private String locationNo;  //货架编号
+    @Excel(name = "栈板号")
     private String boxNo;       //栈板号
     private String userdefine1;      //单位
+    @Excel(name = "数量")
     private String qty;         //数量
+    @Excel(name = "条码号")
     private String lotatt02;    //条码号
+    @Excel(name = "产品")
     private String sku;         //产品
     private String skuType;     //产品类型
+    @Excel(name = "ERP品号")
     private String barcode;     //ERP品号
+    @Excel(name = "批次")
     private String lotnum;      //批次号
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/exceBean/ErpBarCodes.java

@@ -0,0 +1,24 @@
+package com.ruoyi.ams.order.exceBean;
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+
+@Data
+public class ErpBarCodes {
+    private String stockId;     //仓库id
+    @Excel(name = "货架编号")
+    private String locationNo;  //货架编号
+    @Excel(name = "栈板号")
+    private String boxNo;       //栈板号
+    private String userdefine1;      //单位
+    @Excel(name = "数量")
+    private String qty;         //数量
+    @Excel(name = "条码号")
+    private String lotatt02;    //条码号
+    private String sku;         //产品
+    private String skuType;     //产品类型
+    private String barcode;     //ERP品号
+    @Excel(name = "批次")
+    private String lotnum;      //批次号
+}

warewms-ams/src/main/java/com/ruoyi/ams/order/exceBean/ErpSku.java

@@ -0,0 +1,25 @@
+package com.ruoyi.ams.order.exceBean;
+
+import com.ruoyi.ams.order.erp.ErpBarCodesVO;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+
+@Data
+public class ErpSku {
+    private String stockId;     //仓库id
+    @Excel(name = "货架编号")
+    private String locationNo;  //货架编号
+    @Excel(name = "栈板号")
+    private String boxNo;       //栈板号
+    private String userdefine1;      //单位
+    @Excel(name = "数量")
+    private String qty;         //数量
+    private String lotatt02;    //条码号
+    @Excel(name = "产品")
+    private String sku;         //产品
+    @Excel(name = "产品类型")
+    private String skuType;     //产品类型
+    private String barcode;     //ERP品号
+    private String lotnum;      //批次号
+}

warewms-ams/src/main/resources/mapper/erp/ErpBarcodesInvMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.ams.erp.mapper.ErpBarcodesInvMapper">
-    
+
     <resultMap type="ErpBarcodes" id="ErpBarcodesResult">
         <result property="id"    column="id"    />
         <result property="barcode"    column="barcode"    />
@@ -46,13 +46,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectErpBarcodesList"  resultMap="ErpBarcodesVOResult">
-        select csr.sn as lotatt02,eb.stock_id as stockId,bli.location_no as locationNo,eb.box_no as boxNo,illa.lotnum as lotnum,illa.qty as qty
+        select csr.sn as lotatt02,ila.lotatt07 AS boxNo,bli.location_no as locationNo,illa.lotnum as lotnum,illa.qty as qty
         from inv_lot_loc_id illa
         LEFT JOIN inv_lot_att ila on ila.lotnum = illa.lotnum
         LEFT JOIN base_location_info bli on bli.id = illa.location_id
         LEFT JOIN erp_barcodes eb on eb.lotnum = illa.lotnum
         LEFT JOIN code_sku_relationship csr on csr.sn = ila.lotatt02
-        <where>  
+        <where>
             <if test="barcode != null  and barcode != ''"> and barcode = #{barcode}</if>
             <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
             <if test="locationNo != null  and locationNo != ''"> and location_no = #{locationNo}</if>
@@ -73,12 +73,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userdefine8 != null  and userdefine8 != ''"> and userdefine8 = #{userdefine8}</if>
         </where>
     </select>
-    
+
     <select id="selectErpBarcodesById" parameterType="Long" resultMap="ErpBarcodesResult">
         <include refid="selectErpBarcodesVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertErpBarcodes" parameterType="ErpBarcodes" useGeneratedKeys="true" keyProperty="id">
         insert into erp_barcodes
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -165,9 +165,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteErpBarcodesByIds" parameterType="String">
-        delete from erp_barcodes where id in 
+        delete from erp_barcodes where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>

warewms-ams/src/main/resources/mapper/erp/ErpSkuInvMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.ams.erp.mapper.ErpSkuInvMapper">
-    
+
     <resultMap type="ErpBarcodes" id="ErpBarcodesResult">
         <result property="id"    column="id"    />
         <result property="barcode"    column="barcode"    />
@@ -46,39 +46,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectErpBarcodesList"  resultMap="ErpBarcodesVOResult">
-        select eb.erp_no as barcode,eb.stock_id as stockId,bli.location_no as locationNo,eb.box_no as boxNo,illa.lotnum as userdefine1,illa.qty as qty,bs.sku as sku,bst.item_name as skuType
-        from inv_lot_loc_id illa
-        LEFT JOIN base_sku bs on bs.sku = illa.sku
-        LEFT JOIN base_sku_type bst on bst.item_code = bs.sku_type
-        LEFT JOIN base_location_info bli on bli.id = illa.location_id
-        LEFT JOIN erp_barcodes eb on eb.lotnum = illa.lotnum
-        <where>  
-            <if test="barcode != null  and barcode != ''"> and barcode = #{barcode}</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="locationNo != null  and locationNo != ''"> and location_no = #{locationNo}</if>
-            <if test="boxNo != null  and boxNo != ''"> and box_no = #{boxNo}</if>
-            <if test="lotnum != null  and lotnum != ''"> and lotnum = #{lotnum}</if>
-            <if test="qty != null "> and qty = #{qty}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="erpNo != null  and erpNo != ''"> and erp_no = #{erpNo}</if>
-            <if test="erpName != null  and erpName != ''"> and erp_name like concat('%', #{erpName}, '%')</if>
-            <if test="erpType != null  and erpType != ''"> and erp_type = #{erpType}</if>
-            <if test="userdefine1 != null  and userdefine1 != ''"> and userdefine1 = #{userdefine1}</if>
-            <if test="userdefine2 != null  and userdefine2 != ''"> and userdefine2 = #{userdefine2}</if>
-            <if test="userdefine3 != null  and userdefine3 != ''"> and userdefine3 = #{userdefine3}</if>
-            <if test="userdefine4 != null  and userdefine4 != ''"> and userdefine4 = #{userdefine4}</if>
-            <if test="userdefine5 != null  and userdefine5 != ''"> and userdefine5 = #{userdefine5}</if>
-            <if test="userdefine6 != null  and userdefine6 != ''"> and userdefine6 = #{userdefine6}</if>
-            <if test="userdefine7 != null  and userdefine7 != ''"> and userdefine7 = #{userdefine7}</if>
-            <if test="userdefine8 != null  and userdefine8 != ''"> and userdefine8 = #{userdefine8}</if>
+        SELECT
+        eb.erp_no AS barcode,
+        eb.stock_id AS stockId,
+        bli.location_no AS locationNo,
+        ila.lotatt07 AS boxNo,
+        illa.lotnum AS userdefine1,
+        illa.qty AS qty,
+        bs.sku AS sku,
+        bst.item_name AS skuType
+        FROM
+        inv_lot_loc_id illa
+        LEFT JOIN inv_lot_att ila on ila.lotnum = illa.lotnum
+        LEFT JOIN base_sku bs ON bs.sku = illa.sku
+        LEFT JOIN base_sku_type bst ON bst.item_code = bs.sku_type
+        LEFT JOIN base_location_info bli ON bli.id = illa.location_id
+        LEFT JOIN erp_barcodes eb ON eb.lotnum = illa.lotnum
+        <where>
+            <if test="barcode != null  and barcode != ''">and barcode = #{barcode}</if>
+            <if test="stockId != null  and stockId != ''">and stock_id = #{stockId}</if>
+            <if test="locationNo != null  and locationNo != ''">and location_no = #{locationNo}</if>
+            <if test="boxNo != null  and boxNo != ''">and box_no = #{boxNo}</if>
+            <if test="lotnum != null  and lotnum != ''">and lotnum = #{lotnum}</if>
+            <if test="qty != null ">and qty = #{qty}</if>
+            <if test="type != null  and type != ''">and type = #{type}</if>
+            <if test="erpNo != null  and erpNo != ''">and erp_no = #{erpNo}</if>
+            <if test="erpName != null  and erpName != ''">and erp_name like concat('%', #{erpName}, '%')</if>
+            <if test="erpType != null  and erpType != ''">and erp_type = #{erpType}</if>
+            <if test="userdefine1 != null  and userdefine1 != ''">and userdefine1 = #{userdefine1}</if>
+            <if test="userdefine2 != null  and userdefine2 != ''">and userdefine2 = #{userdefine2}</if>
+            <if test="userdefine3 != null  and userdefine3 != ''">and userdefine3 = #{userdefine3}</if>
+            <if test="userdefine4 != null  and userdefine4 != ''">and userdefine4 = #{userdefine4}</if>
+            <if test="userdefine5 != null  and userdefine5 != ''">and userdefine5 = #{userdefine5}</if>
+            <if test="userdefine6 != null  and userdefine6 != ''">and userdefine6 = #{userdefine6}</if>
+            <if test="userdefine7 != null  and userdefine7 != ''">and userdefine7 = #{userdefine7}</if>
+            <if test="userdefine8 != null  and userdefine8 != ''">and userdefine8 = #{userdefine8}</if>
         </where>
     </select>
-    
+
     <select id="selectErpBarcodesById" parameterType="Long" resultMap="ErpBarcodesResult">
         <include refid="selectErpBarcodesVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertErpBarcodes" parameterType="ErpBarcodes" useGeneratedKeys="true" keyProperty="id">
         insert into erp_barcodes
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -165,9 +175,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteErpBarcodesByIds" parameterType="String">
-        delete from erp_barcodes where id in 
+        delete from erp_barcodes where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>