From abb9b5c51d8a20be68b64e0c4a9620f6578d2e3a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 30 四月 2025 09:59:26 +0800
Subject: [PATCH] 手动导入订单和mes下发订单，增加客户名称和备注字段
---
src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java | 9 ++++++---
1 files changed, 6 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 4fefeb9..3ae6405 100644
--- a/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
+++ b/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
@@ -4,6 +4,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelAnalysisException;
import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
import com.zy.asrs.entity.DocType;
@@ -68,13 +69,13 @@
public void invoke(ImportOrderDto data, AnalysisContext context) {
log.info("瑙ｆ瀽鍒扮 {} 鏉℃暟鎹�:{}", ++count, JSON.toJSONString(data));
list.add(data);
- if (context.getCurrentRowNum() == 3) {
+ if (context.getCurrentRowNum() == 5) {
String time = DateUtils.convert(new Date(),DateUtils.yyyyMMddHHmmss_F);
- Order order2 = orderService.selectByNo(list.get(0).getColumn2());
+ Order order2 = orderService.selectByNo(list.get(0).getColumn2()); // 璁㈠崟鍙�
if(order2 != null) {
throw new ExcelAnalysisException("鍗曟嵁宸插瓨鍦紒");
}
- DocType docType = docTypeService.selectOrAdd(list.get(1).getColumn2(), Boolean.FALSE);
+ DocType docType = docTypeService.selectOrAdd(list.get(1).getColumn2(), Boolean.FALSE); // 璁㈠崟绫诲瀷
if (docType == null) {
throw new ExcelAnalysisException("鍗曟嵁绫诲瀷閿欒锛�" + list.get(1).getColumn2());
}
@@ -85,6 +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.setSettle(1L);
order.setStatus(1);
order.setCreateBy(userId);
--
Gitblit v1.9.1