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

TQS

2023-02-08 6b3b7d9c3434f3ae8cb12ef8431b16c185f14628

 src/main/java/com/zy/common/web/WcsController.java

@@ -142,6 +142,7 @@
        if(waitPakins.size()>0) {
            WaitPakin one = waitPakins.get(0);
            wrkMast.setFrozen(one.getFrozen());
            wrkMast.setMemo(one.getMemo());
        }
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {