*

zwl

2023-02-07 e12c5d4da40a8f76ffd1953a5f1fbb1cadb652b7

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

@@ -303,7 +303,7 @@
                if ( inSta.getStaNo()==103 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) { continue; }
                if ( inSta.getStaNo()==105 && devpThread.ioModeOf3F == IoModeType.PAKOUT_MODE) { continue; }
                if ( inSta.getStaNo()==107 && devpThread.ioModeOf4F == IoModeType.PAKOUT_MODE) { continue; }

//                staProtocol.setPakMk(true);
                // 判断是否满足入库条件
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
@@ -370,7 +370,7 @@
                }


                staProtocol.setPakMk(true);
//                staProtocol.setPakMk(true);
//                // 入出库模式判断
//                if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()){
@@ -1778,7 +1778,10 @@
                        continue;
                    }

                    LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getId());
                    LocMast sourceLoc = locMastService.queryDemoSourceLoc0(crn.getId());
                    if(sourceLoc == null){
                        locMastService.queryDemoSourceLoc(crn.getId());
                    }
                    LocMast loc = locMastService.queryDemoLoc(crn.getId());
                    if (null == sourceLoc || null == loc) {
                        continue;