From 9187a33d1b5cbf851621a27d5bcfd2014ea1c31b Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 19 四月 2026 13:39:56 +0800
Subject: [PATCH] 明细上报重复也返回成功，避免重复上报
---
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
index cd59ff1..a1b810e 100644
--- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -2,12 +2,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlService;
@@ -20,6 +22,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -50,6 +53,9 @@
private final ReentrantLock lock = new ReentrantLock();
+ @Resource
+ private OrderMapper orderMapper;
+
@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "0/10 * * * * ?")
public void pakinOrderComplete() {
@@ -62,7 +68,16 @@
// 鎵�鏈夎鍗�
try {
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().setSqlSelect("TOP 2 *").eq("settle", 4L));
+// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+ // 鍒涘缓鍒嗛〉瀵硅薄锛氶〉鐮� 1锛屾瘡椤� 2 鏉�
+ Page<Order> page = new Page<>(1, 10); // 涓�娆�10鏉★紝閬垮厤澶勭悊涓嶈繃鏉�
+ // 浣跨敤 selectPage 鑾峰彇鍓� 2 鏉¤褰�
+ Page<Order> result = orderService.selectPage(
+ page,
+ new EntityWrapper<Order>().eq("settle", 4L)
+ );
+
+ List<Order> orders = result.getRecords(); // 杩欏氨鏄墠 2 鏉�
DocType docType;
for (Order order : orders) {
@@ -106,9 +121,9 @@
*/
@Transactional(rollbackFor = Throwable.class)
public boolean insertInDet(OrderDetl orderDetl) {
- String sqlInDetTb = "select * from lk_InDetTB where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
+ String sqlInDetTb = "select * from lk_InDetTB where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and orderNo = '" + orderDetl.getOutOrderNo();
List<InDetTB> inDets = erpSqlServer.select(sqlInDetTb, InDetTB.class);
- String sqlInDetTbBak = "select * from lk_InDetTB_Bak where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
+ String sqlInDetTbBak = "select * from lk_InDetTB_Bak where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and orderNo = '" + orderDetl.getOutOrderNo();
List<InDetTBBak> inDetBaks = erpSqlServer.select(sqlInDetTbBak, InDetTBBak.class);
if (!inDets.isEmpty() || !inDetBaks.isEmpty()) {
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
@@ -122,7 +137,7 @@
return true;
} else {
log.error("鍏ュ簱鍥炰紶澶辫触,瀹炰綋绫绘墦鍗�:{}", content);
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ return true;
}
}
@@ -193,7 +208,7 @@
return true;
} else {
log.error("鍏ュ簱鍥炰紶澶辫触,瀹炰綋绫绘墦鍗�:" + content.toString());
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ return true;
}
}
--
Gitblit v1.9.1