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

cp

2024-01-17 a1ea92d773f2fc846651c0c31d18ccc9ed1a8fb2

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

@@ -391,7 +391,7 @@

//                    WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
                    ledThread.errorReset();

                    if (wrkMast == null) {
                        wrkMast = wrkMastMapper.selectPickStep(barcode);
                    }