#

zjj

2024-03-21 882d2ee2d9a35bf02e5fbb11a79c3abffe9cfe61

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

@@ -145,9 +145,22 @@
        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
            return R.error();
        }
        if (!Cools.isEmpty(locMast.getContainerCode())){
            locMast.setBarcode(locMast.getContainerCode());
        }

        if (locMast.getEmptyContainer$().equals("N") ){
            if (locMast.getContainerCode().isEmpty() || locMast.getContainerTypeCode().isEmpty()){
                return R.error("容器编码或容器类型有误");
            }
        }
        if (locMast.getLocSts().equals("K")){
            locMast.setBarcode(null);
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());
        locMastService.updateById(locMast);
        locMastService.toWmsLocStatus(locMast);
        return R.ok();
    }

@@ -173,7 +186,7 @@
                    Date now =  new Date();
                    LocMast locMast = new LocMast();
                    locMast.setLocNo(locNo);
                    locMast.setLocSts("O");
                    locMast.setLocSts("K");
                    locMast.setRow1(r); // 排
                    locMast.setBay1(b); // 列
                    locMast.setLev1(l); // 层