Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

zyx

2024-04-07 cd13694033118da5ba6c5b9fff5a7cfdab07bf77

Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

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

@@ -219,6 +219,18 @@
        }
    }

    public String getIoStatus$(){
        if (null == this.ioStatus){ return null; }
        switch (this.ioStatus){
            case "N":
                return "未入库";
            case "Y":
                return "入库中";
            default:
                return this.ioStatus;
        }
    }

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
            return "";

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

@@ -352,12 +352,12 @@
            //修改入库通知档状态
            agvWaitPakinService.updateIoStatus(containerCode,"Y");
            //更新源站点状态
            updateAgvBasDevp(agvBasDevp,"R");
            updateAgvBasDevp(agvBasDevp,"R",containerType);
        }else {
            // 生成工作档 10.空板入库
            createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType);
            //更新源站点状态
            updateAgvBasDevp(agvBasDevp,"R",containerType);
            updateAgvBasDevp(agvBasDevp,"R",containerType,containerCode);
        }

        //更新目标库位状态和信息
@@ -396,7 +396,7 @@
        updateAgvLocMast(agvLocMast,"R");

        //修改站点状态
        updateAgvBasDevp(agvBasDevp,"S");
        updateAgvBasDevp(agvBasDevp,"S",(short)containerType,agvLocMast.getBarcode());

    }

@@ -669,6 +669,15 @@
        }
    }

    private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
        if(!Cools.isEmpty(agvBasDevp)){
            agvBasDevp.setLocSts(locSts);
            agvBasDevp.setLocType2(continerType);
            agvBasDevp.setBarcode(containerCode);
            agvBasDevpService.updateById(agvBasDevp);
        }
    }

    /*
    生成工作档明细
     */