#

luxiaotao1123

2022-05-14 2b71e7e4ab8896c2245bf68a874565310c2113ad

#

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

@@ -151,4 +151,11 @@
        return R.ok("任务号：" + startupDto.getWorkNo() + ";目标库位：" + startupDto.getLocNo());
    }

    @RequestMapping("/deal/preHave/start")
    @ManagerAuth(memo = "先入品处理")
    public R dealPreHave(@RequestParam Integer wrkNo) {
        StartupDto startupDto = workService.dealPreHaveStart(wrkNo, getUserId());
        return R.ok("任务重新入库，目标库位：" + startupDto.getLocNo());
    }

}

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

@@ -81,4 +81,10 @@
     * 通知档手动生成任务
     */
    StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId);

    /**
     * 通知档手动生成任务
     */
    StartupDto dealPreHaveStart(Integer wrkNo, Long userId);

}

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

@@ -752,7 +752,7 @@
                locSts = "D";
            // 库位转移 ===>> D.空桶/空栈板
            } else if (wrkMast.getIoType() == 11) {
                locSts = wrkMast.getFullPlt().equalsIgnoreCase("N")?"F":"D";
                locSts = wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F";
                // 库位转移：目标库位
                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                if (Cools.isEmpty(locMast)) {
@@ -880,4 +880,10 @@
        return wcsController.startupFullPutStore(301, list.get(0).getZpallet(), locTypeDto, list);
    }

    @Override
    public StartupDto dealPreHaveStart(Integer wrkNo, Long userId) {

        return null;
    }

}

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -320,7 +320,6 @@
                        layer.closeAll();
                    });
                }

                break;
            //  拣料入库
            case 'pick':
@@ -334,7 +333,12 @@
                break;
            //  先入品
            case 'preHave':
                layer.confirm('任务发送先入品异常！是否。。。。。。。。？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                layer.confirm('任务发生先入品异常。如需重新入库，请确保货物已放至堆垛机出库站！', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    http.post(baseUrl+"/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg, {icon: 1});
                    })
                    layer.closeAll();
                });
                break;
            //  空操作

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -113,10 +113,10 @@
</div>

<script type="text/html" id="operate">
    {{#if (d.preHave === 'Y') { }}
    {{#if (d.preHave === 'Y' && d.wrkSts === 3) { }}
    <a class="layui-btn layui-btn-primary layui-border-red layui-btn-xs btn-error" lay-event="preHave">先入品</a>
    {{# } }}
    {{#if (d.takeNone === 'Y') { }}
    {{#if (d.takeNone === 'Y' && d.wrkSts === 12) { }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-error" lay-event="takeNone">空操作</a>
    {{# } }}
    <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">明细</a>