From e596214d84efa77d0cf316563548f1b1d7643a37 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 24 十一月 2025 08:40:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d51ef62..efaabed 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -89,7 +89,7 @@
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
- locOwner.getOwnerUuid(), // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛缂栧彿
locOwner.getOwner(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
@@ -258,7 +258,7 @@
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
- locOwner.getOwnerUuid(), // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛缂栧彿
locOwner.getOwner(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
@@ -661,7 +661,7 @@
try{
BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
new EntityWrapper<BasArmMastSign>()
- .eq("matnr", param.getSku())
+ .eq("matnr", param.getMatnr())
.eq("order_no", param.getOrderNo())
.eq("create_time", param.getBindingTags())
);
--
Gitblit v1.9.1