From b6d3c06279e077459159fcb88d737cd6e1f99037 Mon Sep 17 00:00:00 2001
From: lfd <1>
Date: 星期四, 26 三月 2026 09:46:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 18e212d..5ef03c3 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -54,7 +54,7 @@
/**
* 鑾峰彇鍏ュ嚭搴撹鍗曚俊鎭�
*/
- @Scheduled(cron = "${erp.refreshtime}")
+// @Scheduled(cron = "${erp.refreshtime}")
public void InOrOutOrder() {
if (!erpEnabledErpDetTb) return;
String sqlSelectErpDetTb = "select BIL_NO as billNo,prd_no as prdNo,ITM as itm,ADD_ID as addId2,QTY as qty,PRD_MARK as prdMark,WH as wh,STATUS as status,Temp1 as temp1,Temp2 as temp2,Temp3 as temp3 from ERP_DETTB where 1=1";
@@ -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,13 +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.selectItem(order1.getId(), erpDetTb.getBillNo(), erpDetTb.getPrdMark());
+ 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