#
luxiaotao1123
2020-06-16 5e5d65b9d45513a05fdd8a579a99192aaec073eb
#
4个文件已修改
28 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/WorkController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/WorkService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pakStore/locMove.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/WorkController.java
@@ -66,10 +66,9 @@
    @ManagerAuth(memo = "库位移转")
    public R locMoveStart(@RequestParam String sourceLocNo,
                          @RequestParam String targetLocNo) {
//        workService.emptyPlateOut(param, getUserId());
        workService.locMove(sourceLocNo, targetLocNo, getUserId());
        return R.ok("移库启动成功");
    }
    @RequestMapping("/hand/control/wrkMast")
    @ManagerAuth(memo = "手动处理工作档")
src/main/java/com/zy/asrs/service/WorkService.java
@@ -22,6 +22,10 @@
     */
    void emptyPlateOut(EmptyPlateOutParam param, Long userId);
    /**
     * 库位移转
     */
    void locMove(String sourceLocNo, String locNo, Long userId);
    /**
     * 手动完成工作档
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -225,6 +225,20 @@
    @Override
    @Transactional
    public void locMove(String sourceLocNo, String locNo, Long userId) {
        LocMast sourceLoc = locMastService.selectById(sourceLocNo);
        if (Cools.isEmpty(sourceLoc)){
            throw new CoolException("未找到库位");
        }
        LocMast loc = locMastService.selectById(locNo);
        if (Cools.isEmpty(loc)){
            throw new CoolException("未找到库位");
        }
    }
    @Override
    @Transactional
    public void completeWrkMast(String workNo, Long userId) {
        WrkMast wrkMast = wrkMastService.selectById(workNo);
        if (Cools.isEmpty(wrkMast)){
src/main/webapp/static/js/pakStore/locMove.js
@@ -86,6 +86,7 @@
    });
}
// 移库启动
function locMove() {
    var sourceLocNo = $("#sourceLocNo").val();
    var targetLocNo = $("#targetLocNo").val();
@@ -116,7 +117,10 @@
        method: 'POST',
        success: function (res) {
            if (res.code === 200) {
                $("#sourceLocNo").val("");
                $("#targetLocNo").val("");
                layer.closeAll();
                layer.msg(res.msg);
            } else if (res.code === 403) {
                top.location.href = baseUrl + "/";
            } else {
@@ -141,6 +145,7 @@
    // })
}
// 库位状态获取
var tips;
function locStatus(el) {
    let val = el.value;