From f418901ce81d8c403949343eb490b392b99cd86a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 22 八月 2024 12:53:14 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 10 +++++-----
src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java | 12 +++++++++---
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
index 8911123..0e41258 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -78,11 +78,11 @@
callApiLogSave(erpDetTb, "ERP_DETTB", "鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒", false);
}
} else {
- Order order = orderService.selectByNo(erpDetTb.getBillNo());
+ Order order = orderService.selectByNo(erpDetTb.getBillNo()+"---"+erpDetTb.getItm());
if (Cools.isEmpty(order)) {
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- erpDetTb.getBillNo(), // 璁㈠崟缂栧彿
+ erpDetTb.getBillNo()+"---"+erpDetTb.getItm(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
null, // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
@@ -128,14 +128,14 @@
}
}
}
- Order order1 = orderService.selectByNo(erpDetTb.getBillNo());
+ Order order1 = orderService.selectByNo(erpDetTb.getBillNo()+"---"+erpDetTb.getItm());
if (!Cools.isEmpty(order1)) {
// OrderDetl orderDetl = orderDetlService.selectItem(order1.getId(), erpDetTb.getBillNo(), erpDetTb.getPrdMark());
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",erpDetTb.getBillNo()).eq("matnr",erpDetTb.getPrdNo()));
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",erpDetTb.getBillNo()+"---"+erpDetTb.getItm()).eq("matnr",erpDetTb.getPrdNo()));
if (Cools.isEmpty(orderDetl)) {
orderDetl = new OrderDetl();
orderDetl.setOrderId(order1.getId());
- orderDetl.setOrderNo(erpDetTb.getBillNo());
+ orderDetl.setOrderNo(erpDetTb.getBillNo()+"---"+erpDetTb.getItm());
orderDetl.setAnfme(erpDetTb.getQty());
orderDetl.setQty(0.0D);
orderDetl.setMatnr(erpDetTb.getPrdNo());
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 2c347f3..67eccbf 100644
--- a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
@@ -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)) {
--
Gitblit v1.9.1