称重展示（前端）

ruoyi-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: dev
   # 文件上传
   servlet:
     multipart:

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

@@ -1,179 +1,196 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="批次" prop="lotnum">
+<!--      <el-form-item label="批次" prop="lotnum">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.lotnum"-->
+<!--          placeholder="请输入批次"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="产品" prop="lotatt02">
         <el-input
-          v-model="queryParams.lotnum"
-          placeholder="请输入批次"
+          v-model="queryParams.lotatt02"
+          placeholder="请输入产品"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="num">
+      <el-form-item label="生产批号" prop="lotatt01">
         <el-input
-          v-model="queryParams.num"
-          placeholder="请输入${comment}"
+          v-model="queryParams.lotatt01"
+          placeholder="请输入生产批号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="ext1">
+      <el-form-item label="班" prop="lotatt09">
         <el-input
-          v-model="queryParams.ext1"
-          placeholder="请输入${comment}"
+          v-model="queryParams.lotatt09"
+          placeholder="请输入班"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="ext2">
+      <el-form-item label="包装工" prop="lotatt06">
         <el-input
-          v-model="queryParams.ext2"
-          placeholder="请输入${comment}"
+          v-model="queryParams.lotatt06"
+          placeholder="请输入包装工"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="ext3">
+      <el-form-item label="托盘号" prop="lotatt07">
         <el-input
-          v-model="queryParams.ext3"
-          placeholder="请输入${comment}"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="ext4">
-        <el-input
-          v-model="queryParams.ext4"
-          placeholder="请输入${comment}"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="ext5">
-        <el-input
-          v-model="queryParams.ext5"
-          placeholder="请输入${comment}"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="ext6">
-        <el-input
-          v-model="queryParams.ext6"
-          placeholder="请输入${comment}"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="ext7">
-        <el-input
-          v-model="queryParams.ext7"
-          placeholder="请输入${comment}"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="ext8">
-        <el-input
-          v-model="queryParams.ext8"
-          placeholder="请输入${comment}"
+          v-model="queryParams.lotatt07"
+          placeholder="请输入托盘号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+<!--      <el-form-item label="${comment}" prop="lotatt05">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.ext4"-->
+<!--          placeholder="请输入${comment}"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="${comment}" prop="lotatt06">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.ext5"-->
+<!--          placeholder="请输入${comment}"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="${comment}" prop="lotatt07">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.ext6"-->
+<!--          placeholder="请输入${comment}"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="${comment}" prop="ext7">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.ext7"-->
+<!--          placeholder="请输入${comment}"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="${comment}" prop="lotatt08">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.ext8"-->
+<!--          placeholder="请输入${comment}"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:data:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:data:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:data: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:data:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:data:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['system:data:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:data: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:data:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
-      <el-table-column label="批次" align="center" prop="lotnum" />
-      <el-table-column label="${comment}" align="center" prop="num" />
-      <el-table-column label="${comment}" align="center" prop="ext1" />
-      <el-table-column label="${comment}" align="center" prop="ext2" />
-      <el-table-column label="${comment}" align="center" prop="ext3" />
-      <el-table-column label="${comment}" align="center" prop="ext4" />
-      <el-table-column label="${comment}" align="center" prop="ext5" />
-      <el-table-column label="${comment}" align="center" prop="ext6" />
-      <el-table-column label="${comment}" align="center" prop="ext7" />
-      <el-table-column label="${comment}" align="center" prop="ext8" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:data:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:data:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+      <el-table-column label="包装时间" align="center" prop="lotatt03" />
+      <el-table-column label="包装工" align="center" prop="lotatt06" />
+      <el-table-column label="班" align="center" prop="lotatt09" />
+      <el-table-column label="托盘号" align="center" prop="lotatt07" />
+      <el-table-column label="生产批号" align="center" prop="lotatt01" />
+      <el-table-column label="产品" align="center" prop="lotatt02" />
+      <el-table-column label="包数" align="center" prop="num" />
+      <el-table-column label="净重" align="center" prop="lotatt10" />
+      <el-table-column label="毛重" align="center" prop="lotatt11" />
+      <el-table-column label="复称重量（公斤）" align="center" prop="lotatt14" />
+      <!--      <el-table-column label="${comment}" align="center" prop="lotatt04" />-->
+      <!--      <el-table-column label="${comment}" align="center" prop="lotatt05" />-->
+      <!--      <el-table-column label="${comment}" align="center" prop="lotatt08" />-->
+      <!--      <el-table-column label="${comment}" align="center" prop="lotatt12" />-->
+      <!--      <el-table-column label="${comment}" align="center" prop="lotatt13" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="lotatt15" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="lotatt16" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="lotatt17" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="lotatt18" />-->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:data:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['system:data:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -255,16 +272,24 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        lotnum: null,
-        num: null,
-        ext1: null,
-        ext2: null,
-        ext3: null,
-        ext4: null,
-        ext5: null,
-        ext6: null,
-        ext7: null,
-        ext8: null,
+       lotatt01:null,
+       lotatt02:null,
+       lotatt03:null,
+       lotatt04:null,
+       lotatt05:null,
+       lotatt06:null,
+       lotatt07:null,
+       lotatt08:null,
+       lotatt09:null,
+       lotatt10:null,
+       lotatt11:null,
+       lotatt12:null,
+       lotatt13:null,
+       lotatt14:null,
+       lotatt15:null,
+       lotatt16:null,
+       lotatt17:null,
+       lotatt18:null
       },
       // 表单参数
       form: {},

warewms-ams/src/main/java/com/ruoyi/ams/weighData/domain/WeighData.java

@@ -58,6 +58,78 @@ public class WeighData extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String ext8;
 
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt01;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt02;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt03;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt04;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt05;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt06;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt07;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt08;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt09;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt10;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt11;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt12;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt13;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt14;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt15;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt16;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt17;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotatt18;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -157,6 +229,168 @@ public class WeighData extends BaseEntity
     {
         return ext8;
     }
+    public void setLotatt01(String lotatt01)
+    {
+        this.lotatt01 = lotatt01;
+    }
+
+    public String getLotatt01()
+    {
+        return lotatt01;
+    }
+    public void setLotatt02(String lotatt02)
+    {
+        this.lotatt02 = lotatt02;
+    }
+
+    public String getLotatt02()
+    {
+        return lotatt02;
+    }
+    public void setLotatt03(String lotatt03)
+    {
+        this.lotatt03 = lotatt03;
+    }
+
+    public String getLotatt03()
+    {
+        return lotatt03;
+    }
+    public void setLotatt04(String lotatt04)
+    {
+        this.lotatt04 = lotatt04;
+    }
+
+    public String getLotatt04()
+    {
+        return lotatt04;
+    }
+    public void setLotatt05(String lotatt05)
+    {
+        this.lotatt05 = lotatt05;
+    }
+
+    public String getLotatt05()
+    {
+        return lotatt05;
+    }
+    public void setLotatt06(String lotatt06)
+    {
+        this.lotatt06 = lotatt06;
+    }
+
+    public String getLotatt06()
+    {
+        return lotatt06;
+    }
+    public void setLotatt07(String lotatt07)
+    {
+        this.lotatt07 = lotatt07;
+    }
+
+    public String getLotatt07()
+    {
+        return lotatt07;
+    }
+    public void setLotatt08(String lotatt08)
+    {
+        this.lotatt08 = lotatt08;
+    }
+
+    public String getLotatt08()
+    {
+        return lotatt08;
+    }
+    public void setLotatt09(String lotatt09)
+    {
+        this.lotatt09 = lotatt09;
+    }
+
+    public String getLotatt09()
+    {
+        return lotatt09;
+    }
+    public void setLotatt10(String lotatt10)
+    {
+        this.lotatt10 = lotatt10;
+    }
+
+    public String getLotatt10()
+    {
+        return lotatt10;
+    }
+    public void setLotatt11(String lotatt11)
+    {
+        this.lotatt11 = lotatt11;
+    }
+
+    public String getLotatt11()
+    {
+        return lotatt11;
+    }
+    public void setLotatt12(String lotatt12)
+    {
+        this.lotatt12 = lotatt12;
+    }
+
+    public String getLotatt12()
+    {
+        return lotatt12;
+    }
+    public void setLotatt13(String lotatt13)
+    {
+        this.lotatt13 = lotatt13;
+    }
+
+    public String getLotatt13()
+    {
+        return lotatt13;
+    }
+    public void setLotatt14(String lotatt14)
+    {
+        this.lotatt14 = lotatt14;
+    }
+
+    public String getLotatt14()
+    {
+        return lotatt14;
+    }
+    public void setLotatt15(String lotatt15)
+    {
+        this.lotatt15 = lotatt15;
+    }
+
+    public String getLotatt15()
+    {
+        return lotatt15;
+    }
+    public void setLotatt16(String lotatt16)
+    {
+        this.lotatt16 = lotatt16;
+    }
+
+    public String getLotatt16()
+    {
+        return lotatt16;
+    }
+    public void setLotatt17(String lotatt17)
+    {
+        this.lotatt17 = lotatt17;
+    }
+
+    public String getLotatt17()
+    {
+        return lotatt17;
+    }
+    public void setLotatt18(String lotatt18)
+    {
+        this.lotatt18 = lotatt18;
+    }
+
+    public String getLotatt18()
+    {
+        return lotatt18;
+    }
 
     @Override
     public String toString() {
@@ -172,6 +406,24 @@ public class WeighData extends BaseEntity
             .append("ext6", getExt6())
             .append("ext7", getExt7())
             .append("ext8", getExt8())
+                .append("lotatt01", getLotatt01())
+                .append("lotatt02", getLotatt02())
+                .append("lotatt03", getLotatt03())
+                .append("lotatt04", getLotatt04())
+                .append("lotatt05", getLotatt05())
+                .append("lotatt06", getLotatt06())
+                .append("lotatt07", getLotatt07())
+                .append("lotatt08", getLotatt08())
+                .append("lotatt09", getLotatt09())
+                .append("lotatt10", getLotatt10())
+                .append("lotatt11", getLotatt11())
+                .append("lotatt12", getLotatt12())
+                .append("lotatt13", getLotatt13())
+                .append("lotatt14", getLotatt14())
+                .append("lotatt15", getLotatt15())
+                .append("lotatt16", getLotatt16())
+                .append("lotatt17", getLotatt17())
+                .append("lotatt18", getLotatt18())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

warewms-ams/src/main/resources/mapper/weighData/WeighDataMapper.xml

@@ -16,6 +16,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="ext6"    column="ext6"    />
         <result property="ext7"    column="ext7"    />
         <result property="ext8"    column="ext8"    />
+        <result property="lotatt01"    column="lotatt01"    />
+        <result property="lotatt02"    column="lotatt02"    />
+        <result property="lotatt03"    column="lotatt03"    />
+        <result property="lotatt04"    column="lotatt04"    />
+        <result property="lotatt05"    column="lotatt05"    />
+        <result property="lotatt06"    column="lotatt06"    />
+        <result property="lotatt07"    column="lotatt07"    />
+        <result property="lotatt08"    column="lotatt08"    />
+        <result property="lotatt09"    column="lotatt09"    />
+        <result property="lotatt10"    column="lotatt10"    />
+        <result property="lotatt11"    column="lotatt11"    />
+        <result property="lotatt12"    column="lotatt12"    />
+        <result property="lotatt13"    column="lotatt13"    />
+        <result property="lotatt14"    column="lotatt14"    />
+        <result property="lotatt15"    column="lotatt15"    />
+        <result property="lotatt16"    column="lotatt16"    />
+        <result property="lotatt17"    column="lotatt17"    />
+        <result property="lotatt18"    column="lotatt18"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -27,19 +45,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectWeighDataList" parameterType="WeighData" resultMap="WeighDataResult">
-        <include refid="selectWeighDataVo"/>
+        SELECT id,t1.lotnum,lotatt01,lotatt02,lotatt03,lotatt04,lotatt05,lotatt06,lotatt07,lotatt08,lotatt09,lotatt10
+             ,lotatt11,lotatt12,lotatt13,lotatt14,lotatt15,lotatt16,lotatt17,lotatt18,t2.create_time
+        FROM  weigh_data t2
+        LEFT JOIN inv_lot_att t1 ON t2.lotnum=t1.lotnum
         <where>
-            <if test="lotnum != null  and lotnum != ''"> and lotnum = #{lotnum}</if>
-            <if test="num != null "> and num = #{num}</if>
-            <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
-            <if test="ext2 != null  and ext2 != ''"> and ext2 = #{ext2}</if>
-            <if test="ext3 != null  and ext3 != ''"> and ext3 = #{ext3}</if>
-            <if test="ext4 != null  and ext4 != ''"> and ext4 = #{ext4}</if>
-            <if test="ext5 != null  and ext5 != ''"> and ext5 = #{ext5}</if>
-            <if test="ext6 != null  and ext6 != ''"> and ext6 = #{ext6}</if>
-            <if test="ext7 != null  and ext7 != ''"> and ext7 = #{ext7}</if>
-            <if test="ext8 != null  and ext8 != ''"> and ext8 = #{ext8}</if>
+            <if test="lotatt01 != null  and lotatt01 != ''"> and t1.lotatt01 = #{lotatt01}</if>
+            <if test="lotatt02 != null  and lotatt02 != ''"> and t1.lotatt02 = #{lotatt02}</if>
+            <if test="lotatt03 != null  and lotatt03 != ''"> and t1.lotatt03 = #{lotatt03}</if>
+            <if test="lotatt04 != null  and lotatt04 != ''"> and t1.lotatt04 = #{lotatt04}</if>
+            <if test="lotatt05 != null  and lotatt05 != ''"> and t1.lotatt05 = #{lotatt05}</if>
+            <if test="lotatt06 != null  and lotatt06 != ''"> and t1.lotatt06 = #{lotatt06}</if>
+            <if test="lotatt07 != null  and lotatt07 != ''"> and t1.lotatt07 = #{lotatt07}</if>
+            <if test="lotatt08 != null  and lotatt08 != ''"> and t1.lotatt08 = #{lotatt08}</if>
+            <if test="lotatt09 != null  and lotatt09 != ''"> and t1.lotatt09 = #{lotatt09}</if>
+            <if test="lotatt10 != null  and lotatt10 != ''"> and t1.lotatt10 = #{lotatt10}</if>
+            <if test="lotatt11 != null  and lotatt11 != ''"> and t1.lotatt11 = #{lotatt11}</if>
+            <if test="lotatt12 != null  and lotatt12 != ''"> and t1.lotatt12 = #{lotatt12}</if>
+            <if test="lotatt13 != null  and lotatt13 != ''"> and t1.lotatt13 = #{lotatt13}</if>
+            <if test="lotatt14 != null  and lotatt14 != ''"> and t1.lotatt14 = #{lotatt14}</if>
+            <if test="lotatt15 != null  and lotatt15 != ''"> and t1.lotatt15 = #{lotatt15}</if>
+            <if test="lotatt16 != null  and lotatt16 != ''"> and t1.lotatt16 = #{lotatt16}</if>
+            <if test="lotatt17 != null  and lotatt17 != ''"> and t1.lotatt17 = #{lotatt17}</if>
+            <if test="lotatt18 != null  and lotatt18 != ''"> and t1.lotatt18 = #{lotatt18}</if>
         </where>
+        order by t2.create_time desc
     </select>
 
     <select id="selectWeighDataById" parameterType="Long" resultMap="WeighDataResult">