From 0c26a0906a17b14cd7966a334f66976cba1147ed Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 九月 2025 17:01:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ynhfwcs1' into ynhfwcs1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b3d8e14..d87bdec 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -133,10 +133,9 @@
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "F")
- .eq("loc_no", locNo)
- .eq("barcode", param.getBarcode()));
+ .eq("loc_no", locNo));
if(Cools.isEmpty(locMast)){
- result = R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + locMast.getLocNo());
+ result = R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + locNo);
return result;
}
@@ -144,7 +143,7 @@
return result;
}catch (Exception e){
log.error("浠诲姟涓嬪彂寮傚父" + e);
- return R.error();
+ return R.error(e.getMessage());
}finally {
apiLogService.save("wms浠诲姟涓嬪彂鎺ュ彛"
,request.getRemoteAddr()+request.getRequestURI()
--
Gitblit v1.9.1