#

luxiaotao1123

2021-07-01 4ae446d2ea5cb42512d4e26f2f7bcf95242be5d0

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

@@ -97,8 +97,8 @@
        }
        LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
        // 有物料时修改为空库位或者空板库位，则删除库存明细
        if (oldLocMast.getLocType().equals("R") || oldLocMast.getLocType().equals("F")) {
            if (locMast.getLocType().equals("O") || locMast.getLocType().equals("D")) {
        if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
            if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
                locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
            }
        }
@@ -179,14 +179,14 @@
                    }
                    LocMast locMast = new LocMast();
                    locMast.setLocNo(locNo);
                    locMast.setLocType("O");
                    locMast.setLocSts("O");
                    locMast.setRow1(r); // 排
                    locMast.setBay1(b); // 列
                    locMast.setLev1(l); // 层
                    locMast.setCrnNo(crnNo); // 堆垛机
                    if (null != param.getWhsType()) {
                        locMast.setWhsType(Long.valueOf(param.getWhsType()));
                    }
                    locMast.setLocType1(param.getLocType1());
                    locMast.setLocType2(param.getLocType2());
                    locMast.setLocType3(param.getLocType3());
                    locMast.setAppeUser(getUserId());
                    locMast.setAppeTime(new Date());
                    locMast.setModiUser(getUserId());