From 9a3370c0ba5e04b0f48148eeafe6cec0b1ab9590 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 14 一月 2026 08:44:19 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 9257903..2120202 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -454,7 +454,7 @@
throw new CoolException("鏈哄彴淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒锛�");
}
- List<LocAroundBind> binds = locAroundBindService.selectList( new EntityWrapper<LocAroundBind>()
+ List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>()
.eq("dev_no", basDevice.getDevNo())
.eq("is_default", 1));
@@ -1324,25 +1324,26 @@
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
Integer ioType = wrkMast.getIoType() - 50;
- int wokNo = wrkMast.getWrkNo();
+// int wokNo = wrkMast.getWrkNo();
// 鍏ュ嚭搴撶被鍨嬪垽鏂�
- if (Objects.isNull(wrkMast.getWrkCode())) {
- if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
- throw new CoolException("褰撳墠鍏ュ嚭搴撶被鍨嬫棤娉曡繘琛屾搷浣�");
- }
- // 宸ヤ綔鐘舵�佸垽鏂�
- if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
- throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曡繘琛屾搷浣�");
- }
- } else {
- if (wrkMast.getIoType() == 103) {
- ioType = 1;
- } else if (wrkMast.getIoType() == 101) {
- ioType = 10;
- }
-
- wokNo = commonService.getWorkNo(0);
+// if (Objects.isNull(wrkMast.getWrkCode())) {
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
+ throw new CoolException("褰撳墠鍏ュ嚭搴撶被鍨嬫棤娉曡繘琛屾搷浣�");
}
+ // 宸ヤ綔鐘舵�佸垽鏂�
+ if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
+ throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曡繘琛屾搷浣�");
+ }
+// }
+
+// else {
+// if (wrkMast.getIoType() == 103) {
+// ioType = 1;
+// } else if (wrkMast.getIoType() == 101) {
+// ioType = 10;
+// }
+// wokNo = commonService.getWorkNo(0);
+// }
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
@@ -1390,7 +1391,7 @@
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void backLocOperation(String workNo, Long userId) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (Cools.isEmpty(wrkMast)) {
@@ -1440,7 +1441,6 @@
if (Cools.isEmpty(wrkDetls)) {
throw new CoolException("鏁版嵁閿欒锛屼换鍔℃。鏄庣粏涓嶅瓨鍦� 锛侊紒");
}
-
wrkDetls.forEach(wrkDetl -> {
WrkDetl wrkDetl1 = new WrkDetl();
BeanUtils.copyProperties(wrkDetl, wrkDetl1);
@@ -1459,8 +1459,6 @@
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
}
-
-
@Override
--
Gitblit v1.9.1