工作明细历史档增加型号搜索

pang.jiabao

2025-04-01 4eb6f737fc06afa8a83f910fcb5ca671b694604a

工作明细历史档增加型号搜索

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

@@ -80,7 +80,7 @@
            Integer wrkNo = null;
            String orderNo = null;
            String matnr = null;
            String specs = null;
            String model = null;
            String zpallet = null;
            String batch = null;
            String frozen = null;
@@ -99,8 +99,8 @@
                    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("model")) {
                    model = val;
                } else if (entry.getKey().equals("zpallet")) {
                    zpallet = val;
                } else if (entry.getKey().equals("batch")) {
@@ -113,9 +113,9 @@
                    frozen = val;
                }
            }
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, frozen, curr, limit);
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,model,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, frozen, 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,frozen));
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,model,zpallet,batch,anfme, modiTimeStart, modiTimeEnd,frozen));
            return R.ok(page1);
        } catch (Exception e) {
            return R.error("异常" + e);

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

@@ -20,7 +20,7 @@
    List<WrkDetlLog> selectWrkDetlLogs(@Param("wrkNo") Integer wrkNo,
                                       @Param("orderNo") String orderNo,
                                       @Param("matnr") String matnr,
                                       @Param("specs") String specs,
                                       @Param("model") String model,
                                       @Param("zpallet") String zpallet,
                                       @Param("batch") String batch,
                                       @Param("anfme") Double anfme,

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

@@ -18,8 +18,8 @@
    }

    @Override
    public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, String frozen,Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd,frozen, curr, limit);
    public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String model,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, String frozen,Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,model,zpallet,batch,anfme, modiTimeStart, modiTimeEnd,frozen, curr, limit);
    }

    @Override

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -78,8 +78,8 @@
        <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 test="model != null and model != ''">
            and a.model like concat('%',#{model},'%')
        </if>
        <if test="frozen != null and frozen eq '0'.toString()">
            and a.control_memo = ''

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

@@ -41,9 +41,14 @@
<!--    </div>-->
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="zpallet" placeholder="托盘码" autocomplete="off">
            <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-input-inline">
            <input class="layui-input" type="text" name="batch" placeholder="批号" autocomplete="off">