From adcfd92279f68d2353e2caa5522f71282f6e0943 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 16 十月 2024 08:18:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 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 08b8217..67eccbf 100644
--- a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
@@ -10,8 +9,6 @@
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
-import com.zy.ints.entity.ErpDetTb;
-import com.zy.ints.entity.ErpDetTbBak;
import com.zy.ints.entity.LkDetTb;
import com.zy.ints.entity.LkDetTbBak;
import com.zy.ints.erp.ErpSqlServer;
@@ -64,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) {
@@ -93,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)) {
@@ -113,7 +116,7 @@
}
//淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗�
if (orderDetlService.addToLogTable(orderDetl)) {
- callApiLogSaveOrderDetl(orderDetl, "淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗ｆ垚鍔燂紒", true);
+// callApiLogSaveOrderDetl(orderDetl, "淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗ｆ垚鍔燂紒", true);
//鍒犻櫎璁㈠崟鏄庣粏
orderDetlService.deleteById(orderDetl.getId());
callApiLogSaveOrderDetl(orderDetl, "璁㈠崟鏄庣粏妗ｄ繚瀛樺悗鍒犻櫎鎴愬姛锛�", true);
@@ -121,7 +124,7 @@
}
//淇濆瓨璁㈠崟鍘嗗彶妗�
if (orderService.addToLogTable(order)) {
- callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗ｆ垚鍔燂紒锛侊紒", true);
+// callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗ｆ垚鍔燂紒锛侊紒", true);
//鍒犻櫎瀹岀粨璁㈠崟
orderService.deleteById(order.getId());
callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗ｅ悗鍒犻櫎瀹岀粨璁㈠崟鎴愬姛锛侊紒锛�", true);
@@ -137,25 +140,25 @@
}
public void callApiLogSaveLkDetTb(LkDetTb lkDetTb, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", "涓棿琛細" + tableName, "null", ip,
- "璁㈠崟鍙凤細" + lkDetTb.getBillNo() + "鍝佸彿锛�" + lkDetTb.getPrdNo() + "璐у搧鐗瑰緛锛�" + lkDetTb.getPrdMark() + "鐘舵�侊細" + lkDetTb.getStatus(),
+ apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", tableName, "null", ip,
+ "璁㈠崟鍙凤細" + lkDetTb.getBillNo() + "銆佸搧鍙凤細" + lkDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTb.getPrdMark() + "銆佺姸鎬侊細" + lkDetTb.getStatus$(),
response, bool);
}
public void callApiLogSaveLkDetTbBak(LkDetTbBak lkDetTbBak, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", "涓棿琛細" + tableName, "null", ip,
- "璁㈠崟鍙凤細" + lkDetTbBak.getBillNo() + "鍝佸彿锛�" + lkDetTbBak.getPrdNo() + "璐у搧鐗瑰緛锛�" + lkDetTbBak.getPrdMark() + "鐘舵�侊細" + lkDetTbBak.getStatus(),
+ apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", tableName, "null", ip,
+ "璁㈠崟鍙凤細" + lkDetTbBak.getBillNo() + "銆佸搧鍙凤細" + lkDetTbBak.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTbBak.getPrdMark() + "銆佺姸鎬侊細" + lkDetTbBak.getStatus$(),
response, bool);
}
public void callApiLogSaveOrderDetl(OrderDetl orderDetl, String response, Boolean bool) {
- apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", "涓棿琛細lk_det_tb", "null", ip,
- "璁㈠崟鍙凤細" + orderDetl.getOrderNo() + "鍝佸彿锛�" + orderDetl.getMatnr() + "璐у搧鐗瑰緛锛�" + orderDetl.getBatch(),
+ apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", "lk_det_tb", "null", ip,
+ "璁㈠崟鍙凤細" + orderDetl.getOrderNo() + "銆佸搧鍙凤細" + orderDetl.getMatnr() + "銆佽揣鍝佺壒寰侊細" + orderDetl.getBatch(),
response, bool);
}
public void callApiLogSaveOrder(Order order, String response, Boolean bool) {
- apiLogService.save("瀹岀粨璁㈠崟淇℃伅涓婃姤瀹屾垚", "涓棿琛細lk_det_tb", "null", ip,
+ apiLogService.save("瀹岀粨璁㈠崟淇℃伅涓婃姤瀹屾垚", "lk_det_tb", "null", ip,
"璁㈠崟鍙凤細" + order.getOrderNo(), response, bool);
}
}
--
Gitblit v1.9.1