#

LSH

2024-05-17 5b6c56096af8a8262bff43371ecca9b500269586

#

 src/main/java/com/zy/common/web/WcsController.java

@@ -487,7 +487,8 @@
        // 检索库位
        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto);
//        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto);
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),null,null, locTypeDto);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档

 src/main/webapp/static/js/rowLastno/rowLastno.js

@@ -18,9 +18,10 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox', fixed: 'left'}
            // {type: 'checkbox', fixed: 'left'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'whsType', align: 'center',title: '类别', width:80}
//             ,
            {field: 'whsType', align: 'center',title: '类别', width:80}
            ,{field: 'wrkMk', align: 'center',title: '当前工作号'}
            ,{field: 'sRow', align: 'center',title: '起始排号'}
            ,{field: 'currentRow', align: 'center',title: '当前排号', style: 'color: #AA3130;font-weight: bold'}

 src/main/webapp/views/rowLastno/rowLastno.html

@@ -23,7 +23,7 @@
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
<!--        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>