Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

22 小时以前 9126e6315288e1ea50e74c70b099974522d6b172

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

@@ -40,15 +40,6 @@
                return SUCCESS;
            }
            switch (type){
//                case 13://出  3：取放
//                    if (Cools.isEmpty(wrkMastSta)){
//                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
//                        wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
//                        wrkMastSta1.setType(1);      //类型 1:非空  2:空板
//                        wrkMastSta1.setWrkType(3);                    //工作类型  1:取（叠盘）  2：拆盘  3：取放 5：满取  6：满放
//                        wrkMastStaService.insert(wrkMastSta1);
//                    }
//                    break;
                case 21://入库
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
@@ -71,7 +62,7 @@
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
                        if(wrkMast.getIoType() == 57){
                        if(wrkMast.getIoType() == 57 || wrkMast.getIoType() == 53){
                            switch (wrkMast.getCrnNo()) {
                                case 1:
                                    if (wrkMast.getSourceStaNo() < 2000) {
@@ -94,7 +85,7 @@
                                        wrkMastSta1.setStaEnd(1028);
                                        break;
                                    } else {
                                        wrkMastSta1.setStaEnd(2021);
                                        wrkMastSta1.setStaEnd(2024);
                                        break;
                                    }
                                case 5: