From ef97c2c8ede17710583bae8c69b3d1419775e992 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期三, 09 十月 2024 09:40:05 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 9 ++++++++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java | 10 +++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index 4a90791..09d2456 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -344,6 +344,13 @@
assert ioType != null;
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
+
+ String barcode = locMast.getBarcode();
+ int count = wrkMastService.count(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getBarcode, barcode));
+ if (count > 0) {
+ throw new CoolException("宸ヤ綔妗e凡鐢熸垚");
+ }
+
// 鑾峰彇璺緞
StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getStnNo, staNo).eq(StaDesc::getHostId, hostId));
// 鐢熸垚宸ヤ綔鍙�
@@ -362,7 +369,7 @@
wrkMast.setPicking("N"); // 鎷f枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setBarcode(barcode);
wrkMast.setAppeUser(String.valueOf(userId)); // 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiUser(String.valueOf(userId));
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
index eeb987e..5ee49c6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
@@ -42,11 +42,11 @@
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
// throw new CoolException("涓婃姤"+name);
}
- if (jsonObject.getInteger("code").equals(200) || jsonObject.getInteger("Code").equals(200)) {
-
- } else {
-
- }
+// if (jsonObject.getInteger("code").equals(200) || jsonObject.getInteger("Code").equals(200)) {
+//
+// } else {
+//
+// }
} catch (Exception e) {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
--
Gitblit v1.9.1