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

1

2025-12-24 c7a31680a32a45c7d47af5162eb8edcb9824d16a

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

@@ -271,6 +271,10 @@
        if(wrkMast1== null){
            return  R.error("无该盘点移栽任务");
        }
        WrkMast wrkMast2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",9997));
        if(wrkMast2 != null){
            throw new CoolException("存在9997盘点移栽任务");
        }
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(transplantWork.getWorkNo());
        Date now = new Date();
        // 生成工作档
@@ -320,6 +324,10 @@
        if(wrkMast1== null){
            return  R.error("无该盘点移栽任务");
        }
        WrkMast wrkMast2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",9996));
        if(wrkMast2 != null){
            throw new CoolException("存在9997盘点移栽任务");
        }
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(transplantWork.getWorkNo());
        Date now = new Date();