From 8b75fe61a3eefe36761aa0f82a79b59342aa6709 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 20 十月 2025 16:10:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 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 0eff044..c2a3112 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -620,7 +620,7 @@
if (Cools.isEmpty(basArmMastOld)){
basArmMastService.insert(basArmMast);
} else {
- throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ throw new CoolException("绛夊緟鍓嶈竟璐х墿鎶撳彇锛侊紒锛�"+ JSON.toJSONString(param));
}
}
@@ -641,6 +641,7 @@
new EntityWrapper<BasArmMastSign>()
.eq("matnr", param.getSku())
.eq("order_no", param.getOrderNo())
+ .eq("create_time", param.getBindingTags())
);
if (!Cools.isEmpty(basArmMastSign)){
basArmMastSign.setStatus(1);
@@ -730,19 +731,10 @@
@Override
@Transactional
public boolean TaskArmWorkOrderSign(OrderArmEndParam param) {
- BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
- new EntityWrapper<BasArmMastSign>()
- .eq("matnr", param.getSku())
- .eq("order_no", param.getOrderNo())
- );
- if (Cools.isEmpty(basArmMastSign)){
-// throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
- return false;
- }
BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
new EntityWrapper<BasArmMastSign>()
.eq("order_no", param.getOrderNo())
- .eq("create_time", basArmMastSign.getCreateTime())
+ .eq("create_time", param.getBindingTags())
.eq("status", 0)
);
if (Cools.isEmpty(basArmMastSignNew)){
--
Gitblit v1.9.1