From 3a2158fe78db763c72d5124a964d7fd7934b51ac Mon Sep 17 00:00:00 2001
From: lfd <1>
Date: 星期四, 26 三月 2026 10:44:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lfdasrs' into lfdasrs
---
src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
index 9e29300..e49159b 100644
--- a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
@@ -51,7 +51,7 @@
/**
* 涓婃姤鍏ュ嚭搴撳畬缁撹鍗曚俊鎭�
*/
- @Scheduled(cron = "${erp.refreshtime}")
+// @Scheduled(cron = "${erp.refreshtime}")
public void reportOrder() {
if (!erpEnabled) return;
String sqlSelectLkDetTb = "select bill_no as billNo,prd_no as prdNo,iokindid,add_id as addId,qty,prd_mark as prdMark,wh,billdate,status,temp1,temp2,temp3 from lk_det_tb where 1=1";
@@ -61,18 +61,23 @@
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
if (orders.size() > 0) {
for (Order order : orders) {
+
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
if (!Cools.isEmpty(orderDetls)) {
for (OrderDetl orderDetl : orderDetls) {
+ String orderNo = orderDetl.getOrderNo().split("---")[0];
+ Integer itm = Integer.getInteger(orderDetl.getOrderNo().split("---")[1]);
Date now = new Date();
List<LkDetTb> lkDetTbs = erpSqlServer.select(sqlSelectLkDetTb +
- " and bill_no='" + orderDetl.getOrderNo() + "'" +
+ " and bill_no='" + orderNo + "'" +
" and prd_no='" + orderDetl.getMatnr() + "'" +
+ " and ITM='" + itm + "'" +
" and prd_mark='" + orderDetl.getBatch() + "'"
, LkDetTb.class);
List<LkDetTbBak> lkDetTbBaks = erpSqlServer.select(sqlSelectLkDetTbBak +
- " and bill_no='" + orderDetl.getOrderNo() + "'" +
+ " and bill_no='" + orderNo + "'" +
" and prd_no='" + orderDetl.getMatnr() + "'" +
+ " and ITM='" + itm + "'" +
" and prd_mark='" + orderDetl.getBatch() + "'"
, LkDetTbBak.class);
if (lkDetTbs.size() == 1) {
@@ -90,8 +95,9 @@
} else {
String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now);
HashMap<String, Object> condition = new HashMap<>();
- condition.put("bill_no", "'" + orderDetl.getOrderNo() + "'");
+ condition.put("bill_no", "'" + orderNo + "'");
condition.put("prd_no", "'" + orderDetl.getMatnr() + "'");
+ condition.put("itm", "'" + itm + "'");
DocType docType = docTypeService.selectById(order.getDocType());
if (!Cools.isEmpty(docType)) {
@@ -110,7 +116,7 @@
}
//淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗�
if (orderDetlService.addToLogTable(orderDetl)) {
- callApiLogSaveOrderDetl(orderDetl, "淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗ｆ垚鍔燂紒", true);
+// callApiLogSaveOrderDetl(orderDetl, "淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗ｆ垚鍔燂紒", true);
//鍒犻櫎璁㈠崟鏄庣粏
orderDetlService.deleteById(orderDetl.getId());
callApiLogSaveOrderDetl(orderDetl, "璁㈠崟鏄庣粏妗ｄ繚瀛樺悗鍒犻櫎鎴愬姛锛�", true);
@@ -118,7 +124,7 @@
}
//淇濆瓨璁㈠崟鍘嗗彶妗�
if (orderService.addToLogTable(order)) {
- callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗ｆ垚鍔燂紒锛侊紒", true);
+// callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗ｆ垚鍔燂紒锛侊紒", true);
//鍒犻櫎瀹岀粨璁㈠崟
orderService.deleteById(order.getId());
callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗ｅ悗鍒犻櫎瀹岀粨璁㈠崟鎴愬姛锛侊紒锛�", true);
@@ -135,13 +141,13 @@
public void callApiLogSaveLkDetTb(LkDetTb lkDetTb, String tableName, String response, Boolean bool) {
apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", tableName, "null", ip,
- "璁㈠崟鍙凤細" + lkDetTb.getBillNo() + "銆佸搧鍙凤細" + lkDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTb.getPrdMark() + "銆佺姸鎬侊細" + lkDetTb.getStatus(),
+ "璁㈠崟鍙凤細" + lkDetTb.getBillNo() + "銆佸搧鍙凤細" + lkDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTb.getPrdMark() + "銆佺姸鎬侊細" + lkDetTb.getStatus$(),
response, bool);
}
public void callApiLogSaveLkDetTbBak(LkDetTbBak lkDetTbBak, String tableName, String response, Boolean bool) {
apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", tableName, "null", ip,
- "璁㈠崟鍙凤細" + lkDetTbBak.getBillNo() + "銆佸搧鍙凤細" + lkDetTbBak.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTbBak.getPrdMark() + "銆佺姸鎬侊細" + lkDetTbBak.getStatus(),
+ "璁㈠崟鍙凤細" + lkDetTbBak.getBillNo() + "銆佸搧鍙凤細" + lkDetTbBak.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTbBak.getPrdMark() + "銆佺姸鎬侊細" + lkDetTbBak.getStatus$(),
response, bool);
}
--
Gitblit v1.9.1