From ff61feb990cbe2a7be5b790566b3aff9f16005e5 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 28 三月 2026 09:33:14 +0800
Subject: [PATCH] feat: 销售台账导入新增字段
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java | 34 +++++++---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 61 ++++++++++++++------
src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java | 76 +++++++++++-------------
src/main/resources/static/销售台账导入模板.xlsx | 0
4 files changed, 100 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
index a4c585b..1aad365 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
@@ -7,6 +7,7 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -18,34 +19,45 @@
* @date : 2026/1/19 9:50
*/
@Data
-public class SalesLedgerImportDto extends SalesLedgerProductImportDto{
+@EqualsAndHashCode(callSuper = false)
+public class SalesLedgerImportDto extends SalesLedgerProductImportDto {
@Excel(name = "閿�鍞崟鍙�")
private String salesContractNo;
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private Date entryDate;
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String projectName;
@Excel(name = "涓氬姟鍛�")
private String salesman;
+
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
- @Excel(name = "椤圭洰鍚嶇О")
- private String projectName;
- @Excel(name = "褰曞叆浜�")
- private String entryPerson;
- @Excel(name = "澶囨敞")
- private String remarks;
@ApiModelProperty(value = "绛捐鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "绛捐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date executionDate;
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "浜よ揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date deliveryDate;
+
+ @Excel(name = "褰曞叆浜�")
+ private String entryPerson;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date entryDate;
+
@ApiModelProperty(value = "浠樻鏂瑰紡")
@Excel(name = "浠樻鏂瑰紡")
private String paymentMethod;
+ @Excel(name = "澶囨敞")
+ private String remarks;
-}
+ @Excel(name = "瀹㈡埛澶囨敞")
+ private String customerRemarks;
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
index 2c95909..11f2f387 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
@@ -18,61 +18,55 @@
@Excel(name = "閿�鍞崟鍙�")
private String salesContractNo;
-
- /**
- * 浜у搧澶х被
- */
@Excel(name = "浜у搧澶х被")
private String productCategory;
- /**
- * 瑙勬牸鍨嬪彿
- */
@Excel(name = "瑙勬牸鍨嬪彿")
private String specificationModel;
+
+ @Excel(name = "瀹�(mm)")
+ private BigDecimal width;
+
+ @Excel(name = "楂�(mm)")
+ private BigDecimal height;
+
+ @Excel(name = "绋庣巼")
+ private BigDecimal taxRate;
+
+ @Excel(name = "鍚◣鍗曚环")
+ private BigDecimal taxInclusiveUnitPrice;
+
+ @Excel(name = "鏁伴噺")
+ private BigDecimal quantity;
+
+ @Excel(name = "鍚◣鎬讳环")
+ private BigDecimal taxInclusiveTotalPrice;
+
+ @Excel(name = "鍙戠エ绫诲瀷")
+ private String invoiceType;
+
+ @Excel(name = "妤煎眰缂栧彿")
+ private String floorNo;
+
+ @Excel(name = "鍔犲伐瑕佹眰")
+ private String processingRequirements;
+
+ @Excel(name = "澶囨敞")
+ private String remarks;
+
+ @Excel(name = "棰濆鍔犲伐")
+ private String extraProcessing;
/**
* 鍗曚綅
*/
- @Excel(name = "鍗曚綅")
+// @Excel(name = "鍗曚綅")
private String unit;
-
- /**
- * 鏁伴噺
- */
- @Excel(name = "鏁伴噺")
- private BigDecimal quantity;
-
- /**
- * 绋庣巼
- */
- @Excel(name = "绋庣巼")
- private BigDecimal taxRate;
-
- /**
- * 鍚◣鍗曚环
- */
- @Excel(name = "鍚◣鍗曚环")
- private BigDecimal taxInclusiveUnitPrice;
-
- /**
- * 鍚◣鎬讳环
- */
- @Excel(name = "鍚◣鎬讳环")
- private BigDecimal taxInclusiveTotalPrice;
-
- /**
- * 鍙戠エ绫诲瀷
- */
- @Excel(name = "鍙戠エ绫诲瀷")
- private String invoiceType;
/**
* 鏄惁璐ㄦ
*/
- @Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
+// @Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
private Boolean isChecked;
-
-
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 04f3a3a..87be01e 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -389,12 +389,6 @@
// 瀹㈡埛鏁版嵁
List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>().in(Customer::getCustomerName,
salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getCustomerName).collect(Collectors.toList())));
-// // 瑙勬牸鍨嬪彿鏁版嵁
-// List<ProductModel> productModels = productModelMapper.selectList(new LambdaQueryWrapper<ProductModel>().in(ProductModel::getModel,
-// salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getSpecificationModel).collect(Collectors.toList())));
-// // 浜у搧澶х被鏁版嵁
-// List<Product> productList = productMapper.selectList(new LambdaQueryWrapper<Product>().in(Product::getProductName,
-// salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getProductCategory).collect(Collectors.toList())));
List<Map<String, Object>> list = productModelMapper.getProductAndModelList();
// 褰曞叆浜烘暟鎹�
List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
@@ -404,7 +398,7 @@
.eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())
.last("LIMIT 1"));
if (salesLedger1 != null) {
- continue;
+ throw new ServiceException("瀵煎叆澶辫触锛氬悎鍚屽彿 [" + salesLedgerImportDto.getSalesContractNo() + "] 宸插瓨鍦紝璇锋鏌ュ悗閲嶆柊瀵煎叆");
}
SalesLedger salesLedger = new SalesLedger();
BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
@@ -426,7 +420,7 @@
.map(SysUser::getUserId)
.orElse(null);
if (aLong == null)
- throw new RuntimeException("褰曞叆浜�:" + salesLedger.getEntryPerson() + ",鏃犲搴旂敤鎴凤紒");
+ throw new ServiceException("褰曞叆浜�:" + salesLedger.getEntryPerson() + ",鏃犲搴旂敤鎴凤紒");
salesLedger.setEntryPerson(aLong.toString());
// 閿�鍞骇鍝佹暟鎹粦瀹氾紝閫氳繃閿�鍞崟鍙疯幏鍙栧搴旈攢鍞骇鍝佹暟鎹�
List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
@@ -439,10 +433,12 @@
.reduce(BigDecimal.ZERO, BigDecimal::add));
salesLedgerMapper.insert(salesLedger);
-
for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
+ salesLedgerProduct.setFloorCode(salesLedgerProductImportDto.getFloorNo());
+ salesLedgerProduct.setProcessRequirement(salesLedgerProductImportDto.getProcessingRequirements());
+ salesLedgerProduct.setRemark(salesLedgerProductImportDto.getRemarks());
salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
salesLedgerProduct.setType(1);
// 璁＄畻涓嶅惈绋庢�讳环
@@ -456,21 +452,48 @@
salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
});
-// salesLedgerProduct.setProductId(productList.stream()
-// .filter(product -> product.getProductName().equals(salesLedgerProduct.getProductCategory()))
-// .findFirst()
-// .map(Product::getId)
-// .orElse(null));
-// salesLedgerProduct.setProductModelId(productModels.stream()
-// .filter(productModel -> productModel.getModel().equals(salesLedgerProduct.getSpecificationModel()))
-// .findFirst()
-// .map(ProductModel::getId)
-// .orElse(null));
salesLedgerProduct.setRegister(loginUser.getNickName());
salesLedgerProduct.setRegisterDate(LocalDateTime.now());
salesLedgerProduct.setApproveStatus(0);
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
salesLedgerProductMapper.insert(salesLedgerProduct);
+
+ // 澶勭悊棰濆鍔犲伐淇℃伅
+ String extraProcessing = salesLedgerProductImportDto.getExtraProcessing();
+ if (StringUtils.hasText(extraProcessing)) {
+ List<SalesLedgerProductProcess> processList = new ArrayList<>();
+ // 涓嫳鏂囧垎鍙�
+ String[] items = extraProcessing.split("[;锛沒");
+ for (String item : items) {
+ if (StringUtils.hasText(item)) {
+ String[] parts = item.split("[-鈥攡锝瀅");
+ if (parts.length >= 2) {
+ String processName = parts[0].trim();
+ String qtyStr = parts[1].trim();
+ try {
+ BigDecimal quantity = new BigDecimal(qtyStr);
+ SalesLedgerProductProcess process = salesLedgerProductProcessService.getOne(
+ new LambdaQueryWrapper<SalesLedgerProductProcess>()
+ .eq(SalesLedgerProductProcess::getProcessName, processName)
+ .last("LIMIT 1")
+ );
+ if (process != null) {
+ SalesLedgerProductProcess p = new SalesLedgerProductProcess();
+ p.setId(process.getId());
+ p.setQuantity(quantity.intValue());
+ processList.add(p);
+ }
+ } catch (Exception e) {
+ log.error("瑙ｆ瀽棰濆鍔犲伐鏁伴噺澶辫触: {}", qtyStr);
+ }
+ }
+ }
+ }
+ if (!processList.isEmpty()) {
+ salesLedgerProductProcessBindService.updateProductProcessBind(processList, salesLedgerProduct.getId());
+ }
+ }
+
// 娣诲姞鐢熶骇鏁版嵁
salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
}
diff --git "a/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index 9558711..79c2656 100644
--- "a/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.3