1.0.3 1.出库作业-提取出货内容新增根据生成单号查询物料

王佳豪

2021-03-16 0d19e32011fd2003c3b5c74c07d1c701427e823a

1.0.3
1.出库作业-提取出货内容新增根据生成单号查询物料

 src/main/java/com/zy/asrs/controller/LocDetlController.java

@@ -72,6 +72,10 @@
        if (Cools.isEmpty(param.get("supplier"))) {
            param.remove("supplier");
        }
        /* 生成单号为空，删除生成单号warehouse */
        if (Cools.isEmpty(param.get("warehouse"))) {
            param.remove("warehouse");
        }
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
    }


 src/main/resources/mapper/LocDetlMapper.xml

@@ -53,6 +53,9 @@
        <if test="supplier!=null and supplier!=null">
            and a.supplier like '%' + #{supplier} + '%'
        </if>
        <if test="warehouse!=null and warehouse!=null">
            and a.warehouse like '%' + #{warehouse} + '%'
        </if>
    </sql>

    <select id="getStockOutPage" resultMap="BaseResultMap">

 src/main/webapp/static/js/common.js

@@ -208,8 +208,8 @@
    ,{field: 'lgnum', align: 'center',title: '规格'}
    ,{field: 'type', align: 'center',title: '物料类别'}
    ,{field: 'mnemonic', align: 'center',title: '单据编号', hide: true}
    ,{field: 'supplier', align: 'center',title: '通知单号'}
    // ,{field: 'warehouse', align: 'center',title: '仓库'}
    ,{field: 'supplier', align: 'center',title: '通知单号', hide: true}
    ,{field: 'warehouse', align: 'center',title: '生成单号'}
    // ,{field: 'brand', align: 'center',title: '品牌'}
    ,{field: 'anfme', align: 'center',title: '数量'}
    // ,{field: 'altme', align: 'center',title: '单位'}

 src/main/webapp/views/pakStore/locDetlQuery.html

@@ -69,15 +69,21 @@
                <input class="layui-input" type="text" name="lgnum" placeholder="规格" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
        <!-- 日期范围 -->
        <div class="layui-inline" style="width: 300px;">
            <div class="layui-input-inline">
                <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
            </div>
        </div>
        <br />
        <div class="layui-inline" style="margin-left: 30px">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="supplier" placeholder="通知单号" autocomplete="off">
            </div>
        </div>
        <!-- 日期范围 -->
        <div class="layui-inline" style="width: 300px;margin-left: 30px">
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                <input class="layui-input" type="text" name="warehouse" placeholder="生成单号" autocomplete="off">
            </div>
        </div>
        <!-- 待添加 -->