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

TQS

2022-11-29 d759220378927d1481882de1c7c476ac47ce2dea

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

@@ -138,6 +138,12 @@
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);

        if(waitPakins.size()>0) {
            WaitPakin one = waitPakins.get(0);
            wrkMast.setFrozen(one.getFrozen());
            wrkMast.setMemo(one.getMemo());
        }
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");