*

lsh

昨天 106fd3c353c2eaac2f31b6f56f3285fefe8dc740

*

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

@@ -54,6 +54,9 @@
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else if (entry.getKey().equals("binding_tags")){
                long aLong = Long.parseLong(val);
                wrapper.ge(entry.getKey(), aLong);
            } else {
                wrapper.like(entry.getKey(), val);
            }

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

@@ -54,6 +54,9 @@
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else if (entry.getKey().equals("binding_tags")){
                long aLong = Long.parseLong(val);
                wrapper.ge(entry.getKey(), aLong);
            } else {
                wrapper.like(entry.getKey(), val);
            }

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

@@ -43,6 +43,7 @@
        convert(param, wrapper);
        allLike(BasArmMastSign.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("create_time",false);
        return R.ok(basArmMastSignService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -53,6 +54,9 @@
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else if (entry.getKey().equals("create_time")){
                long aLong = Long.parseLong(val);
                wrapper.ge(entry.getKey(), aLong);
            } else {
                wrapper.like(entry.getKey(), val);
            }

 src/main/java/com/zy/asrs/entity/BasArmMastSign.java

@@ -28,16 +28,16 @@
    @ApiModelProperty(value= "状态")
    private Integer status;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "sku")
    private String matnr;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "sku")
    private String sku;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "po")
    private String po;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "po")
    private String upc;

    /**
@@ -46,14 +46,14 @@
    @ApiModelProperty(value= "货源")
    private String supplier;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "订单号")
    @TableField("order_no")
    private String orderNo;

    /**
     * 分拣标记
     */
    @ApiModelProperty(value= "分拣标记")
    @ApiModelProperty(value= "分拣绑定标记")
    @TableField("create_time")
    private Long createTime;

@@ -88,4 +88,15 @@
//    );


    public String getStatus$() {
        if (Cools.isEmpty(status)) {return "未知异常";}
        switch (status){
            case 0:
                return "0.未标记";
            case 1:
                return "1.已标记";
            default:
                return "未知异常";
        }
    }
}

 src/main/webapp/static/js/basArmMastSign/basArmMastSign.js

@@ -22,15 +22,15 @@
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'status', align: 'center',title: '状态'}
            ,{field: 'matnr', align: 'center',title: ''}
            ,{field: 'sku', align: 'center',title: ''}
            ,{field: 'po', align: 'center',title: ''}
            ,{field: 'upc', align: 'center',title: ''}
            ,{field: 'supplier', align: 'center',title: '货源'}
            ,{field: 'orderNo', align: 'center',title: ''}
            ,{field: 'createTime', align: 'center',title: '分拣标记'}
            ,{field: 'id', align: 'center',title: 'ID',hide: true}
            ,{field: 'status$', align: 'center',title: '任务下发标记',hide: false}
            ,{field: 'orderNo', align: 'center',title: '订单号',hide: false}
            ,{field: 'createTime', align: 'center',title: '分拣绑定标记',hide: false}
            ,{field: 'matnr', align: 'center',title: 'sku',hide: true}
            ,{field: 'sku', align: 'center',title: 'sku',hide: false}
            ,{field: 'po', align: 'center',title: 'po',hide: false}
            ,{field: 'upc', align: 'center',title: 'upc',hide: false}
            ,{field: 'supplier', align: 'center',title: '货源',hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],

 src/main/webapp/views/basArmMast/basArmMast.html

@@ -152,7 +152,7 @@
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">绑定标记: </label>
                    <label class="layui-form-label layui-form-required">分拣绑定标记: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="bindingTags" placeholder="请输入分拣绑定标记" lay-vertype="tips" lay-verify="required">
                    </div>

 src/main/webapp/views/basArmMastSign/basArmMastSign.html

@@ -17,21 +17,56 @@
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" 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="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                            <input class="layui-input" type="text" name="create_time" placeholder="分拣绑定标记" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
                            <select name="status" id="status" class="layui-input" type="text" placeholder="任务下发标记" autocomplete="off">
                                <!--                                <option style="display: none"></option>-->
                                <option value="">任务下发标记</option>
                                <option value="0">0.未标记</option>
                                <option value="1">1.已标记</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="order_no" placeholder="订单号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="sku" placeholder="sku" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="po" placeholder="po" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="upc" placeholder="upc" autocomplete="off">
                        </div>
                    </div>
<!--                     <div class="layui-inline" style="width: 300px">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input layui-laydate-range" name="create_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="condition" placeholder="请输入" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
@@ -73,53 +108,56 @@
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">状态: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="status" placeholder="请输入状态" lay-vertype="tips" lay-verify="required">
                    <label class="layui-form-label layui-form-required">任务下发标记：</label>
                    <div class="layui-input-inline">
                        <select name="status">
                            <option value="0">0.未标记</option>
                            <option value="1">1.已标记</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sku" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="po" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="upc" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">货源: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="supplier" placeholder="请输入货源" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="orderNo" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">分拣标记: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" placeholder="请输入分拣标记" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="matnr" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="sku" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="po" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="upc" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">货源: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="supplier" placeholder="请输入货源" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="orderNo" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">分拣标记: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="createTime" placeholder="请输入分拣标记" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->

             </div>
        </div>