工作历史档明细搜索条件完善

pjb

2025-07-04 7256640ae2a47cadda81b5475922fcd75b2f4632

工作历史档明细搜索条件完善

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

@@ -79,11 +79,10 @@
        try {
            Integer wrkNo = null;
            String orderNo = null;
            String matnr = null;
            String specs = null;
            String zpallet = null;
            String batch = null;
            Double anfme = null;
            String maktx = null; // 商品名称
            String model = null; // 桶型
            Double volume = null; // 罐装量
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
@@ -98,21 +97,19 @@
                    wrkNo = Integer.parseInt(val);
                } else if (entry.getKey().equals("order_no")) {
                    orderNo = val;
                } else if (entry.getKey().equals("specs")) {
                    specs = val;
                } else if (entry.getKey().equals("maktx")) {
                    maktx = val;
                } else if (entry.getKey().equals("zpallet")) {
                    zpallet = val;
                } else if (entry.getKey().equals("batch")) {
                    batch = val;
                } else if (entry.getKey().equals("anfme")) {
                    anfme = Double.parseDouble(val);
                }else if (entry.getKey().equals("matnr")) {
                    matnr = val;
                } else if (entry.getKey().equals("model")) {
                    model = val;
                } else if (entry.getKey().equals("volume")) {
                    volume = Double.parseDouble(val);
                }
            }
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(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,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd));
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(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

@@ -19,11 +19,10 @@

    List<WrkDetlLog> selectWrkDetlLogs(@Param("wrkNo") Integer wrkNo,
                                       @Param("orderNo") String orderNo,
                                       @Param("matnr") String matnr,
                                       @Param("specs") String specs,
                                       @Param("maktx") String maktx,
                                       @Param("model") String model,
                                       @Param("zpallet") String zpallet,
                                       @Param("batch") String batch,
                                       @Param("anfme") Double anfme,
                                       @Param("volume") Double volume,
                                       @Param("modiTimeStart") Date modiTimeStart,
                                       @Param("modiTimeEnd") Date modiTimeEnd,
                                       @Param("pageNumber") Integer curr,
@@ -31,11 +30,10 @@

    Long selectWrkDetlLogsTotal(@Param("wrkNo") Integer wrkNo,
                                @Param("orderNo") String orderNo,
                                @Param("matnr") String matnr,
                                @Param("specs") String specs,
                                @Param("maktx") String maktx,
                                @Param("model") String model,
                                @Param("zpallet") String zpallet,
                                @Param("batch") String batch,
                                @Param("anfme") Double anfme,
                                @Param("volume") Double volume,
                                @Param("modiTimeStart") Date modiTimeStart,
                                @Param("modiTimeEnd") Date modiTimeEnd);


 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 matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
    List<WrkDetlLog> selectWrkDetlLogs(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 matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd);
    Long selectWrkDetlLogsTotal(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 matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
    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);
    }

    @Override
    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd);
    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);
    }
}

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -57,9 +57,6 @@
        <if test="wrkNo != null and wrkNo != ''">
            and a.wrk_no = #{wrkNo}
        </if>
        <if test="anfme != null and anfme != ''">
            and a.anfme = #{anfme}
        </if>
        <if test="modiTimeStart != null ">
            <if test="modiTimeEnd != null ">
                and a.modi_time between #{modiTimeStart} and #{modiTimeEnd}
@@ -68,17 +65,17 @@
        <if test="orderNo != null and orderNo != ''">
            and a.order_no like concat('%',#{orderNo},'%')
        </if>
        <if test="batch != null and batch != ''">
            and a.batch like concat('%',#{batch},'%')
        <if test="maktx != null and maktx != ''">
            and a.maktx like concat('%',#{maktx},'%')
        </if>
        <if test="matnr != null and matnr != ''">
            and a.matnr like concat('%',#{matnr},'%')
        <if test="model != null and model != ''">
            and a.model like concat('%',#{model},'%')
        </if>
        <if test="volume != null and volume != ''">
            and a.volume like concat('%',#{volume},'%')
        </if>
        <if test="zpallet != null and zpallet != ''">
            and a.zpallet like concat('%',#{zpallet},'%')
        </if>
        <if test="specs != null and specs != ''">
            and a.specs like concat('%',#{specs},'%')
        </if>
    </sql>


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

@@ -224,7 +224,7 @@
var detlCols = [
    {field: 'matnr', align: 'center',title: '商品编号', sort:true}
    ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: true}
    ,{field: 'orderNo', align: 'center',title: '单据编号'}
    ,{field: 'batch', align: 'center',title: '批次', sort:true}
    ,{field: 'anfme', align: 'center',title: '数量', hide: false}
    ,{field: 'zpallet', align: 'center',title: '托盘条码', hide: false}

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

@@ -19,11 +19,6 @@
            <input class="layui-input" type="text" name="wrk_no" 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">
            <input class="layui-input" type="text" name="order_no" placeholder="订单号" autocomplete="off">
@@ -31,29 +26,29 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <input class="layui-input" type="text" name="maktx" placeholder="商品名称" autocomplete="off">
        </div>
    </div>
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline">-->
<!--            <input class="layui-input" type="text" name="specs" placeholder="规格" autocomplete="off">-->
<!--        </div>-->
<!--    </div>-->
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="volume" placeholder="罐装量" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="model" placeholder="桶型" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="zpallet" 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" type="text" name="batch" placeholder="批次" autocomplete="off">
            <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">-->
<!--            <input class="layui-input" type="text" name="anfme" placeholder="数量" autocomplete="off">-->
<!--        </div>-->
<!--    </div>-->
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>