#导出导入功能改善

wang..123

2022-03-08 d5d603f35215c030e7e0b35f6e68e213f060177b

#导出导入功能改善

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -42,6 +42,7 @@
        locDetl.setSize(matCode.getSize()); // 尺寸
        locDetl.setColor(matCode.getColor()); // 颜色
        locDetl.setWeight(matCode.getWeight()); // 单重
        locDetl.setStr3(matCode.getStr3());
    }

    public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {

 src/main/resources/mapper/LocDetlMapper.xml

@@ -43,6 +43,9 @@
        <if test="mat_name!=null and mat_name!='' ">
            and a.mat_name like '%' + #{mat_name} + '%'
        </if>
        <if test="str3!=null and str3!=''" >
            and a.str3 like '%'+#{str3}+'%'
        </if>
        <if test="qty!=null and qty!='' ">
            and a.qty = #{qty}
        </if>
@@ -93,7 +96,7 @@
        where loc_no=#{locNo}
    </select>
    <select id="getStockStatis" resultMap="BaseResultMap">
        select a.mat_name,a.mat_no,a.supplier,sum(a.qty) qty  from
        select a.mat_name,a.mat_no,a.supplier,a.str3,sum(a.qty) qty  from
        (
        select
        ROW_NUMBER() over (order by c.appe_time,c.mat_no,c.loc_no) as row,
@@ -101,7 +104,7 @@
        from asr_loc_detl c
        ) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
         <include refid="stockOutCondition"></include>
        group by a.mat_no,a.mat_name,a.supplier
        group by a.mat_no,a.mat_name,a.supplier,a.str3
    </select>
    <select id="getStockStatisCount" resultType="integer">
        select

 src/main/webapp/static/js/locStatis/locStatis.js

@@ -63,6 +63,7 @@
        cols: [[{field: 'qty', align: 'center', title: '数量', width: 120}
            , {field: 'matNo', align: 'center', title: '产品编码'}
            , {field: 'matName', align: 'center', title: '产品名称'}
            , {field: 'str3', align: 'center',title: '客户名称'}
            , {field: 'supplier', align: 'center', title: '批号'}
            ]],
        request: {

 src/main/webapp/views/locStatis/locStatis.html

@@ -25,11 +25,11 @@
            <input class="layui-input" type="text" name="mat_name" placeholder="产品名称" autocomplete="off">
        </div>
    </div>
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline">-->
<!--            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">-->
<!--        </div>-->
<!--    </div>-->
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="str3" placeholder="客户名称" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>