From bdfe4b740175f29858c870d710ec6ff5d4dc6ef0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 17 四月 2025 21:18:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 18 ++++++++++++++++--
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 3 +--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index b7895bc..4887719 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -132,11 +132,17 @@
boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", orderNo)) < 1;
boolean waitPakinExist = agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().like("order_no", orderNo)) < 1;
+ boolean agvWrkDetlExist2 = true;
+ try {
+ agvWrkDetlExist2 = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().eq("order_no", orderNo.replace("DC", ""))) < 1;
+ } catch (Exception e) {
+
+ }
ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
- if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
+ if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist && agvWrkDetlExist2) {
if (pltType == null) {
if (!this.updateSettle(order.getId(), 6L, 9528L)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
@@ -152,6 +158,8 @@
}
}
}
+
+
@Override
@Transactional
@@ -179,11 +187,17 @@
boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", orderNo)) < 1;
boolean waitPakinExist = agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().like("order_no", orderNo)) < 1;
+ boolean agvWrkDetlExist2 = true;
+ try {
+ agvWrkDetlExist2 = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().eq("order_no", orderNo.replace("DC", ""))) < 1;
+ } catch (Exception e) {
+
+ }
ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
- if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
+ if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist && agvWrkDetlExist2) {
if (!this.updateSettle(order.getId(), 6L, 9528L)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 68e4775..89e0871 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -82,8 +82,7 @@
Boolean flag = false;
for (OrderDetl orderDetl : orderDetlList) {
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode()));
- boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", order.getOrderNo())) < 1;
- if (!Cools.isEmpty(agvLocDetls) && agvWrkDetlExist) {
+ if (!Cools.isEmpty(agvLocDetls) ) {
//鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
flag = true;
}
--
Gitblit v1.9.1