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/LkDetTbScheduler.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 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