#

luxiaotao1123

2020-06-15 94f909816fbd7683185bf8d013a239bab865a698

#

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

@@ -261,15 +261,17 @@
             **/
            if (wrkMast.getIoType() == 11) {
                // 库位转移：源库位
                LocMast locMast = new LocMast();
                locMast.setLocNo(wrkMast.getSourceLocNo());
                LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
                if (Cools.isEmpty(locMast)) {
                    throw new CoolException("取消库位转移失败，源库位不存在:"+ wrkMast.getSourceLocNo());
                }
                locMast.setLocType("F");
                locMast.setModiTime(new Date());
                locMast.setModiUser(userId);
                locMastService.updateById(locMast);
            }
        // 出库取消（修改源库位）
        } else if (wrkMast.getWrkSts() > 10) {
        } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) {
            locNo = wrkMast.getSourceLocNo();
            // 出库 ===>> F.在库
            if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
@@ -281,21 +283,27 @@
            } else if (wrkMast.getIoType() == 11) {
                locType = "F";
                // 库位转移：目标库位
                LocMast locMast = new LocMast();
                locMast.setLocNo(wrkMast.getLocNo());
                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                if (Cools.isEmpty(locMast)) {
                    throw new CoolException("取消库位转移失败，目标库位不存在:"+ wrkMast.getSourceLocNo());
                }
                locMast.setLocType("O");
                locMast.setModiTime(new Date());
                locMast.setModiUser(userId);
                locMastService.updateById(locMast);
            }
        } else {
            throw new CoolException("当前工作状态无法取消");
        }
        // 删除工作档
        boolean wrkMastRes = wrkMastService.deleteById(wrkMast);
        // 删除工作档明细
        boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
        // 修改库位状态
        LocMast locMast = new LocMast();
        locMast.setLocNo(locNo);
        LocMast locMast = locMastService.selectById(locNo);
        if (Cools.isEmpty(locMast)) {
            throw new CoolException("取消工作档失败，库位不存在:"+ locNo);
        }
        locMast.setLocType(locType);
        locMast.setModiTime(new Date());
        locMast.setModiUser(userId);

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

@@ -306,6 +306,7 @@
                        layer.msg(res.msg);
                    })
                    layer.closeAll();
                    tableReload();
                });
                break;
            // 取消
@@ -315,6 +316,7 @@
                        layer.msg(res.msg);
                    })
                    layer.closeAll();
                    tableReload();
                });
                break;
            // 详情