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

zjj

2024-12-20 3695eb9fa6062ef00e685835cf384c02e60f7b17

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

@@ -195,9 +195,9 @@
        if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
            try {
                // 保存工作明细档历史档
                if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
                    throw new CoolException("保存工作明细档历史档失败");
                }
//                if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
//                    throw new CoolException("保存工作明细档历史档失败");
//                }
                // 保存工作主档历史档
                if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
                    throw new CoolException("保存工作主档历史档失败");