#

LSH

2024-01-05 46793d6a0e430a290ffc02ff0460342361cd7f32

#

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

@@ -122,7 +122,7 @@
        this.wrkStart = wrkMast.getSourceStaNo();
        this.wrkEnd = wrkMast.getStaNo();
        this.staStart = basDevp.getDevNo();
        this.staEnd = wrkMast.getStaNo();
        this.staEnd = getStaEnd(wrkMast.getStaNo());
        this.createTime = now;
        this.updateTime = now;
        this.wrkSts = 0;
@@ -180,5 +180,18 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
    }

    public Integer getStaEnd(Integer souSta){
        switch (souSta){
            case 100:
            case 103:
            case 106:
            case 109:
            case 112:
            case 115:
                return souSta+1;
            default:return souSta;
        }
    }


}

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

@@ -49,12 +49,28 @@
                if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
                    continue;
                }
                boolean wrkTypeSign = fullKM(wrkMast);
                if (!Cools.isEmpty(wrkMast)){
                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,1);
                    if (result.getCode()==200){
                        continue;
                    }else {
                        System.out.println(staNo+"失败！");
                    if (wrkTypeSign) {
//                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,11);//1:取（叠盘）
//                        if (result.getCode()==200){
//                            continue;
//                        }else {
//                            System.out.println(staNo+"失败！");
//                        }
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3：取放
                        if (result.getCode()==200){
                            continue;
                        }else {
                            System.out.println(staNo+"失败！");
                        }
                    } else {
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3：取放
                        if (result.getCode()==200){
                            continue;
                        }else {
                            System.out.println(staNo+"失败！");
                        }
                    }
                }
            }
@@ -67,15 +83,15 @@
                if (wrkMast.getWrkSts()!=2){
                    continue;
                }
                boolean wrkTypeSign = fillKM(wrkMast);
                boolean wrkTypeSign = fullKM(wrkMast);
                if (wrkTypeSign){

                    boolean equals = wrkMast.getIoType().equals(1);
                }
                if (!Cools.isEmpty(wrkMast)){
                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,2);
                    if (result.getCode()==200){
                    if (result.getCode()==200) {
                        continue;
                    }else {
                    } else {
                        System.out.println(staNo+"失败！");
                    }
                }
@@ -83,7 +99,7 @@
        }
    }

    public boolean fillKM(WrkMast wrkMast){
    public boolean fullKM(WrkMast wrkMast){
        if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
            return true;
        }

 src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java

@@ -34,18 +34,32 @@
        try {
            WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
            switch (type){
                case 11://满出
                case 13://出  3：取放
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fillKM(wrkMast)? 0:1);
                        wrkMastSta1.setWrkType(3);
                        wrkMastSta1.setType(fullKM(wrkMast)? 0:1);      //类型 0:非空  1:空板
                        wrkMastSta1.setWrkType(3);                      //工作类型  1:取（叠盘）  2：放 3：取放 4：拆盘
                        wrkMastStaService.insert(wrkMastSta1);
                    }
                    break;
                case 2://入
                case 21://1:取（叠盘）
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fillKM(wrkMast)? 0:1);
                        wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
                        wrkMastSta1.setWrkType(1);
                        wrkMastStaService.insert(wrkMastSta1);
                    }
                case 22://2：放
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
                        wrkMastSta1.setWrkType(2);
                        wrkMastStaService.insert(wrkMastSta1);
                    }
                case 23://3：取放
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
                        wrkMastSta1.setWrkType(3);
                        wrkMastStaService.insert(wrkMastSta1);
                    }
@@ -60,7 +74,7 @@
        return FAIL;
    }

    public boolean fillKM(WrkMast wrkMast){
    public boolean fullKM(WrkMast wrkMast){
        if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
            return true;
        }