#

1

2 天以前 52bf6adbb12da2690be2db07fd6620844e84e6d3

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

@@ -59,6 +59,7 @@
                            case 1015:wrkMastSta1.setStaEnd(1018);break;
                            case 1025:wrkMastSta1.setStaEnd(1028);break;
                            case 1032:wrkMastSta1.setStaEnd(1035);break;
                            case 2037:wrkMastSta1.setStaEnd(2037);break;
                            case 4001:wrkMastSta1.setStaEnd(4001);break;
                        }
                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
@@ -70,9 +71,51 @@
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
                        switch ((wrkMast.getStaNo())){
                            case 1108:wrkMastSta1.setStaEnd(1109);break;
                            case 4006:wrkMastSta1.setStaEnd(1018);break;
                        if(wrkMast.getIoType() == 57){
                            switch (wrkMast.getCrnNo()) {
                                case 1:
                                    if (wrkMast.getSourceStaNo() < 2000) {
                                        wrkMastSta1.setStaEnd(1004);
                                        break;
                                    } else {
                                        wrkMastSta1.setStaEnd(2006);
                                        break;
                                    }
                                case 2:
                                    if (wrkMast.getSourceStaNo() < 2000) {
                                        wrkMastSta1.setStaEnd(1014);
                                        break;
                                    } else {
                                        wrkMastSta1.setStaEnd(2012);
                                        break;
                                    }
                                case 4:
                                    if (wrkMast.getSourceStaNo() < 2000) {
                                        wrkMastSta1.setStaEnd(1028);
                                        break;
                                    } else {
                                        wrkMastSta1.setStaEnd(2021);
                                        break;
                                    }
                                case 5:
                                    if (wrkMast.getSourceStaNo() < 2000) {
                                        wrkMastSta1.setStaEnd(1035);
                                        break;
                                    } else {
                                        wrkMastSta1.setStaEnd(2030);
                                        break;
                                    }
                            }
                        }else{
                            switch ((wrkMast.getStaNo())){
                                case 1108:wrkMastSta1.setStaEnd(1109);break;
                                case 4006:
                                    if(wrkMastSta1.getStaStart()>2000){
                                        wrkMastSta1.setStaEnd(2018);break;
                                    }else{
                                        wrkMastSta1.setStaEnd(1018);break;
                                    }
                            }
                        }
                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
                        wrkMastSta1.setWrkType(6);//工作类型  1:取（叠盘）  2：拆盘  3：取放 5：满取  6：满放