#

Junjie

18 小时以前 5d2e76e56ef199debdcb38a65ae2121650c615d0

#

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

@@ -152,13 +152,13 @@
    public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        if (!Cools.isEmpty(param.get("modi_time"))){
            String val = String.valueOf(param.get("modi_time"));
        if (!Cools.isEmpty(param.get("appe_time"))){
            String val = String.valueOf(param.get("appe_time"));
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                param.put("startTime", DateUtils.convert(dates[0]));
                param.put("endTime", DateUtils.convert(dates[1]));
                param.remove("modi_time");
                param.remove("appe_time");
            }
        }
        Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));

 src/main/resources/mapper/asrs/LocDetlMapper.xml

@@ -351,7 +351,7 @@
            and a.anfme like '%' + #{anfme} + '%'
        </if>
        <if test="startTime!=null and endTime!=null">
            and a.modi_time between #{startTime} and #{endTime}
            and a.appe_time between #{startTime} and #{endTime}
        </if>
        <if test="crnNo!=null and crnNo!='' ">
            and b.crn_no=#{crnNo}

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

@@ -103,7 +103,7 @@
        <!-- 日期范围 -->
        <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">
                <input class="layui-input layui-laydate-range" name="appe_time" type="text" placeholder="入库起始时间 - 终止时间" autocomplete="off" style="width: 300px">
            </div>
        </div>
        <!-- 待添加 -->
@@ -140,7 +140,8 @@
        ];
        cols.push.apply(cols, detlCols);
        cols.push({field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'})
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}
            ,{field: 'appeTime$', align: 'center',title: '入库时间'})
        return cols;
    }