1.日出库明细统计增加模具名称字段查询条件2.半托查询增加可放长度查询条件

dubin

3 天以前 c2d424ca7cdb050f4052a70bbd462d6bafa91650

1.日出库明细统计增加模具名称字段查询条件2.半托查询增加可放长度查询条件

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

@@ -51,7 +51,11 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
                if (!entry.getKey().equals("price")){
                    wrapper.like(entry.getKey(), val);
                }else {
                    wrapper.ge(entry.getKey(), val);
                }
            }
        }
    }

 src/main/webapp/views/halfBarcode/halfBarcode.html

@@ -29,6 +29,11 @@
            <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="price" placeholder="可放长度" autocomplete="off">
        </div>
    </div>
    <!-- 日期范围 -->
    <!--    <div class="layui-inline" style="width: 300px">-->
    <!--        <div class="layui-input-inline">-->

 src/main/webapp/views/report/viewWorkOut.html

@@ -26,7 +26,7 @@
    </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">