From b2629d65e6af766b4d285068e954ca65aed513e5 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 14 一月 2026 10:17:55 +0800
Subject: [PATCH] logo不显示中扬信息
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 8ecbbfc..c63fb27 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -539,16 +539,16 @@
wrkDetl.setStandby1(locDto.getStandby1());
wrkDetl.setBatch(locDto.getBatch());
wrkDetl.setOrderNo(locDto.getOrderNo());
-// wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
- LocDetl locDel = locDetlService.selectOne(new EntityWrapper<LocDetl>()
- .eq("loc_no", locDto.getLocNo())
- .eq("batch", locDto.getBatch())
- .eq(!Objects.isNull(locDto.getBarcode()), "barcode", locDto.getBarcode())
- .eq("matnr", locDto.getMatnr()));
- if (Objects.isNull(locDel)) {
- throw new CoolException("鏁版嵁閿欒锛屽簱瀛樻槑缁嗕笉瀛樺湪锛侊紒");
- }
- wrkDetl.setAnfme(locDel.getAnfme());
+ wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
+// LocDetl locDel = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+// .eq("loc_no", locDto.getLocNo())
+// .eq("batch", locDto.getBatch())
+// .eq(!Objects.isNull(locDto.getBarcode()), "barcode", locDto.getBarcode())
+// .eq("matnr", locDto.getMatnr()));
+// if (Objects.isNull(locDel)) {
+// throw new CoolException("鏁版嵁閿欒锛屽簱瀛樻槑缁嗕笉瀛樺湪锛侊紒");
+// }
+// wrkDetl.setAnfme(locDel.getAnfme());
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
@@ -1392,6 +1392,10 @@
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
+ if (wrkMast.getWrkSts() != 15) {
+ throw new CoolException("褰撳墠浠诲姟鐘舵�佷笉鑳芥墽琛屾鎿嶄綔锛�");
+ }
+
Integer ioType = wrkMast.getIoType() - 50;
Integer wokNo;
// 鍏ュ嚭搴撶被鍨嬪垽鏂�
@@ -1453,7 +1457,6 @@
if (!locMastService.updateById(locMast)) {
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
-
wrkMast.setWrkCode(null);
if (!wrkMastService.updateById(wrkMast)) {
--
Gitblit v1.9.1