From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 42cc7bb..c9df23c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -94,6 +94,8 @@
wrkMast.setWrkSts(WrkStsType.COMPLETE_MOVE.sts);
} else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) {
wrkMast.setWrkSts(WrkStsType.COMPLETE_CHARGE.sts);
+ } else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {
+ wrkMast.setWrkSts(WrkStsType.COMPLETE_LOC_MOVE.sts);
}
wrkMast.setModiTime(new Date());
@@ -108,21 +110,31 @@
throw new CoolException("浠诲姟涓嶅瓨鍦�");
}
- wrkMastLogService.save(wrkNo);
- wrkMastService.deleteById(wrkNo);
+ wrkMast.setMk("taskCancel");
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
return true;
}
//绉诲簱浠诲姟
public boolean createLocMoveTask(CreateLocMoveTaskParam param) {
Date now = new Date();
- LocMast locMast = locMastService.queryByLoc(param.getSourceLocNo());
- if (null == locMast) {
+ LocMast sourceLocMast = locMastService.queryByLoc(param.getSourceLocNo());
+ if (null == sourceLocMast) {
throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
}
- if (!locMast.getLocSts().equals("F")) {
+ 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("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
}
// 鑾峰彇宸ヤ綔鍙�
@@ -144,6 +156,14 @@
News.error("绉诲簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+
+ sourceLocMast.setLocSts("R");
+ sourceLocMast.setModiTime(new Date());
+ locMastService.updateById(sourceLocMast);
+
+ locMast.setLocSts("S");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
return true;
}
@@ -181,6 +201,10 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+ locMast.setLocSts("S");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+
return true;
}
@@ -216,6 +240,10 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+ locMast.setLocSts("R");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+
return true;
}
--
Gitblit v1.9.1