#更改库位状态代码

zjj

2024-01-03 bdc2389275719eedaa8eefd52aa86f1c18d8e234

#更改库位状态代码

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

@@ -921,17 +921,17 @@
            LocMast locMast = locMastService.selectByLocNo(locNo);
            if (type == 1){
                locMast.setBarcode(barcode);
                locMast.setLocSts("F");
                locMast.setLocSts("Z");
                locMastService.updateById(locMast);
            }else if (type == 2){
                originLoc.setLocSts("O");
                originLoc.setLocSts("K");
                originLoc.setBarcode("");
                locMastService.updateById(originLoc);
            }else if (type == 3){
                originLoc.setLocSts("O");
                originLoc.setLocSts("K");
                originLoc.setBarcode("");
                locMast.setBarcode(barcode);
                locMast.setLocSts("F");
                locMast.setLocSts("Z");
                locMastService.updateById(originLoc);
                locMastService.updateById(locMast);
            }

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

@@ -154,7 +154,7 @@
                return R.error("容器编码或容器类型有误");
            }
        }
        if (locMast.getLocSts().equals("O")){
        if (locMast.getLocSts().equals("K")){
            locMast.setBarcode(null);
        }
        locMast.setModiUser(getUserId());
@@ -186,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); // 层

 src/main/java/com/zy/asrs/entity/ViewLocMapDto.java

@@ -52,11 +52,11 @@
                this.bgc = "#00B271";
                this.color = "#fff";
                break;
            case "F":
            case "Z":
                this.bgc = "#479AC7";
                this.color = "#fff";
                break;
            case "O":
            case "K":
                this.bgc = "#B45B3E";
                this.color = "#fff";
                break;
@@ -76,7 +76,7 @@
                this.bgc = "#F0DAD2";
                this.color = "#000";
                break;
            case "X":
            case "J":
                this.bgc = "#bac296";
                this.color = "#fff";
                break;

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

@@ -89,12 +89,12 @@
        param.setWarehouseId("1688469798893297665");
        param.setLocationCode(Utils.getWmsLocNo(locMast.getLocNo()));
        param.setEmptyContainer(locMast.getEmptyContainer$());
        if (locMast.getLocSts().equals("Z")){
        if (locMast.getLocSts().equals("J")){
            param.setStatus("JY");
        }else {
            param.setStatus("QY");
        }
        if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("O")){
        if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("K")){
            param.setContainerCode("");
            param.setContainerTypeCode("");
        }else {

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

@@ -1000,7 +1000,7 @@

                //更新库位状态
                LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
                locMast.setLocSts("F");//F.在库
                locMast.setLocSts("Z");//F.在库
                locMast.setBarcode(taskWrk.getBarcode());//托盘码
                locMast.setModiTime(now);
                locMast.setModiUser(9999L);
@@ -1014,7 +1014,7 @@

                //更新库位状态
                LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
                locMast.setLocSts("O");//O.空库位
                locMast.setLocSts("K");//O.空库位
                locMast.setBarcode("");//托盘码
                locMast.setModiTime(now);
                locMast.setModiUser(9999L);

 src/main/java/com/zy/asrs/task/TaskLogScheduler.java

@@ -81,7 +81,7 @@
                    Date now = new Date();
                    //更新库位状态
                    LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
                    locMast.setLocSts("O");//O.空库位
                    locMast.setLocSts("K");//O.空库位
                    locMast.setBarcode("");//托盘码
                    locMast.setModiTime(now);
                    locMast.setModiUser(9999L);
@@ -89,7 +89,7 @@

                    //更新库位状态
                    LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
                    locMast2.setLocSts("F");//F.在库
                    locMast2.setLocSts("Z");//F.在库
                    locMast2.setBarcode(taskWrk.getBarcode());//托盘码
                    locMast2.setModiTime(now);
                    locMast2.setModiUser(9999L);

 src/main/java/com/zy/common/service/CommonService.java

@@ -146,7 +146,7 @@
                String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
                // 检测目标库位是否为空库位
                LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                if (shallowLoc != null && shallowLoc.getLocSts().equals("K")) {
                    if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                        if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
                            locMast = shallowLoc;
@@ -169,7 +169,7 @@
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties,  loc.getLocNo());
                    // 检测目标库位是否为空库位
                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                    if (shallowLoc != null && shallowLoc.getLocSts().equals("K")) {
                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                            locMast = shallowLoc;
                            crnNo = locMast.getCrnNo();
@@ -272,14 +272,14 @@
                // 目标库位 ===>> 浅库位， 则校验其深库位是否为 F D X
                if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
                    LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
                    if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
                    if (!deepLoc.getLocSts().equals("Z") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
                        locMast = null;
                    }
                }
                // 目标库位 ===>> 深库位， 则校验其浅库位是否为 O
                if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
                    LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
                    if (!shallowLoc.getLocSts().equals("O")) {
                    if (!shallowLoc.getLocSts().equals("K")) {
                        locMast = null;
                    }
                }