界面搜索字段完善

pjb

4 天以前 db3f65265e534f69f60ec8f973079462d4c3efa2

界面搜索字段完善

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

@@ -77,6 +77,8 @@
                             @RequestParam(required = false) String condition,
                             @RequestParam Map<String, Object> param) {
        try {
            Integer ioType = null;
            Integer wrkSts = null;
            Integer wrkNo = null;
            String orderNo = null;
            String zpallet = null;
@@ -105,11 +107,15 @@
                    model = val;
                } else if (entry.getKey().equals("volume")) {
                    volume = Double.parseDouble(val);
                } else if (entry.getKey().equals("io_type")) {
                    ioType = Integer.parseInt(val);
                } else if (entry.getKey().equals("wrk_sts")) {
                    wrkSts = Integer.parseInt(val);
                }
            }
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd, curr, limit);
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(ioType,wrkSts,wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd, curr, limit);
            Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd));
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(ioType,wrkSts,wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd));
            return R.ok(page1);
        } catch (Exception e) {
            return R.error("异常" + e);

 src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java

@@ -17,7 +17,9 @@
    @Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
    int save(Integer workNo);

    List<WrkDetlLog> selectWrkDetlLogs(@Param("wrkNo") Integer wrkNo,
    List<WrkDetlLog> selectWrkDetlLogs(@Param("ioType") Integer ioType,
                                       @Param("wrkSts") Integer wrkSts,
                                       @Param("wrkNo") Integer wrkNo,
                                       @Param("orderNo") String orderNo,
                                       @Param("maktx") String maktx,
                                       @Param("model") String model,
@@ -28,7 +30,9 @@
                                       @Param("pageNumber") Integer curr,
                                       @Param("pageSize") Integer limit);

    Long selectWrkDetlLogsTotal(@Param("wrkNo") Integer wrkNo,
    Long selectWrkDetlLogsTotal(@Param("ioType") Integer ioType,
                                @Param("wrkSts") Integer wrkSts,
                                @Param("wrkNo") Integer wrkNo,
                                @Param("orderNo") String orderNo,
                                @Param("maktx") String maktx,
                                @Param("model") String model,

 src/main/java/com/zy/asrs/service/WrkDetlLogService.java

@@ -10,8 +10,8 @@

    boolean save(Integer workNo);

    List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
    List<WrkDetlLog> selectWrkDetlLogs(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);

    Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd);
    Long selectWrkDetlLogsTotal(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd);

}

 src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java

@@ -18,12 +18,12 @@
    }

    @Override
    public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd, curr, limit);
    public List<WrkDetlLog> selectWrkDetlLogs(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(ioType,wrkSts,wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd, curr, limit);
    }

    @Override
    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd);
    public Long selectWrkDetlLogsTotal(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectWrkDetlLogsTotal(ioType,wrkSts,wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd);
    }
}

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -77,6 +77,12 @@
        <if test="zpallet != null and zpallet != ''">
            and a.zpallet like concat('%',#{zpallet},'%')
        </if>
        <if test="ioType != null">
            and b.io_type = #{ioType}
        </if>
        <if test="wrkSts != null">
            and b.wrk_sts = #{wrkSts}
        </if>
    </sql>

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

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -538,6 +538,11 @@
        tableReload(false);
    });

    layDate.render({
        elem: '.layui-laydate-range'
        ,type: 'datetime'
        ,range: true
    });
    // 时间选择器
    layDate.render({
        elem: '#modiTime\\$',

 src/main/webapp/views/locDetl/locDetl.html

@@ -52,6 +52,11 @@
            <input class="layui-input" type="text" name="model" placeholder="桶型" autocomplete="off">
        </div>
    </div>
    <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>
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline">-->
<!--            <select name="frozen" class="layui-input" type="text" autocomplete="off">-->

 src/main/webapp/views/wrkDetlLog/wrkDetlLog.html

@@ -15,6 +15,28 @@
<!-- 搜索栏 -->
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="ioType" class="layui-input" name="io_type" type="text" placeholder="请输入" autocomplete="off" style="display: none">
            <input id="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="入出库类型" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="请输入" autocomplete="off" style="display: none">
            <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="工作状态" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="wrk_no" placeholder="工作号" autocomplete="off">
        </div>