From 340167d214a0f89da087b7bb68186032c4502731 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期三, 30 十月 2024 14:03:42 +0800
Subject: [PATCH] 反修改成返修
---
src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java b/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
index 93226be..4fefeb9 100644
--- a/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
+++ b/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
@@ -37,6 +37,8 @@
private long orderId;
+ private long docTypeId;
+
List<ImportOrderDto> list = new ArrayList<>();
/**
* 鍋囪杩欎釜鏄竴涓狣AO锛屽綋鐒舵湁涓氬姟閫昏緫杩欎釜涔熷彲浠ユ槸涓�涓猻ervice銆傚綋鐒跺鏋滀笉鐢ㄥ瓨鍌ㄨ繖涓璞℃病鐢ㄣ��
@@ -77,6 +79,7 @@
throw new ExcelAnalysisException("鍗曟嵁绫诲瀷閿欒锛�" + list.get(1).getColumn2());
}
orderNo = list.get(0).getColumn2();
+ docTypeId = docType.getDocId();
Order order = new Order();
order.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
order.setOrderNo(orderNo);
@@ -122,7 +125,17 @@
List<OrderDetl> orderDetlList = new ArrayList<>();
list.forEach(importOrderDto -> {
OrderDetl orderDetl = new OrderDetl();
- orderDetl.setBrand(importOrderDto.getColumn1());
+ if (docTypeId == 24) {
+ orderDetl.setSpecs(String.format("%07d",Integer.parseInt(importOrderDto.getColumn1()))); // 婧愬簱浣�
+ if (importOrderDto.getColumn2() != null) {
+ orderDetl.setModel(String.format("%07d",Integer.parseInt(importOrderDto.getColumn2()))); // 鐩爣搴撲綅
+ }
+ if (importOrderDto.getColumn3() != null) {
+ orderDetl.setBeBatch(Integer.parseInt(importOrderDto.getColumn3())); //宸烽亾
+ }
+ } else {
+ orderDetl.setBrand(importOrderDto.getColumn1());
+ }
orderDetl.setBatch("");
orderDetl.setOrderId(orderId);
orderDetl.setOrderNo(orderNo);
--
Gitblit v1.9.1