1

ZY

2024-08-19 fc3347a225114a8dbd37b451981109c8170b9dd4

1

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

@@ -83,6 +83,7 @@
            String specs = null;
            String zpallet = null;
            String batch = null;
            String model = null;
            Double anfme = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
@@ -106,13 +107,15 @@
                    batch = val;
                } else if (entry.getKey().equals("anfme")) {
                    anfme = Double.parseDouble(val);
                }else if (entry.getKey().equals("matnr")) {
                } else if (entry.getKey().equals("matnr")) {
                    matnr = val;
                } else if (entry.getKey().equals("model")) {
                    model = val;
                }
            }
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, model, 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, matnr, specs, zpallet, batch, anfme, model, modiTimeStart, modiTimeEnd));
            return R.ok(page1);
        } catch (Exception e) {
            return R.error("异常" + e);

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

@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;

import com.zy.asrs.entity.WrkDetlLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkDetlLog;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -23,7 +23,7 @@
                                       @Param("specs") String specs,
                                       @Param("zpallet") String zpallet,
                                       @Param("batch") String batch,
                                       @Param("anfme") Double anfme,
                                       @Param("anfme") Double anfme, @Param("model") String model,
                                       @Param("modiTimeStart") Date modiTimeStart,
                                       @Param("modiTimeEnd") Date modiTimeEnd,
                                       @Param("pageNumber") Integer curr,
@@ -35,7 +35,7 @@
                                @Param("specs") String specs,
                                @Param("zpallet") String zpallet,
                                @Param("batch") String batch,
                                @Param("anfme") Double anfme,
                                @Param("anfme") Double anfme, @Param("model") String model,
                                @Param("modiTimeStart") Date modiTimeStart,
                                @Param("modiTimeEnd") Date modiTimeEnd);


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

@@ -1,7 +1,7 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.WrkDetlLog;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.WrkDetlLog;

import java.util.Date;
import java.util.List;
@@ -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 matnr, String specs, String zpallet, String batch, Double anfme, String model, 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 matnr, String specs, String zpallet, String batch, Double anfme, String model, Date modiTimeStart, Date modiTimeEnd);

}

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.WrkDetlLogMapper;
import com.zy.asrs.entity.WrkDetlLog;
import com.zy.asrs.service.WrkDetlLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.WrkDetlLog;
import com.zy.asrs.mapper.WrkDetlLogMapper;
import com.zy.asrs.service.WrkDetlLogService;
import org.springframework.stereotype.Service;

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

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -87,6 +87,9 @@
        <if test="specs != null and specs != ''">
            and a.specs like concat('%',#{specs},'%')
        </if>
        <if test="model != null and model != ''">
            and a.model like concat('%',#{model},'%')
        </if>
    </sql>

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

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

@@ -31,12 +31,12 @@
    </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="matnr" 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">
            <input class="layui-input" type="text" name="model" placeholder="产品代码" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
@@ -46,14 +46,14 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="batch" placeholder="货品特征" autocomplete="off">
            <input class="layui-input" type="text" name="batch" placeholder="批次" autocomplete="off">
        </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 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>