From c7a31680a32a45c7d47af5162eb8edcb9824d16a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 24 十二月 2025 15:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/common/web/WcsController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 61250b6..9b8a2b8 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/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();
--
Gitblit v1.9.1