#库存上报结果界面

lty

5 天以前 6c554723b1dfbd50412e963206032ed7dd50bab9

#库存上报结果界面

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

@@ -51,7 +51,7 @@
    public synchronized R syncStockUpload(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) List<MatSyncParam> param,
                                      HttpServletRequest request){
        auth(appkey, param, request);
//        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

 src/main/java/com/zy/asrs/entity/param/MatSyncParam.java

@@ -65,6 +65,11 @@
        private String unitId;

        /**
         * 货品特征
         */
        private String batch;

        /**
         * 销售默认计量单位编码
         */
        private String saleUnitId;

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

@@ -40,7 +40,7 @@
    List<String> selectSameDetlTodayBatch(@Param("matnr") String matnr,@Param("batch") String batch, @Param("start") Integer start, @Param("end") Integer end);

    List<LocDetl> getStockStatis(Map<String, Object> map);
    Double getAnfmeByMatnr(@Param("matnr") String matnr);
    Double getAnfmeByMatnr(@Param("matnr") String matnr, @Param("batch") String batch, @Param("specs") String specs);

    Integer getStockStatisCount(Map<String, Object> map);


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

@@ -70,5 +70,5 @@

    List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo);

    Double getAnfmeByMatnr(String matnr);
    Double getAnfmeByMatnr(String matnr,String batch, String specs);
}

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

@@ -64,8 +64,8 @@
    }

    @Override
    public Double getAnfmeByMatnr(String matnr){
        return this.baseMapper.getAnfmeByMatnr(matnr);
    public Double getAnfmeByMatnr(String matnr,String batch, String specs){
        return this.baseMapper.getAnfmeByMatnr(matnr,batch,specs);
    }

    @Override

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

@@ -620,7 +620,7 @@
                    throw new CoolException("商品编码为空");
                }

                Double LKAnfme = locDetlService.getAnfmeByMatnr(matParam.getMatnr());
                Double LKAnfme = locDetlService.getAnfmeByMatnr(matParam.getMatnr(),matParam.getBatch(),matParam.getSpecs());
                if (LKAnfme == null) {
                    LKAnfme = 0.0;
                }

 src/main/java/com/zy/asrs/task/OrderReportScheduler.java

@@ -13,7 +13,7 @@
    /**
     * 将已作业数量与完成数量相同的订单明细上报，若已上报将标识改为2
     */
    @Scheduled(cron = "0/30 * * * * ?")
//    @Scheduled(cron = "0/30 * * * * ?")
    public void execute(){
        orderReportHander.startPakIn();
        orderReportHander.startPakOut();

 src/main/resources/mapper/LocDetlMapper.xml

@@ -152,12 +152,21 @@

    <select id="getAnfmeByMatnr" resultType="com.zy.asrs.entity.LocDetl">
        select
            sum(a.anfme) as anfme
        sum(a.anfme) as anfme
        from asr_loc_detl a
        where matnr = #{matnr}
        <where>
            a.matnr = #{matnr}
            <if test="batch != null and batch != ''">
                and a.batch = #{batch}
            </if>
            <if test="specs != null and specs != ''">
                and a.specs = #{specs}
            </if>
        </where>
    </select>



    <select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
     select count(1) as count from
        (

 src/main/webapp/static/js/locDetlStatis/check.js

New file
@@ -0,0 +1,256 @@
var pageCurr;
function getCol() {
    var cols = [
        {field: 'anfme', align: 'center',title: '库存数量', style: 'font-weight: bold'}
    ];
    arrRemove(detlCols, "field", "anfme")
    arrRemove(detlCols, "field", "zpallet")
    cols.push.apply(cols, detlCols);
    // cols.push({field: 'anfme', align: 'center',title: '数量', style: 'font-weight: bold'}
    // )
    return cols;
}

layui.use(['table','laydate', 'form'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;

    // 数据渲染
    tableIns = table.render({
        elem: '#locDetlStatis',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/locDetl/statis/auth',
        page: true,
        limit: 20,
        limits: [20, 30, 50, 100, 200, 500],
        even: true,
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [getCol()],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
            form.on('checkbox(tableCheckbox)', function (data) {
                var _index = $(data.elem).attr('table-index')||0;
                if(data.elem.checked){
                    res.data[_index][data.value] = 'Y';
                }else{
                    res.data[_index][data.value] = 'N';
                }
            });
            /**
             * 显示库存总数量
             */
            $.ajax({
                url: baseUrl+"/locDetl/count",
                headers: {'token': localStorage.getItem('token')},
                contentType:'application/json;charset=UTF-8',
                method: 'POST',
                success: function (res) {
                    $("#countNum").text(res.data + '个');
                }
            });

        }
    });

    // 监听排序事件
    table.on('sort(locDetlStatis)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {
                curr: 1
            },
            done: function (res, curr, count) {
                if (res.code === 403) {
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
                limit();
            }
        });
    });

    // 监听头工具栏事件
    table.on('toolbar(locDetlStatis)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id);
        switch(obj.event) {
            case 'exportAll':
                layer.closeAll();
                layer.load(1, {shade: [0.1,'#fff']});
                location.href = baseUrl + "/locDetl/statis/export";
                layer.closeAll('loading');
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'locDetl': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/locDetl/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                            }
                        }
                    });
                });
                break;
        }
    });

    // 监听行工具事件
    table.on('tool(locDetlStatis)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            // 详情
            case 'detail':
                layer.open({
                    type: 2,
                    title: '详情',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: false,
                    content: 'locDetl_detail.html',
                    success: function(layero, index){
                        setFormVal(layer.getChildFrame('#detail', index), data, true);
                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
                        layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                    }
                });
                break;

        }
    });


    // 搜索栏搜索事件
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });

    // 搜索栏重置事件
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 时间选择器
    layDate.render({
        elem: '#modiTime\\$',
        type: 'datetime'
    });
    layDate.render({
        elem: '#appeTime\\$',
        type: 'datetime'
    });


});

// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    (child ? parent.tableIns : tableIns).reload({
        where: searchData,
        page: {
            curr: pageCurr
        },
        done: function (res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            if (res.data.length === 0 && count !== 0) {
                tableIns.reload({
                    where: searchData,
                    page: {
                        curr: pageCurr-1
                    }
                });
                pageCurr -= 1;
            }
            limit(child);
        }
    });
}

function detailScreen(index) {
    var detail = layer.getChildFrame('#data-detail', index);
    var height = detail.height()+60;
    if (height > ($(window).height()*0.9)) {
        height = ($(window).height()*0.8);
    }
    layer.style(index, {
//        top: (($(window).height()-height)/3)+"px",
        height: height+'px'
    });
}

$('body').keydown(function () {
    if (event.keyCode === 13) {
        $("#search").click();
    }
});

 src/main/webapp/views/locDetlStatis/check.html

New file
@@ -0,0 +1,59 @@
<!DOCTYPE html>
<html lang="en">
<head>
  <meta charset="utf-8">
  <title></title>
  <meta name="renderer" content="webkit">
  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
  <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
  <link rel="stylesheet" href="../../static/css/cool.css" media="all">
  <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

<!-- 搜索栏 -->
<div id="search-box" class="layui-form layui-card-header">
  <div class="layui-inline">
    <div class="layui-input-inline">
      <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
    </div>
  </div>
  <!-- 待添加 -->
  <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
    <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索
    </button>
    <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置
    </button>
  </div>
  <div class="layui-inline">
    <fieldset class="layui-elem-field">
      <legend>总计数量</legend>
      <div class="layui-field-box" id="countNum">
        请稍等
      </div>
    </fieldset>
  </div>
</div>

<!-- 表格 -->
<div class="layui-form">
  <table class="layui-hide" id="locDetlStatis" lay-filter="locDetlStatis"></table>
</div>
<script type="text/html" id="toolbar">

  <div class="layui-btn-container layui-col-md1">
    <button class="layui-btn" lay-event="exportAll" style="margin-top: -0px">导出全部</button>
  </div>
</script>


<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/locDetlStatis/locDetlStatis.js" charset="utf-8"></script>

</body>
</html>