自动化立体仓库 - WMS系统
zhangchao
2024-11-07 eb6768340c1b382442df9a20fbc3712857184755
显示上报数据
4个文件已修改
15 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/order/order.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/order/order.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -158,7 +158,7 @@
                break;
            default:
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param,  param.getPakin() == 1 ? true : false, param.get操作单据());
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }
@@ -249,7 +249,7 @@
                break;
            default:
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param,  param.getPakin() == 1 ? true : false, param.get操作单据());
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }
@@ -352,7 +352,7 @@
            //orderDetl.setiQuantity(childInfo.getIQuantity());
            orderDetl.setCsocode(param.getCsocode());
            //orderDetl.setbFree1(childInfo.getBFree1());
            orderDetl.setId(childInfo.getIds());
            orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
            orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1038,7 +1038,7 @@
        //自由项
        od.setBatch(Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch() + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
        //IDs
        od.setSku(odParam.getIPOsID());
        od.setSku(odParam.getId());
        od.setLength(odParam.getINum());
src/main/webapp/static/js/order/order.js
@@ -147,8 +147,8 @@
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'matnr', title: '商品编码', width: 160},
                            {field: 'maktx', title: '商品名称', width: 160},
                            {field: 'matnr', title: '商品编码', width: 140},
                            {field: 'maktx', title: '商品名称', width: 150},
                            //{field: 'batch', title: '批号'},
                            {field: 'anfme', title: '数量'},
                            {field: 'qty', title: '作业数量', style: 'font-weight: bold'},
@@ -167,6 +167,7 @@
                            {field: 'deadTime', title: '自由项'},
                            {field: 'processSts$', title: '工序'},
                            {field: 'specs', title: '规格'},
                            {field: 'reportQty', title: '上报数量'},
                            //{field: 'itemNum', title: '行唯一标识'}
                        ]],
                        request: {
src/main/webapp/views/order/order.html
@@ -311,7 +311,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.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/order/order.js?v=1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/order.js?v=2" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
    <option value="">选择类型</option>