cp
2024-11-19 7ee9a0cf8b068c368d9760e25b8c90a6297ab7a3
完善
4个文件已修改
16 ■■■■■ 已修改文件
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/webapp/static/js/mat/mat.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/webapp/static/js/order/out.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/webapp/views/order/out.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
@@ -835,6 +835,9 @@
        }
        for (OrderDetl o : orderDetls
        ) {
            if(o.getAnfme().equals(o.getQty())){
                continue;
            }
            for (LocDetl l : locDetls
            ) {
                if (o.getMatnr().equals(l.getMatnr())) {
zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
@@ -52,7 +52,7 @@
        url: baseUrl+'/mat/page/auth',
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        limits: [16, 30, 50, 100, 200, 500,1000,2000],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-105',
zy-asrs-wms/src/main/webapp/static/js/order/out.js
@@ -24,7 +24,7 @@
        url: baseUrl+'/orderDetl/pakout/list/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        limits: [15, 30, 50, 100, 200, 500,1000,2000],
        toolbar: '#orderDetToolbar',
        height: 'full-120',
        where: {order_id: 9999999999},
zy-asrs-wms/src/main/webapp/views/order/out.html
@@ -196,11 +196,10 @@
    <span name="locNo"
    {{# if( d.lack === false){ }}
    class="layui-badge layui-badge-green" >{{d.locNo}}</span>
    {{# else if( d.locNo === '在平库'){ }}
    class="layui-badge layui-badge-green" >{{d.locNo}}</span>
    {{# } }}
        {{# } else { }}
        class="layui-badge layui-badge-red" >库存不足</span>
    {{# }else if(d.locNo === '在平库'){ }}
    class="layui-badge layui-badge-blue" >在平库</span>
    {{# } else { }}
    class="layui-badge layui-badge-red" >库存不足</span>
    {{# } }}
</script>