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 +++++-----
 1 files changed, 5 insertions(+), 5 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());

--
Gitblit v1.9.1