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

whycq

2023-10-11 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -431,9 +431,13 @@
            if (wrkDetls.get(0).getOrderNo() != null) {
                for (WrkDetl wrkDetl : wrkDetls) {
                    String orderNo$ = "";
                    JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
                        resultRecords.add(detlDto.getOrderNo());
                    });
                    if(!wrkDetl.getOrderNo().startsWith("[") || !wrkDetl.getOrderNo().endsWith("]")) {
                        return wrkDetl.getOrderNo();
                    } else {
                        JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
                            resultRecords.add(detlDto.getOrderNo());
                        });
                    }
                }

            }