From 3954c28bb43412328694afd56bbf3946be60749a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 19 六月 2025 13:35:14 +0800
Subject: [PATCH] #订单导入等界面功能修改
---
src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java b/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
index e862d93..6414451 100644
--- a/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
+++ b/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
@@ -69,7 +69,7 @@
public void invoke(ImportOrderDto data, AnalysisContext context) {
log.info("瑙ｆ瀽鍒扮 {} 鏉℃暟鎹�:{}", ++count, JSON.toJSONString(data));
list.add(data);
- if (context.getCurrentRowNum() == 5) {
+ if (context.getCurrentRowNum() == 3) {
String time = DateUtils.convert(new Date(),DateUtils.yyyyMMddHHmmss_F);
Order order2 = orderService.selectByNo(list.get(0).getColumn2()); // 璁㈠崟鍙�
if(order2 != null) {
@@ -86,8 +86,8 @@
order.setOrderNo(orderNo);
order.setOrderTime(time);
order.setDocType(docType.getDocId());
- order.setCstmrName(Cools.isEmpty(list.get(2).getColumn2()) ? "" : list.get(2).getColumn2()); // 瀹㈡埛鍚嶇О
- order.setMemo(Cools.isEmpty(list.get(3).getColumn2()) ? "" : list.get(3).getColumn2()); // 澶囨敞
+// order.setCstmrName(Cools.isEmpty(list.get(2).getColumn2()) ? "" : list.get(2).getColumn2()); // 瀹㈡埛鍚嶇О
+// order.setMemo(Cools.isEmpty(list.get(3).getColumn2()) ? "" : list.get(3).getColumn2()); // 澶囨敞
order.setSettle(1L);
order.setStatus(1);
order.setCreateBy(userId);
@@ -178,6 +178,8 @@
}
} else {
orderDetl.setBrand(importOrderDto.getColumn1());
+ orderDetl.setSupp(importOrderDto.getColumn3());
+ orderDetl.setMemo(importOrderDto.getColumn4());
}
orderDetl.setBatch("");
--
Gitblit v1.9.1