From 123a17c9d50745ea609f91943adca64e5ed12355 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 12 四月 2025 09:08:14 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/service/CommonService.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 4e32bd5..008db5a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -110,8 +110,9 @@
throw new CoolException("浠诲姟涓嶅瓨鍦�");
}
- wrkMastLogService.save(wrkNo);
- wrkMastService.deleteById(wrkNo);
+ wrkMast.setMk("taskCancel");
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
return true;
}
@@ -123,18 +124,18 @@
throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
}
- if (!sourceLocMast.getLocSts().equals("F")) {
- throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
- }
+// if (!sourceLocMast.getLocSts().equals("F")) {
+// throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
+// }
LocMast locMast = locMastService.queryByLoc(param.getLocNo());
if (null == locMast) {
throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦�");
}
- if (!locMast.getLocSts().equals("O")) {
- throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
- }
+// if (!locMast.getLocSts().equals("O")) {
+// throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
+// }
// 鑾峰彇宸ヤ綔鍙�
int workNo = getWorkNo(WrkIoType.LOC_MOVE.id);
@@ -156,13 +157,13 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- sourceLocMast.setLocSts("R");
- sourceLocMast.setModiTime(new Date());
- locMastService.updateById(sourceLocMast);
-
- locMast.setLocSts("S");
- locMast.setModiTime(new Date());
- locMastService.updateById(locMast);
+// sourceLocMast.setLocSts("R");
+// sourceLocMast.setModiTime(new Date());
+// locMastService.updateById(sourceLocMast);
+//
+// locMast.setLocSts("S");
+// locMast.setModiTime(new Date());
+// locMastService.updateById(locMast);
return true;
}
--
Gitblit v1.9.1