From ae21fbe862db214d28b9cea79171a19ff26a0a84 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 13:30:57 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 41 ++++++++++----------
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 32 ++++++++--------
src/main/resources/application.yml | 2
3 files changed, 38 insertions(+), 37 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 7053ee9..0882598 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -25,7 +25,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
@@ -126,20 +125,21 @@
}
// 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹�
- int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
- 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;
+ //int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
+ //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;
- ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
+ //ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
- boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
- if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
+ //boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
+ //if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
+ if (complete) {
if (pltType == null) {
- if (!this.updateSettle(order.getId(), 4L, 9528L)) {
+ if (!this.updateSettle(order.getId(), 6L, 9528L)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
- } else if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F))) {
+ } else if (!this.updateSettle2(order.getId(), 6L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F))) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
} else {
@@ -172,16 +172,17 @@
}
// 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹�
- int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
- 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;
-
- ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
-
- boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
- if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
- if (!this.updateSettle(order.getId(), 4L, 9528L)) {
+ //int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
+// 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;
+//
+// ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
+//
+// boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
+// if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
+ if (complete) {
+ 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 1cccd25..b1230a1 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -47,7 +47,7 @@
private Integer page = 1;
- private Integer size = 100;
+ private Integer size = 200;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -67,21 +67,21 @@
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
//濡傛灉鏄皟鎷ㄥ崟鍒欒繘琛屽垽鏂�
- if (order.getDocType() == 33) {
- //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
- List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
- Boolean flag = false;
- for (OrderDetl orderDetl : orderDetlList) {
- List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode()));
- if (!Cools.isEmpty(agvLocDetls)) {
- //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
- flag = true;
- }
- }
- if (flag) {
- continue;
- }
- }
+// if (order.getDocType() == 33) {
+// //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
+// List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+// Boolean flag = false;
+// for (OrderDetl orderDetl : orderDetlList) {
+// List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode()));
+// if (!Cools.isEmpty(agvLocDetls)) {
+// //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
+// flag = true;
+// }
+// }
+// if (flag) {
+// continue;
+// }
+// }
ReturnT<String> result = orderSyncHandler.start(order);
if (!result.isSuccess()) {
//log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 22524fb..f2026f2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
#dev loc prod
- active: loc
\ No newline at end of file
+ active: prod
\ No newline at end of file
--
Gitblit v1.9.1