From 527cbd85e37842d93d081f33916dca5c6f7156e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 24 九月 2023 09:53:58 +0800
Subject: [PATCH] 修改 9.22
---
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index ea3ff9d..85abcc8 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -63,6 +63,7 @@
Sale sale = new Sale();
BeanUtils.copyProperties(saleDto, sale);
sale.setSaleman(saleman);
+ sale.setOrderType("鎵嬪伐璁㈠崟");
saleMapper.insert(sale);
//娣诲姞閿�鍞骇鍝佸崟
List<SaleMaterialDto> saleMaterialDtoList = saleDto.getSaleMaterialList();
@@ -186,9 +187,6 @@
.orderCode(orderNumber)
.customerCode(sale.getCode())
.proname(sale.getProname())
- //.adress(sale.getAdress())
- //.username(sale.getUsername())
- //.phone(sale.getPhone())
.messages(dto2List)
.build();
return consignmentDto1;
@@ -215,6 +213,8 @@
sale.setDelTime(DateUtil.parseDate(orde.get("wantedDeliveryDate").toString()));//浜よ揣鏃ユ湡
sale.setCreateTime(DateUtil.parseDate(orde.get("orderDate").toString()));//涓嬪崟鏃ユ湡
sale.setNote(String.valueOf(orde.get("comment")));//澶囨敞
+ sale.setOrderId((Integer) orde.get("id")); //otc璁㈠崟id
+ sale.setOrderType(orde.get("orderClassification").toString()); //璁㈠崟绫诲瀷
return sale;
}).collect(Collectors.toList());
//鍘婚噸
@@ -239,4 +239,22 @@
}
return "鍚屾鎴愬姛!";
}
+
+
+ //涓嬭浇闄勪欢
+ @Override
+ public List<String> download(Integer id) {
+ Integer orderId = saleMapper.selectById(id).getOrderId();
+ List<Map<String, Object>> attachment = SyncOrder.getAttachmentByOrderId(orderId);
+ List<String> list = new ArrayList<>();
+ if (ObjectUtils.isEmpty(attachment)) {
+ list.add("璇ヨ鍗曟病鏈夐檮浠�");
+ return list;
+ }
+ for (Map<String, Object> attch : attachment) {
+ String path = attch.get("path").toString();
+ list.add(path);
+ }
+ return list;
+ }
}
--
Gitblit v1.9.3