#1

czkh

23 小时以前 bbc31545c8fdcf21adb7ebf227d5b62db45b4e95

#1

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -925,11 +925,13 @@
                        if (wrkMast.getIoType() >= 100) {
                            WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep1(crn.getId(), wrkMast.getSourceStaNo());
                            if (wrkMast1 != null) {
                                if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(2,5)) == 1 || (staProtocol.isAutoing()&&staProtocol.isLoading())){
                                if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(3,5)) == 1 || (staProtocol.isAutoing() && staProtocol.isLoading())){
                                    this.outPut(crn, crnProtocol, mark);
                                    continue;
                                }
                                    //continue;
                                }else {
                                this.outTake(crn, crnProtocol, 2, mark);
                                }
                                //this.outTake(crn, crnProtocol, 2, mark);
                            } else {
                                this.outPut(crn, crnProtocol, mark);
                            }
@@ -954,11 +956,13 @@
                        if (wrkMast.getIoType() >= 100) {
                            WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep1(crn.getId(), wrkMast.getSourceStaNo());
                            if (wrkMast1 != null) {
                                if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(2,5)) == 29 || (staProtocol.isAutoing()&&staProtocol.isLoading())){
                                if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(3,5)) == 29 || (staProtocol.isAutoing() && staProtocol.isLoading())){
                                    this.outPut(crn, crnProtocol, mark);
                                    continue;
                                }
                                    //continue;
                                }else {
                                this.outTake(crn, crnProtocol, 1, mark);
                                }
                                //this.outTake(crn, crnProtocol, 1, mark);
                            } else {
                                this.outPut(crn, crnProtocol, mark);
                            }