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

whycq

2024-05-02 c937e665ccbb763968d30ef2fad61c9eb935abfe

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

@@ -194,6 +194,11 @@
                    }
                    //判断101和104是否是拣料、并板、盘点再入库   设备暂不支持101、104站盘点/拣料入库
                    WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
                    if(!Cools.isEmpty(wrkMast1)){
                        if (wrkMast1.getIoType()!=1){
                            continue;
                        }
                    }
                    if( !Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
                        log.error("101或104拣料、并板、盘点再入库", wrkMast1.getWrkNo());
                        continue;