From f0adc332d570cde0084bce7372ae7b9653b8c93b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 02 十月 2025 11:49:59 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 7183047..0eff044 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -619,18 +619,6 @@
);
if (Cools.isEmpty(basArmMastOld)){
basArmMastService.insert(basArmMast);
- try{
- BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
- new EntityWrapper<BasArmMastSign>()
- .eq("matnr", param.getSku())
- .eq("order_no", param.getOrderNo())
- );
- if (Cools.isEmpty(basArmMastSign)){
- basArmMastSign.setStatus(1);
- basArmMastSignService.updateById(basArmMastSign);
- }
- } catch (Exception e){
- }
} else {
throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
@@ -646,6 +634,19 @@
);
if (Cools.isEmpty(basArm)){
throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ }
+
+ try{
+ BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
+ new EntityWrapper<BasArmMastSign>()
+ .eq("matnr", param.getSku())
+ .eq("order_no", param.getOrderNo())
+ );
+ if (!Cools.isEmpty(basArmMastSign)){
+ basArmMastSign.setStatus(1);
+ basArmMastSignService.updateById(basArmMastSign);
+ }
+ } catch (Exception e){
}
BasArmMast basArmMastListError = basArmMastService.selectOne(
@@ -740,7 +741,6 @@
}
BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
new EntityWrapper<BasArmMastSign>()
- .eq("matnr", param.getSku())
.eq("order_no", param.getOrderNo())
.eq("create_time", basArmMastSign.getCreateTime())
.eq("status", 0)
--
Gitblit v1.9.1