自动化立体仓库 - WMS系统
zjj
2023-06-02 8e711598e5042d45e7d3be978b43a9e74425cff1
#拣货单单据未出标红
5个文件已修改
39 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OutController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocDetlMapper.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/picking/picking.js 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/home/map.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OutController.java
@@ -116,7 +116,7 @@
            }
        }
        if (Cools.isEmpty(locDtos)) {
            return R.error("立库参数为空,请生成拣货单,平库拣货出库");
            return R.ok("立库参数为空,请生成拣货单,平库拣货出库");
        }
        boolean lack = true;
        for (LocDto locDto : locDtos) {
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -118,6 +118,10 @@
                manLocDetl.setCreateTime(now);
                manLocDetl.setModiTime(now);
                manLocDetl.setCreateBy(userId);
                String uuid = String.valueOf(System.currentTimeMillis());
                manLocDetl.setUuid(uuid);
                manLocDetl.setStatus(1);
                manLocDetl.setPayment(1);
                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
                manLocDetlService.insert(manLocDetl);
            }else {
src/main/resources/mapper/LocDetlMapper.xml
@@ -270,9 +270,7 @@
<!--                and (a.batch IS NULL OR a.batch = '')-->
<!--            </otherwise>-->
<!--        </choose>-->
        <if test="batch != null">
            and a.batch = #{batch}
        </if>
        <choose>
            <when test="owner != null and owner !=0">
                and a.owner = #{owner}
src/main/webapp/static/js/picking/picking.js
@@ -26,7 +26,7 @@
            // {type: 'checkbox'}
            {type: 'numbers'}
            ,{field: 'wrkNo', align: 'center',title: 'id', hide:true}
            ,{field: 'docNum',title: '拣货单号' , templet: '#orderNoTpl'}
            ,{field: 'docNum',title: '拣货单号' }
            ,{align: 'center', title: '二维码', toolbar: '#operate', width: 200 , hide:true}
            ,{align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160}
            ,{field: 'status$', align: 'center',title: '状态'}
@@ -59,6 +59,14 @@
            }
            pageCurr=curr;
            limit();
            var index = -1;
            $("[data-field='status$']").children().each(function () {
                index++;
                if ($(this).text() === '未出库') {
                    $('tr').eq(index).css("color", 'red');
                }
            });
        }
    });
@@ -97,13 +105,14 @@
                    type: 1,
                    title: false,
                    area: '1200px',
                    offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                    offset: [top + 'px', (left - 450 + $a.outerWidth()) + 'px'],
                    shade: .01,
                    shadeClose: true,
                    fixed: false,
                    content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
                    success: function (layero) {
                        table.render({
                            id:'lookSSXMTable',
                            elem: '#lookSSXMTable',
                            headers: {token: localStorage.getItem('token')},
                            url: baseUrl+'/ManPakOut/list/auth',
@@ -147,8 +156,18 @@
                            response: {
                                statusCode: 200
                            },
                            done: function () {
                            done: function (res) {
                                $(layero).find('.layui-table-view').css('margin', '0');
                                var index = -1;
                                $("[data-field='status$']").children().each(function () {
                                    index++;
                                    if ($(this).text() === '未出库') {
                                        $('tr').eq(index).css("color", 'red');
                                    }
                                });
                            },
                            size: ''
                        });
@@ -302,6 +321,8 @@
});
// 关闭动作
src/main/webapp/views/home/map.html
@@ -44,7 +44,7 @@
            color: #fff;
            /*transform: perspective(130px) rotateX(30deg) translateZ(-20px);*/
            box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);
            border-radius: 50% 20% / 10% 40%;
            /*border-radius: 50% 20% / 10% 40%;*/
        }
        .pointBox:hover{