#

yxFwq

2024-12-09 c84738851edb0c852d11ebb9e7d6a24cb4cbdcc1

#

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

@@ -264,14 +264,17 @@
            if (Cools.isEmpty(this.wrkSts)){
                return this.wrkSts+"：未知";
            }
//            BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
////        BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
//            BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.wrkSts.toString()));
//            if (!Cools.isEmpty(basJarMastStatus)){
//                return String.valueOf(basJarMastStatus.getBoxSpecs());
//            }
            if (Cools.isEmpty(this.ioType)){
                return this.wrkSts.toString();
            } else if (this.ioType == 100){
                switch (this.wrkSts){
                    case 0:
                        return this.wrkSts+"、初始";
                    case 99:
                        return this.wrkSts+"、充电中";
                    case 100:
                        return this.wrkSts+"、充电完成";
                }
            } else {
                switch (this.wrkSts){
                    case 1:
@@ -352,6 +355,7 @@
        } catch (Exception e){
            return this.wrkSts+"：未知==>异常："+e.getMessage();
        }
        return this.wrkSts+"：未知";
    }

    //任务类型 0: 未知  1: 开进料门  2: 关进料门  3: 开出料门  4: 关出料门  5: 入硫化罐  6: 入冷却槽  7: 穿梭车进冷却槽  B=>C  8: 穿梭车离开冷却槽 C=>B  9: 出冷却槽 10：A=>B 11:B=>A

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

@@ -260,19 +260,130 @@
        }
    }

//    public String getWrkSts$(){
//        try{
//            if (Cools.isEmpty(this.wrkSts)){
//                return this.wrkSts+"：未知";
//            }
////            BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
//////        BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
////            BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.wrkSts.toString()));
////            if (!Cools.isEmpty(basJarMastStatus)){
////                return String.valueOf(basJarMastStatus.getBoxSpecs());
////            }
//            if (true){
//                return this.wrkSts.toString();
//            }
//        } catch (Exception e){
//            return this.wrkSts+"：未知==>异常："+e.getMessage();
//        }
//        return this.wrkSts+"：未知";
//    }

    /**
     * 工作状态
     * 0:初始  wrk_sts
     * 1：RGV小车避让、2：避让完成、3：开门中、4：开门完成、5：更新完成    //io_type = 1、3
     * 1：RGV小车避让、2：避让完成、3：关门中、4：关门完成、5：更新完成    //io_type = 2、4
     * 1：RGV小车移动、2：RGV小车到位、3：rgv取货、4：rgv取货完成、5：Ste穿梭版入硫化罐、6：入罐完成、7：更新完成   //io_type = 5   STE  A面穿梭车
     * 1：RGV小车移动、2：RGV小车到位、3：Ste穿梭版取货、4：取货完成等待下一步、5：Ste穿梭版放货至冷却池、6：放货完成、7：更新完成   //io_type = 6  STE  B面穿梭车
     * 1：RGV小车移动、2：RGV小车到位、3：Ste穿梭版移动中、4：移动完成、5：更新完成   //io_type = 7  B=>C   、8 C=>B
     * 1：Ste穿梭版取放货中、2：放货完成等待下一步、3：输送线任务下发完成、4：更新完成   //io_type = 9   STE   末端输送线
     * 1：RGV小车移动、2：RGV小车到位、3：Ste穿梭版移动中、4：移动完成、5：更新完成   //io_type = 10、11
     * 1：RGV小车移动、2：RGV小车到位、3：Ste穿梭版移动中、4：移动完成、5：更新完成   //io_type = 10、11
     */
    public String getWrkSts$(){
        try{
            if (Cools.isEmpty(this.wrkSts)){
                return this.wrkSts+"：未知";
            }
//            BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
////        BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
//            BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.wrkSts.toString()));
//            if (!Cools.isEmpty(basJarMastStatus)){
//                return String.valueOf(basJarMastStatus.getBoxSpecs());
//            }
            if (true){
            if (Cools.isEmpty(this.ioType)){
                return this.wrkSts.toString();
            } else if (this.ioType == 100){
                switch (this.wrkSts){
                    case 0:
                        return this.wrkSts+"、初始";
                    case 99:
                        return this.wrkSts+"、充电中";
                    case 100:
                        return this.wrkSts+"、充电完成";
                }
            } else {
                switch (this.wrkSts){
                    case 1:
                        switch (this.ioType){
                            case 9:
                                return this.wrkSts+"、Ste穿梭版取放货中";
                            default:
                                return this.wrkSts+"、RGV平衡车移动";
                        }
                    case 2:
                        switch (this.ioType){
                            case 9:
                                return this.wrkSts+"、Ste穿梭版放货完成等待下一步";
                            default:
                                return this.wrkSts+"、RGV平衡车到位";
                        }
                    case 3:
                        switch (this.ioType){
                            case 1:
                            case 3:
                                return this.wrkSts+"、硫化罐开门中";
                            case 2:
                            case 4:
                                return this.wrkSts+"、硫化罐关门中";
                            case 5:
                                return this.wrkSts+"、RGV平衡车取货";
                            case 6:
                                return this.wrkSts+"、Ste穿梭版取货";
                            case 9:
                                return this.wrkSts+"、输送线任务下发完成";
                            default:
                                return this.wrkSts+"、Ste穿梭版移动中";
                        }
                    case 4:
                        switch (this.ioType){
                            case 1:
                            case 3:
                                return this.wrkSts+"、硫化罐开门完成";
                            case 2:
                            case 4:
                                return this.wrkSts+"、硫化罐关门完成";
                            case 5:
                                return this.wrkSts+"、RGV平衡车取货完成";
                            case 6:
                                return this.wrkSts+"、Ste穿梭版取货完成";
                            case 9:
                                return this.wrkSts+"、更新完成";
                            default:
                                return this.wrkSts+"、Ste穿梭版移动完成";
                        }
                    case 5:
                        switch (this.ioType){
                            case 5:
                                return this.wrkSts+"、Ste穿梭版入硫化罐";
                            case 6:
                                return this.wrkSts+"、Ste穿梭版放货至冷却池";
                            default:
                                return this.wrkSts+"、更新完成";
                        }
                    case 6:
                        switch (this.ioType){
                            case 5:
                                return this.wrkSts+"、Ste穿梭版入硫化罐完成";
                            case 6:
                                return this.wrkSts+"、Ste穿梭版放货完成";
                            default:
                                return this.wrkSts+"、更新完成";
                        }
                    case 7:
                        switch (this.ioType){
                            default:
                                return this.wrkSts+"、更新完成";
                        }
                    default:
                        return this.wrkSts.toString();
                }
            }
        } catch (Exception e){
            return this.wrkSts+"：未知==>异常："+e.getMessage();