#和得服务器

1

15 小时以前 b5e0def6c1356c2fb82c73310389856ffb54c166

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

@@ -28,8 +28,15 @@

    public ReturnT<String> start(WrkMast wrkMast,BasDevp basDevp,Integer type) {
        try {
            WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
            if (!Cools.isEmpty(wrkMastSta)){
            WrkMastSta wrkMastSta = null;
            if(wrkMast != null){
                wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
            }
            if(basDevp.getWrkNo() != null){
                wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", basDevp.getWrkNo().longValue()));
            }

            if (!Cools.isEmpty(wrkMastSta) ){
                return SUCCESS;
            }
            switch (type){
@@ -52,6 +59,7 @@
                            case 1015:wrkMastSta1.setStaEnd(1018);break;
                            case 1025:wrkMastSta1.setStaEnd(1028);break;
                            case 1032:wrkMastSta1.setStaEnd(1035);break;
                            case 4001:wrkMastSta1.setStaEnd(4001);break;
                        }
                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
                        wrkMastSta1.setWrkType(5);//工作类型  1:取（叠盘）  2：拆盘  3：取放 5：满取  6：满放
@@ -62,21 +70,25 @@
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
                        if(wrkMast.getWrkNo() == 1108){
                            wrkMastSta1.setStaEnd(1106);
                        switch ((wrkMast.getStaNo())){
                            case 1108:wrkMastSta1.setStaEnd(1109);break;
                            case 4006:wrkMastSta1.setStaEnd(1018);break;
                        }
                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
                        wrkMastSta1.setWrkType(6);//工作类型  1:取（叠盘）  2：拆盘  3：取放 5：满取  6：满放
                        wrkMastStaService.insert(wrkMastSta1);
                    };
                    break;
//                case 23://3：满取
//                    if (Cools.isEmpty(wrkMastSta)){
//                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
//                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
//                        wrkMastSta1.setWrkType(5);
//                        wrkMastStaService.insert(wrkMastSta1);
//                    }
                case 23://异常退出
                    WrkMast wrkMast23 = new WrkMast();
                    wrkMast23.setWrkNo(basDevp.getWrkNo());
                    wrkMast23.setSourceStaNo(basDevp.getDevNo());
                    wrkMast23.setStaNo(1041);

                    WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast23,new Date(),basDevp);
                    wrkMastSta1.setType(2);
                    wrkMastSta1.setWrkType(6);
                    wrkMastStaService.insert(wrkMastSta1);
                default:
                    return SUCCESS;
            }