From 84344f16a7f783cd32731764010a75a0af268384 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 08 四月 2026 11:32:37 +0800
Subject: [PATCH] feat:同步烜曌工贸（gongchunyi-26/4/3）
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 6
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 24 +
src/main/java/com/ruoyi/basic/pojo/Customer.java | 14
src/main/resources/mapper/basic/SupplierManageMapper.xml | 3
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 196 +++++++++++---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 28 ++
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 5
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java | 6
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 16
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 27 +
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 144 +++++++++-
src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java | 32 ++
src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java | 10
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java | 7
src/main/resources/mapper/purchase/PurchaseLedgerTemplateMapper.xml | 1
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 153 ++++++++---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 17
src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java | 15
src/main/resources/static/销售台账导入模板.xlsx | 0
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 5
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java | 15
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 17
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 8
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 3
src/main/resources/static/采购台账导入模板.xlsx | 0
src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java | 9
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 4
27 files changed, 569 insertions(+), 196 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
index 29e1af0..d34f4d5 100644
--- a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
+++ b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
@@ -1,13 +1,7 @@
package com.ruoyi.basic.excel;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
@Data
public class SupplierManageExcelDto {
@@ -15,6 +9,9 @@
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+ @Excel(name = "渚涘簲鍟嗙被鍨�(1-瀵瑰叕/2-瀵圭)")
+ private Integer supplierType;
+
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 101d72a..633fc5b 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -1,15 +1,13 @@
package com.ruoyi.basic.pojo;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* 瀹㈡埛妗ｆ瀵硅薄 customer
@@ -50,8 +48,8 @@
@TableField(exist = false)
private Date followUpTime;
- @Excel(name = "瀹㈡埛鍒嗙被")
- private String customerType;
+ @Excel(name = "瀹㈡埛鍒嗙被锛�1-瀵瑰叕锛�2-瀵圭")
+ private Integer customerType;
/**
* 绾崇◣浜鸿瘑鍒彿
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index ccc2d6f..f8fa06a 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -28,6 +28,10 @@
@Excel(name = "鍏徃鍦板潃")
private String companyAddress;
+ @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
+ @Excel(name = "渚涘簲鍟嗙被鍨�(1-瀵瑰叕/2-瀵圭)")
+ private Integer supplierType;
+
@ApiModelProperty(value = "鍏徃鐢佃瘽")
@Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
@@ -79,8 +83,4 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
-
- @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
- @TableField(value = "supplier_type")
- private String supplierType;
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index 58810c9..7195785 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -1,8 +1,6 @@
package com.ruoyi.basic.service.impl;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -24,7 +22,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import lombok.AllArgsConstructor;
@@ -35,7 +32,6 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -134,12 +130,12 @@
// 2. 鏋勫缓鏌ヨ鏉′欢锛堝寮虹┖鍊煎畨鍏級
LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
String customerName = customer.getCustomerName();
- String customerType = customer.getCustomerType();
+ Integer customerType = customer.getCustomerType();
if (StringUtils.isNotBlank(customerName)) {
queryWrapper.like(Customer::getCustomerName, customerName);
}
- if (StringUtils.isNotBlank(customerType)) {
- queryWrapper.like(Customer::getCustomerType, customerType);
+ if (customerType != null) {
+ queryWrapper.eq(Customer::getCustomerType, customerType);
}
// 3. 鎵ц鍒嗛〉鏌ヨ锛堜繚鐣欏垎椤靛厓鏁版嵁锛�
@@ -150,10 +146,17 @@
.filter(Objects::nonNull) // 杩囨护绌哄璞★紙閬垮厤鍚庣画鎿嶄綔NPE锛�
.peek(c -> {
// 瀹夊叏鑾峰彇瀛楁锛岄伩鍏峮ull鍊兼嫾鎺�
- String address = StringUtils.defaultString(c.getCompanyAddress(), "");
- String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
- c.setAddressPhone(address + "(" + phone + ")");
-
+ String address = StringUtils.defaultString(c.getCompanyAddress(), "").trim();
+ String phone = StringUtils.defaultString(c.getCompanyPhone(), "").trim();
+ if (StringUtils.isNotEmpty(address) && StringUtils.isNotEmpty(phone)) {
+ c.setAddressPhone(address + "(" + phone + ")");
+ } else if (StringUtils.isNotEmpty(address)) {
+ c.setAddressPhone(address);
+ } else if (StringUtils.isNotEmpty(phone)) {
+ c.setAddressPhone(phone);
+ } else {
+ c.setAddressPhone("");
+ }
// 鏌ヨ鏈�鏂扮殑璺熻繘璁板綍
CustomerFollowUp followUp = customerFollowUpService.getOne(
new LambdaQueryWrapper<CustomerFollowUp>()
@@ -263,7 +266,7 @@
@Override
public List<Map<String, Object>> customerList(Customer customer) {
LambdaQueryWrapper<Customer> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.select(Customer::getId, Customer::getCustomerName, Customer::getTaxpayerIdentificationNumber);
+ queryWrapper.select(Customer::getId, Customer::getCustomerName, Customer::getTaxpayerIdentificationNumber, Customer::getCustomerType);
// 鑾峰彇鍘熷鏌ヨ缁撴灉
List<Map<String, Object>> result = customerMapper.selectMaps(queryWrapper);
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 9e5e121..5003121 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -10,7 +10,6 @@
import java.math.BigDecimal;
import java.time.LocalDate;
-import java.time.LocalDateTime;
@Data
@ExcelIgnoreUnannotated
@@ -47,7 +46,7 @@
private String unit;
//閿�鍞悎鍚屽彿
- @Excel(name = "閿�鍞悎鍚屽彿")
+// @Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
@JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 2358caf..e3413e2 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -17,7 +16,6 @@
import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import io.swagger.annotations.Api;
@@ -33,11 +31,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
/**
* 閲囪喘鍙拌处Controller
@@ -128,8 +124,8 @@
@PostMapping("/export")
public void export(HttpServletResponse response, PurchaseLedger purchaseLedger) {
List<PurchaseLedger> list = purchaseLedgerService.selectPurchaseLedgerList(purchaseLedger);
- ExcelUtil<PurchaseLedger> util = new ExcelUtil<PurchaseLedger>(PurchaseLedger.class);
- util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
+ ExcelUtil<PurchaseLedger> util = new ExcelUtil<>(PurchaseLedger.class);
+ util.exportExcel(response, list, "閲囪喘鍙拌处鏁版嵁");
}
/**
@@ -160,8 +156,11 @@
*/
@ApiOperation("/鏌ヨ閲囪喘妯℃澘")
@GetMapping("/getPurchaseTemplateList")
- public AjaxResult getPurchaseTemplateList() {
- List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
+ public AjaxResult getPurchaseTemplateList(@RequestParam(required = false) Integer templateType) {
+ if (templateType == null){
+ return AjaxResult.success(new ArrayList<>());
+ }
+ List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(new LambdaQueryWrapper<PurchaseLedgerTemplate>().eq(PurchaseLedgerTemplate::getTemplateType,templateType));
purchaseLedgers.forEach(purchaseLedgerDto1 -> {
LambdaQueryWrapper<SalesLedgerProductTemplate> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SalesLedgerProductTemplate::getSalesLedgerId, purchaseLedgerDto1.getId())
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index c8ea3f5..37ae7c9 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -46,6 +46,12 @@
*/
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+
+ /**
+ * 渚涘簲鍟嗗悕绉�
+ */
+ @Excel(name = "渚涘簲鍟嗙被鍨�")
+ private Integer supplierType;
/**
* 鏄惁鐧藉悕鍗�
*/
@@ -125,7 +131,7 @@
private Boolean hasChildren = false;
- private Integer Type;
+ private Integer type;
private List<SalesLedgerProduct> productData;
@@ -184,11 +190,6 @@
@Excel(name = "鏈潵绁ㄩ噾棰�(鍏�)")
private BigDecimal unReceiptPaymentAmount =BigDecimal.ZERO;
- @ApiModelProperty("鏂囦欢绫诲瀷 鍙� 4")
- @TableField(exist = false)
- private Integer type;
-
-
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
@ApiModelProperty("瀹℃壒鐘舵��")
@@ -197,4 +198,8 @@
private String templateName;
@ApiModelProperty(value = "瀹℃壒浜篿d")
private Integer approverId;
+
+ @ApiModelProperty("妯℃澘绫诲瀷(1-瀵瑰叕/2-瀵圭)")
+ private Integer templateType;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
index f915051..4fcc9f1 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
@@ -4,6 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.Date;
@@ -12,6 +13,7 @@
* @date : 2026/1/26 16:01
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class PurchaseLedgerImportDto extends PurchaseLedgerProductImportDto{
@Excel(name = "閲囪喘鍗曞彿")
@@ -48,6 +50,10 @@
@Excel(name = "瀹℃牳浜�(澶氫釜鐢紝闅斿紑)")
private String approveUserIds;
+ @ApiModelProperty(value = "鍙拌处鍒嗙被")
+ @Excel(name = "鍙拌处鍒嗙被")
+ private String purchaseType;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java
index 3db4abe..17e0261 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.purchase.dto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.sales.dto.SalesLedgerProductImportDto;
import lombok.Data;
import java.math.BigDecimal;
@@ -80,4 +79,10 @@
@Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
private Integer isChecked;
+ @Excel(name = "鍗曚环")
+ private BigDecimal unitPrice;
+
+ @Excel(name = "鎬讳环")
+ private BigDecimal totalPrice;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index e01db26..3c5d247 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -159,4 +159,9 @@
@ApiModelProperty(value = "瀹℃壒浜篿d")
private String approveUserIds;
+ @ApiModelProperty(value = "鍙拌处鍒嗙被")
+ @Excel(name = "鍙拌处鍒嗙被(1-瀵瑰叕/2-瀵圭)")
+ @TableField(exist = false)
+ private Integer purchaseType;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
index 2bb53a4..bd1f9da 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
@@ -4,17 +4,15 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -91,6 +89,9 @@
@ApiModelProperty("妯℃澘鍚嶇О")
private String templateName;
+ @ApiModelProperty("妯℃澘绫诲瀷(1-瀵瑰叕/2-瀵圭)")
+ private Integer templateType;
+
@TableField(exist = false)
private List<SalesLedgerProductTemplate> productList;
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java b/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
index 1c47d7b..31e8424 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
@@ -3,13 +3,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* <p>
@@ -81,4 +82,29 @@
@ApiModelProperty("鏄惁鎺ㄩ�佽川妫�")
private Boolean isChecked;
+
+
+ /**
+ * 鍗曚环锛堝绉佷笓鐢級
+ */
+ @ApiModelProperty(value = "鍗曚环锛堝绉佷笓鐢級")
+ private BigDecimal unitPrice;
+
+ /**
+ * 鎬讳环锛堝绉佷笓鐢級
+ */
+ @ApiModelProperty(value = "鎬讳环锛堝绉佷笓鐢級")
+ private BigDecimal totalPrice;
+
+ /**
+ * 杩愯垂
+ */
+ @ApiModelProperty(value = "杩愯垂")
+ private BigDecimal freight = BigDecimal.ZERO;
+
+ /**
+ * 鍚繍璐瑰崟浠�
+ */
+ @ApiModelProperty(value = "鍚繍璐瑰崟浠�")
+ private BigDecimal priceWithFreight;
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index b23148a..f9c5d57 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -1,29 +1,23 @@
package com.ruoyi.purchase.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountExpenseService;
-import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.mapper.SupplierManageMapper;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -39,19 +33,25 @@
import com.ruoyi.purchase.dto.PurchaseLedgerImportDto;
import com.ruoyi.purchase.dto.PurchaseLedgerProductImportDto;
import com.ruoyi.purchase.mapper.*;
-import com.ruoyi.purchase.pojo.*;
+import com.ruoyi.purchase.pojo.PaymentRegistration;
+import com.ruoyi.purchase.pojo.ProductRecord;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
+import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
import com.ruoyi.quality.mapper.*;
-import com.ruoyi.quality.pojo.*;
-import com.ruoyi.sales.dto.SalesLedgerImportDto;
-import com.ruoyi.sales.dto.SalesLedgerProductImportDto;
-import com.ruoyi.sales.mapper.*;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
+import com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
-import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
@@ -62,8 +62,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.file.Files;
@@ -159,13 +159,43 @@
if (StringUtils.isNotBlank(purchaseLedger.getPurchaseContractNumber())) {
queryWrapper.like(PurchaseLedger::getPurchaseContractNumber, purchaseLedger.getPurchaseContractNumber());
}
- if(purchaseLedger.getSupplierId()!=null){
+ if (purchaseLedger.getSupplierId() != null) {
queryWrapper.eq(PurchaseLedger::getSupplierId, purchaseLedger.getSupplierId());
}
if (purchaseLedger.getApprovalStatus() != null) {
queryWrapper.eq(PurchaseLedger::getApprovalStatus, purchaseLedger.getApprovalStatus());
}
- return purchaseLedgerMapper.selectList(queryWrapper);
+ if (StringUtils.isNotBlank(purchaseLedger.getSupplierName())) {
+ queryWrapper.like(PurchaseLedger::getSupplierName, purchaseLedger.getSupplierName());
+ }
+ if (StringUtils.isNotBlank(purchaseLedger.getSalesContractNo())) {
+ queryWrapper.like(PurchaseLedger::getSalesContractNo, purchaseLedger.getSalesContractNo());
+ }
+ if (StringUtils.isNotBlank(purchaseLedger.getProjectName())) {
+ queryWrapper.like(PurchaseLedger::getProjectName, purchaseLedger.getProjectName());
+ }
+ queryWrapper.orderByDesc(PurchaseLedger::getEntryDate);
+
+ List<PurchaseLedger> list = purchaseLedgerMapper.selectList(queryWrapper);
+ if (CollectionUtils.isNotEmpty(list)) {
+ Set<Long> supplierIds = list.stream()
+ .map(PurchaseLedger::getSupplierId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ if (!supplierIds.isEmpty()) {
+ List<SupplierManage> suppliers = supplierManageMapper.selectBatchIds(supplierIds);
+ Map<Long, Integer> typeMap = suppliers.stream()
+ .collect(Collectors.toMap(SupplierManage::getId, SupplierManage::getSupplierType, (k1, k2) -> k1));
+
+ list.forEach(item -> {
+ if (item.getSupplierId() != null) {
+ item.setPurchaseType(typeMap.get(item.getSupplierId()));
+ }
+ });
+ }
+ }
+ return list;
}
@Override
@@ -176,7 +206,10 @@
//褰曞叆浜�
SysUser sysUser = userMapper.selectUserById(purchaseLedgerDto.getRecorderId());
- SupplierManage supplierManage = supplierManageMapper.selectById(purchaseLedgerDto.getSupplierId());
+ SupplierManage supplierManage = null;
+ if (purchaseLedgerDto.getSupplierId() != null) {
+ supplierManage = supplierManageMapper.selectById(purchaseLedgerDto.getSupplierId());
+ }
// DTO杞珽ntity
PurchaseLedger purchaseLedger = new PurchaseLedger();
@@ -187,7 +220,7 @@
}
purchaseLedger.setSalesContractNo(ObjectUtils.isNotEmpty(salesLedger) ? salesLedger.getSalesContractNo() : "");
purchaseLedger.setSalesLedgerId(ObjectUtils.isNotEmpty(salesLedger) ? salesLedger.getId() : -1);
- purchaseLedger.setSupplierName(supplierManage.getSupplierName());
+ purchaseLedger.setSupplierName(supplierManage != null ? supplierManage.getSupplierName() : purchaseLedgerDto.getSupplierName());
purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
purchaseLedger.setRecorderName(sysUser.getNickName());
purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
@@ -328,22 +361,29 @@
LocalDateTime localDateTime = entryDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
salesLedgerProduct.setRegisterDate(localDateTime);
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
- salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ if (Integer.valueOf(2).equals(purchaseLedger.getPurchaseType())) {
+ salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO);
+ salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO);
+ } else {
+ salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ }
salesLedgerProductMapper.insert(salesLedgerProduct);
}
}
- // 璁＄畻鎬诲惈绋庨噾棰�
- BigDecimal totalTaxInclusiveAmount = products.stream()
- .map(SalesLedgerProduct::getTaxInclusiveTotalPrice)
+ // 璁＄畻鎬婚噾棰�
+ BigDecimal totalAmount = products.stream()
+ .map(p -> Integer.valueOf(2).equals(purchaseLedger.getPurchaseType()) ?
+ (p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO) :
+ (p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO))
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 鏇存柊涓昏〃鐨勬�婚噾棰濆瓧娈�
if (salesLedgerId != null) {
- // 鐩存帴鏇存柊鎸囧畾ID鐨勮褰曠殑contractAmount瀛楁涓簍otalTaxInclusiveAmount
- purchaseLedgerMapper.updateContractAmountById(salesLedgerId, totalTaxInclusiveAmount);
+ // 鐩存帴鏇存柊鎸囧畾ID鐨勮褰曠殑contractAmount瀛楁涓簍otalAmount
+ purchaseLedgerMapper.updateContractAmountById(salesLedgerId, totalAmount);
}
}
@@ -660,14 +700,14 @@
public AjaxResult importData(MultipartFile file) {
LoginUser loginUser = SecurityUtils.getLoginUser();
try {
- InputStream inputStream = file.getInputStream();
+ byte[] fileBytes = file.getBytes();
ExcelUtil<PurchaseLedgerImportDto> salesLedgerImportDtoExcelUtil = new ExcelUtil<>(PurchaseLedgerImportDto.class);
- Map<String, List<PurchaseLedgerImportDto>> stringListMap = salesLedgerImportDtoExcelUtil.importExcelMultiSheet(Arrays.asList("閲囪喘鍙拌处鏁版嵁", "閲囪喘浜у搧鏁版嵁"), inputStream, 0);
- if (CollectionUtils.isEmpty(stringListMap)) return AjaxResult.error("閲囪喘琛ㄦ牸涓虹┖锛�");
- // 涓氬姟灞傚悎骞�
- List<PurchaseLedgerImportDto> salesLedgerImportDtoList = stringListMap.get("閲囪喘鍙拌处鏁版嵁");
+ // 閲囪喘鍙拌处鏁版嵁涓嶈烦杩囨爣棰�
+ List<PurchaseLedgerImportDto> salesLedgerImportDtoList = salesLedgerImportDtoExcelUtil.importExcel("閲囪喘鍙拌处鏁版嵁", new ByteArrayInputStream(fileBytes), 0);
+ // 閲囪喘浜у搧鏁版嵁璺宠繃1琛屾爣棰�
+ List<PurchaseLedgerImportDto> salesLedgerProductImportDtoList = salesLedgerImportDtoExcelUtil.importExcel("閲囪喘浜у搧鏁版嵁", new ByteArrayInputStream(fileBytes), 1);
+
if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return AjaxResult.error("閲囪喘鍙拌处鏁版嵁涓虹┖锛�");
- List<PurchaseLedgerImportDto> salesLedgerProductImportDtoList = stringListMap.get("閲囪喘浜у搧鏁版嵁");
if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return AjaxResult.error("閲囪喘浜у搧鏁版嵁涓虹┖锛�");
// 渚涘簲鍟嗘暟鎹�
List<SupplierManage> customers = supplierManageMapper.selectList(new LambdaQueryWrapper<SupplierManage>().in(SupplierManage::getSupplierName,
@@ -685,12 +725,19 @@
}
PurchaseLedger salesLedger = new PurchaseLedger();
BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
- // 閫氳繃渚涘簲鍟嗗悕绉版煡璇D
- salesLedger.setSupplierId(customers.stream()
+ // 鏌ヨ渚涘簲鍟嗘。妗堝苟璁剧疆閲囪喘绫诲瀷锛堝鍏�1/瀵圭2锛�
+ SupplierManage matchedSupplier = customers.stream()
.filter(customer -> customer.getSupplierName().equals(salesLedger.getSupplierName()))
.findFirst()
- .map(SupplierManage::getId)
- .orElse(null));
+ .orElse(null);
+
+ if (matchedSupplier != null) {
+ salesLedger.setSupplierId(matchedSupplier.getId());
+ salesLedger.setPurchaseType(matchedSupplier.getSupplierType());
+ } else {
+ salesLedger.setPurchaseType(1); // 榛樿瀵瑰叕
+ }
+
Long aLong = sysUsers.stream()
.filter(sysUser -> sysUser.getNickName().equals(salesLedger.getRecorderName()))
.findFirst()
@@ -699,15 +746,30 @@
if (aLong == null)
throw new RuntimeException("褰曞叆浜�:" + salesLedger.getRecorderName() + ",鏃犲搴旂敤鎴凤紒");
salesLedger.setRecorderId(aLong);
- // 閲囪喘浜у搧鏁版嵁缁戝畾锛岄�氳繃閲囪喘鍗曞彿鑾峰彇瀵瑰簲閲囪喘浜у搧鏁版嵁
+
+ // 閲囪喘浜у搧鏁版嵁缁戝畾
List<PurchaseLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
.filter(salesLedgerProductImportDto -> salesLedgerProductImportDto.getPurchaseContractNumber().equals(salesLedger.getPurchaseContractNumber()))
.collect(Collectors.toList());
+
if (CollectionUtils.isEmpty(salesLedgerProductImportDtos))
throw new RuntimeException("閲囪喘鍗曞彿:" + salesLedgerImportDto.getPurchaseContractNumber() + ",鏃犲搴斾骇鍝佹暟鎹紒");
+
+ boolean isPrivate = Integer.valueOf(2).equals(salesLedger.getPurchaseType());
+
+ // 缁熶竴璁＄畻涓昏〃鍚堝悓閲戦
salesLedger.setContractAmount(salesLedgerProductImportDtos.stream()
- .map(PurchaseLedgerProductImportDto::getTaxInclusiveTotalPrice)
- .reduce(BigDecimal.ZERO,BigDecimal::add));
+ .map(dto -> {
+ if (isPrivate) {
+ if (dto.getTotalPrice() != null) return dto.getTotalPrice();
+ BigDecimal up = dto.getUnitPrice() != null ? dto.getUnitPrice() : BigDecimal.ZERO;
+ BigDecimal qty = dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO;
+ return up.multiply(qty);
+ } else {
+ return dto.getTaxInclusiveTotalPrice() != null ? dto.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ }
+ })
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
// 閫氳繃閿�鍞崟鍙风粦瀹氶攢鍞�
SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
.eq(SalesLedger::getSalesContractNo, salesLedger.getSalesContractNo())
@@ -719,8 +781,8 @@
// 閫氳繃鏄电О鑾峰彇鐢ㄦ埛ID
String[] split = salesLedger.getApproveUserIds().split("锛�");
List<Long> ids = new ArrayList<>();
- for (int i = 0; i < split.length; i++) {
- SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getNickName, split[i])
+ for (String s : split) {
+ SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getNickName, s)
.last("LIMIT 1"));
if (sysUser != null) {
ids.add(sysUser.getUserId());
@@ -736,10 +798,48 @@
BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
salesLedgerProduct.setType(2);
- // 璁＄畻涓嶅惈绋庢�讳环
- salesLedgerProduct.setTaxExclusiveTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice().divide(new BigDecimal(1).add(salesLedgerProduct.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP));
+
+ // 鏈潵绁ㄦ暟閲�
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxExclusiveTotalPrice());
+
+ if (isPrivate) {
+ // 瀵圭閲囪喘閫昏緫
+ if (salesLedgerProduct.getTotalPrice() == null && salesLedgerProduct.getUnitPrice() != null && salesLedgerProduct.getQuantity() != null) {
+ salesLedgerProduct.setTotalPrice(salesLedgerProduct.getUnitPrice().multiply(salesLedgerProduct.getQuantity()));
+ }
+
+ BigDecimal tp = salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO;
+ salesLedgerProduct.setTaxInclusiveTotalPrice(tp);
+ salesLedgerProduct.setTaxExclusiveTotalPrice(salesLedgerProduct.getUnitPrice() != null ?
+ salesLedgerProduct.getUnitPrice().multiply(salesLedgerProduct.getQuantity()) : tp);
+
+ // 缁熶竴閲戦
+ salesLedgerProduct.setFutureTicketsAmount(tp);
+ salesLedgerProduct.setPendingTicketsTotal(tp);
+
+ salesLedgerProduct.setTaxRate(null);
+ salesLedgerProduct.setTaxInclusiveUnitPrice(null);
+ salesLedgerProduct.setInvoiceType(null);
+ } else {
+ // 瀵瑰叕閲囪喘閫昏緫
+ // 琛ュ叏涓嶅惈绋庢�讳环
+ if (salesLedgerProduct.getTaxInclusiveTotalPrice() != null && salesLedgerProduct.getTaxRate() != null) {
+ salesLedgerProduct.setTaxExclusiveTotalPrice(
+ salesLedgerProduct.getTaxInclusiveTotalPrice()
+ .divide(new BigDecimal(1).add(salesLedgerProduct.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP)
+ );
+ }
+
+ // 瀵瑰叕缁熶竴浣跨敤鍚◣鎬讳环
+ BigDecimal titp = salesLedgerProduct.getTaxInclusiveTotalPrice() != null ? salesLedgerProduct.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ salesLedgerProduct.setFutureTicketsAmount(titp);
+ salesLedgerProduct.setPendingTicketsTotal(titp);
+
+ salesLedgerProduct.setUnitPrice(null);
+ salesLedgerProduct.setTotalPrice(null);
+ }
+
+ // 鍖归厤浜у搧绉嶇被鍜岃鏍煎瀷鍙锋槧灏処D
list.stream()
.filter(map -> map.get("productName").equals(salesLedgerProduct.getProductCategory()) && map.get("model").equals(salesLedgerProduct.getSpecificationModel()))
.findFirst()
@@ -747,13 +847,15 @@
salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
});
+
+ // 濉厖鐧昏淇℃伅
salesLedgerProduct.setRegister(loginUser.getNickName());
salesLedgerProduct.setRegisterDate(LocalDateTime.now());
salesLedgerProduct.setApproveStatus(0);
- salesLedgerProduct.setPendingTicketsTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
+
// 鏄惁璐ㄦ鍒ゆ柇
- salesLedgerProduct.setIsChecked(salesLedgerProductImportDto.getIsChecked() == 1);
- if(salesLedgerProductImportDto.getIsChecked() == 1){
+ salesLedgerProduct.setIsChecked(salesLedgerProductImportDto.getIsChecked() != null && salesLedgerProductImportDto.getIsChecked() == 1);
+ if(salesLedgerProduct.getIsChecked()){
addQualityInspect(salesLedger, salesLedgerProduct);
}
salesLedgerProductMapper.insert(salesLedgerProduct);
@@ -764,9 +866,9 @@
return AjaxResult.success("瀵煎叆鎴愬姛");
} catch (Exception e) {
- e.printStackTrace();
+ log.error("瀵煎叆澶辫触锛�", e);
+ throw new RuntimeException("瀵煎叆鏁版嵁杩囩▼涓彂鐢熶簡閿欒锛�" + e.getMessage());
}
- return AjaxResult.success("瀵煎叆澶辫触");
}
@Override
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 05bd888..ae759ed 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -58,4 +58,10 @@
@ApiModelProperty(value = "浜よ揣鏃ユ湡")
private LocalDate deliveryDate;
+
+ @ApiModelProperty(value = "瀹㈡埛鍒嗙被")
+ private String customerType;
+
+ @ApiModelProperty(value = "鍙拌处鍒嗙被")
+ private Integer salesType;
}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
index a4c585b..6407a29 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
@@ -1,17 +1,11 @@
package com.ruoyi.sales.dto;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.sales.pojo.CommonFile;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
-import java.time.LocalDate;
import java.util.Date;
-import java.util.List;
/**
* @author :yys
@@ -47,5 +41,7 @@
@Excel(name = "浠樻鏂瑰紡")
private String paymentMethod;
-
+ @ApiModelProperty(value = "鍙拌处鍒嗙被")
+ @Excel(name = "鍙拌处鍒嗙被")
+ private Integer salesType;
}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
index 2c95909..2c5307d 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
@@ -1,12 +1,9 @@
package com.ruoyi.sales.dto;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
/**
* @author :yys
@@ -73,6 +70,18 @@
@Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
private Boolean isChecked;
+ @Excel(name = "鍗曚环")
+ private BigDecimal unitPrice;
+
+ @Excel(name = "鎬讳环")
+ private BigDecimal totalPrice;
+
+ @Excel(name = "杩愯垂")
+ private BigDecimal freight = BigDecimal.ZERO;
+
+ @Excel(name = "鍚繍璐瑰崟浠�")
+ private BigDecimal priceWithFreight;
+
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 36751c2..f082677 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,15 +1,15 @@
package com.ruoyi.sales.pojo;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
/**
* 閿�鍞彴璐﹀璞� sales_ledger
@@ -147,5 +147,13 @@
@TableField(exist = false)
//鏄惁鍙紪杈�
private Boolean isEdit;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀹㈡埛鍒嗙被")
+ private String customerType;
+
+ @ApiModelProperty(value = "鍙拌处鍒嗙被")
+ @Excel(name = "鍙拌处鍒嗙被")
+ private Integer salesType;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 1bf9aa2..a52c2b4 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -243,4 +243,32 @@
// 鍙敤鏁伴噺 quantity - returnQuality
@TableField(exist = false)
private BigDecimal availableQuality;
+
+ /**
+ * 鍗曚环锛堝绉佷笓鐢級
+ */
+ @ApiModelProperty(value = "鍗曚环锛堝绉佷笓鐢級")
+ @Excel(name = "鍗曚环锛堝绉侊級")
+ private BigDecimal unitPrice;
+
+ /**
+ * 鎬讳环锛堝绉佷笓鐢級
+ */
+ @ApiModelProperty(value = "鎬讳环锛堝绉佷笓鐢級")
+ @Excel(name = "鎬讳环锛堝绉侊級")
+ private BigDecimal totalPrice;
+
+ /**
+ * 杩愯垂
+ */
+ @ApiModelProperty(value = "杩愯垂")
+ @Excel(name = "杩愯垂")
+ private BigDecimal freight = BigDecimal.ZERO;
+
+ /**
+ * 鍚繍璐瑰崟浠�
+ */
+ @ApiModelProperty(value = "鍚繍璐瑰崟浠�")
+ @Excel(name = "鍚繍璐瑰崟浠�")
+ private BigDecimal priceWithFreight;
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index 68b52cb..eb416fb 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductStructureDto;
@@ -42,7 +42,10 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -171,10 +174,9 @@
}
// 鍙兘灞炰簬澶氫釜涓昏〃
- Set<Long> mainIds = deletedProducts.stream()
- .map(SalesLedgerProduct::getSalesLedgerId)
- .filter(Objects::nonNull)
- .collect(Collectors.toSet());
+ Map<Long, Integer> mainIdTypeMap = deletedProducts.stream()
+ .filter(p -> p.getSalesLedgerId() != null)
+ .collect(Collectors.toMap(SalesLedgerProduct::getSalesLedgerId, SalesLedgerProduct::getType, (existing, replacement) -> existing));
// 2. 鎵ц鍒犻櫎鎿嶄綔
int result = salesLedgerProductMapper.deleteBatchIds(Arrays.asList(ids));
@@ -182,19 +184,44 @@
deleteProductionData(Arrays.asList(ids));
// 3. 瀵规瘡涓富琛↖D杩涜閲戦鏇存柊
- for (Long salesLedgerId : mainIds) {
+ for (Map.Entry<Long, Integer> entry : mainIdTypeMap.entrySet()) {
+ Long salesLedgerId = entry.getKey();
+ Integer type = entry.getValue();
+
LambdaQueryWrapper<SalesLedgerProduct> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId);
+ wrapper.eq(SalesLedgerProduct::getType, type);
List<SalesLedgerProduct> remainingProducts = salesLedgerProductMapper.selectList(wrapper);
- // 璋冪敤閫氱敤鏂规硶鏇存柊涓昏〃閲戦
- updateMainContractAmount(
- salesLedgerId,
- remainingProducts,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
- salesLedgerMapper,
- SalesLedger.class
- );
+ if (type == 1) {
+ SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerId);
+ if (salesLedger != null) {
+ Function<SalesLedgerProduct, BigDecimal> amountGetter = Integer.valueOf(2).equals(salesLedger.getSalesType()) ?
+ p -> p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO
+ : p -> p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ updateMainContractAmount(
+ salesLedgerId,
+ remainingProducts,
+ amountGetter,
+ salesLedgerMapper,
+ SalesLedger.class
+ );
+ }
+ } else {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(salesLedgerId);
+ if (purchaseLedger != null) {
+ Function<SalesLedgerProduct, BigDecimal> amountGetter = Integer.valueOf(2).equals(purchaseLedger.getPurchaseType()) ?
+ p -> p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO
+ : p -> p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ updateMainContractAmount(
+ salesLedgerId,
+ remainingProducts,
+ amountGetter,
+ purchaseLedgerMapper,
+ PurchaseLedger.class
+ );
+ }
+ }
}
return result;
}
@@ -202,21 +229,86 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addOrUpdateSalesLedgerProduct(SalesLedgerProduct salesLedgerProduct) {
+ if (salesLedgerProduct.getId() != null) {
+ SalesLedgerProduct dbProduct = salesLedgerProductMapper.selectById(salesLedgerProduct.getId());
+ if (dbProduct != null) {
+ if (salesLedgerProduct.getSalesLedgerId() == null) {
+ salesLedgerProduct.setSalesLedgerId(dbProduct.getSalesLedgerId());
+ }
+ if (salesLedgerProduct.getType() == null) {
+ salesLedgerProduct.setType(dbProduct.getType());
+ }
+ if (salesLedgerProduct.getInvoiceTotal() == null) {
+ salesLedgerProduct.setInvoiceTotal(dbProduct.getInvoiceTotal());
+ }
+ if (salesLedgerProduct.getTicketsTotal() == null) {
+ salesLedgerProduct.setTicketsTotal(dbProduct.getTicketsTotal());
+ }
+ if (salesLedgerProduct.getQuantity() == null) {
+ salesLedgerProduct.setQuantity(dbProduct.getQuantity());
+ }
+ if (salesLedgerProduct.getTotalPrice() == null) {
+ salesLedgerProduct.setTotalPrice(dbProduct.getTotalPrice());
+ }
+ if (salesLedgerProduct.getTaxInclusiveTotalPrice() == null) {
+ salesLedgerProduct.setTaxInclusiveTotalPrice(dbProduct.getTaxInclusiveTotalPrice());
+ }
+ if (salesLedgerProduct.getTaxExclusiveTotalPrice() == null) {
+ salesLedgerProduct.setTaxExclusiveTotalPrice(dbProduct.getTaxExclusiveTotalPrice());
+ }
+ if (salesLedgerProduct.getTaxRate() == null) {
+ salesLedgerProduct.setTaxRate(dbProduct.getTaxRate());
+ }
+ if (salesLedgerProduct.getUnitPrice() == null) {
+ salesLedgerProduct.setUnitPrice(dbProduct.getUnitPrice());
+ }
+ if (salesLedgerProduct.getFreight() == null) {
+ salesLedgerProduct.setFreight(dbProduct.getFreight());
+ }
+ if (salesLedgerProduct.getPriceWithFreight() == null) {
+ salesLedgerProduct.setPriceWithFreight(dbProduct.getPriceWithFreight());
+ }
+ }
+ }
+
+ Long salesLedgerId = salesLedgerProduct.getSalesLedgerId();
+ SalesLedger salesLedger = null;
+ PurchaseLedger purchaseLedger = null;
+ boolean isPrivate = false;
+
+ if (salesLedgerProduct.getType() != null && salesLedgerProduct.getType().equals(1)) {
+ salesLedger = salesLedgerMapper.selectById(salesLedgerId);
+ if (salesLedger != null && Integer.valueOf(2).equals(salesLedger.getSalesType())) {
+ isPrivate = true;
+ }
+ } else {
+ purchaseLedger = purchaseLedgerMapper.selectById(salesLedgerId);
+ if (purchaseLedger != null && Integer.valueOf(2).equals(purchaseLedger.getPurchaseType())) {
+ isPrivate = true;
+ }
+ }
+
+ BigDecimal totalPrice = isPrivate ?
+ (salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO) :
+ (salesLedgerProduct.getTaxInclusiveTotalPrice() != null ? salesLedgerProduct.getTaxInclusiveTotalPrice() : BigDecimal.ZERO);
+
+ BigDecimal invoiceTotal = salesLedgerProduct.getInvoiceTotal() != null ? salesLedgerProduct.getInvoiceTotal() : BigDecimal.ZERO;
+ BigDecimal ticketsTotal = salesLedgerProduct.getTicketsTotal() != null ? salesLedgerProduct.getTicketsTotal() : BigDecimal.ZERO;
+
// 寰呭洖娆撅紝浠樻
if(salesLedgerProduct.getType().equals(1)){
- salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
+ salesLedgerProduct.setPendingInvoiceTotal(totalPrice.subtract(invoiceTotal));
//鏈紑绁ㄦ暟閲�+閲戦
salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ salesLedgerProduct.setNoInvoiceAmount(totalPrice);
}else{
- salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getTicketsTotal()));
+ salesLedgerProduct.setPendingTicketsTotal(totalPrice.subtract(ticketsTotal));
// 鏈潵绁ㄦ暟閲�+閲戦
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ salesLedgerProduct.setFutureTicketsAmount(totalPrice);
}
int result;
- Long salesLedgerId = salesLedgerProduct.getSalesLedgerId();
if (salesLedgerProduct.getId() == null) {
salesLedgerProduct.setRegisterDate(LocalDateTime.now());
result = salesLedgerProductMapper.insert(salesLedgerProduct);
@@ -239,12 +331,17 @@
wrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId)
.eq(SalesLedgerProduct::getType, salesLedgerProduct.getType());
List<SalesLedgerProduct> productList = salesLedgerProductMapper.selectList(wrapper);
+
+ Function<SalesLedgerProduct, BigDecimal> amountGetter = isPrivate ?
+ p -> p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO
+ : p -> p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+
if (salesLedgerProduct.getType() == 1) {
// 璋冪敤閫氱敤鏂规硶鏇存柊涓昏〃閲戦
updateMainContractAmount(
salesLedgerId,
productList,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ amountGetter,
salesLedgerMapper,
SalesLedger.class
);
@@ -253,7 +350,7 @@
updateMainContractAmount(
salesLedgerId,
productList,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ amountGetter,
purchaseLedgerMapper,
PurchaseLedger.class
);
@@ -337,6 +434,9 @@
* 鍒犻櫎鐢熶骇鏁版嵁
*/
public void deleteProductionData(List<Long> productIds) {
+ if (productIds == null || productIds.isEmpty()){
+ return;
+ }
//鎵归噺鏌ヨproductOrder
List<ProductOrder> productOrders = productOrderMapper.selectList(
new LambdaQueryWrapper<ProductOrder>()
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 570b2f5..4cd9168 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -15,6 +15,7 @@
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.SaleEnum;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.EnumUtil;
@@ -51,8 +52,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -343,14 +344,14 @@
public AjaxResult importData(MultipartFile file) {
LoginUser loginUser = SecurityUtils.getLoginUser();
try {
- InputStream inputStream = file.getInputStream();
+ byte[] fileBytes = file.getBytes();
ExcelUtil<SalesLedgerImportDto> salesLedgerImportDtoExcelUtil = new ExcelUtil<>(SalesLedgerImportDto.class);
- Map<String, List<SalesLedgerImportDto>> stringListMap = salesLedgerImportDtoExcelUtil.importExcelMultiSheet(Arrays.asList("閿�鍞彴璐︽暟鎹�", "閿�鍞骇鍝佹暟鎹�"), inputStream, 0);
- if (CollectionUtils.isEmpty(stringListMap)) return AjaxResult.error("閿�鍞〃鏍间负绌猴紒");
- // 涓氬姟灞傚悎骞�
- List<SalesLedgerImportDto> salesLedgerImportDtoList = stringListMap.get("閿�鍞彴璐︽暟鎹�");
+ // 閿�鍞彴璐︽暟鎹笉璺宠繃鏍囬
+ List<SalesLedgerImportDto> salesLedgerImportDtoList = salesLedgerImportDtoExcelUtil.importExcel("閿�鍞彴璐︽暟鎹�", new ByteArrayInputStream(fileBytes), 0);
+ // 閿�鍞骇鍝佹暟鎹烦杩�1琛屾爣棰�
+ List<SalesLedgerImportDto> salesLedgerProductImportDtoList = salesLedgerImportDtoExcelUtil.importExcel("閿�鍞骇鍝佹暟鎹�", new ByteArrayInputStream(fileBytes), 1);
+
if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return AjaxResult.error("閿�鍞彴璐︽暟鎹负绌猴紒");
- List<SalesLedgerImportDto> salesLedgerProductImportDtoList = stringListMap.get("閿�鍞骇鍝佹暟鎹�");
if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return AjaxResult.error("閿�鍞骇鍝佹暟鎹负绌猴紒");
// 瀹㈡埛鏁版嵁
List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>().in(Customer::getCustomerName,
@@ -376,16 +377,20 @@
BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
salesLedger.setExecutionDate(DateUtils.toLocalDate(salesLedgerImportDto.getExecutionDate()));
// 閫氳繃瀹㈡埛鍚嶇О鏌ヨ瀹㈡埛ID锛屽鎴峰悎鍚屽彿
- salesLedger.setCustomerId(customers.stream()
+ // 鏌ヨ瀹㈡埛妗ｆ骞惰缃攢鍞被鍨嬶紙瀵瑰叕1/瀵圭2锛�
+ Customer matchedCustomer = customers.stream()
.filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))
.findFirst()
- .map(Customer::getId)
- .orElse(null));
- salesLedger.setCustomerContractNo(customers.stream()
- .filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))
- .findFirst()
- .map(Customer::getTaxpayerIdentificationNumber)
- .orElse(null));
+ .orElse(null);
+
+ if (matchedCustomer != null) {
+ salesLedger.setCustomerId(matchedCustomer.getId());
+ salesLedger.setSalesType(matchedCustomer.getCustomerType());
+ salesLedger.setCustomerContractNo(matchedCustomer.getTaxpayerIdentificationNumber());
+ } else {
+ salesLedger.setSalesType(1);
+ }
+
Long aLong = sysUsers.stream()
.filter(sysUser -> sysUser.getNickName().equals(salesLedger.getEntryPerson()))
.findFirst()
@@ -394,14 +399,30 @@
if (aLong == null)
throw new RuntimeException("褰曞叆浜�:" + salesLedger.getEntryPerson() + ",鏃犲搴旂敤鎴凤紒");
salesLedger.setEntryPerson(aLong.toString());
- // 閿�鍞骇鍝佹暟鎹粦瀹氾紝閫氳繃閿�鍞崟鍙疯幏鍙栧搴旈攢鍞骇鍝佹暟鎹�
+
+ // 閿�鍞骇鍝佹暟鎹粦瀹�
List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
.filter(salesLedgerProductImportDto -> salesLedgerProductImportDto.getSalesContractNo().equals(salesLedger.getSalesContractNo()))
.collect(Collectors.toList());
+
if (CollectionUtils.isEmpty(salesLedgerProductImportDtos))
throw new RuntimeException("閿�鍞崟鍙�:" + salesLedgerImportDto.getSalesContractNo() + ",鏃犲搴斾骇鍝佹暟鎹紒");
+
+ boolean isPrivate = Integer.valueOf(2).equals(salesLedger.getSalesType());
+
+ // 缁熶竴璁＄畻鍚堝悓鎬婚噾棰�
salesLedger.setContractAmount(salesLedgerProductImportDtos.stream()
- .map(SalesLedgerProductImportDto::getTaxInclusiveTotalPrice)
+ .map(dto -> {
+ if (isPrivate) {
+ if (dto.getTotalPrice() != null) return dto.getTotalPrice();
+ BigDecimal up = dto.getUnitPrice() != null ? dto.getUnitPrice() : BigDecimal.ZERO;
+ BigDecimal fr = dto.getFreight() != null ? dto.getFreight() : BigDecimal.ZERO;
+ BigDecimal qty = dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO;
+ return up.add(fr).multiply(qty);
+ } else {
+ return dto.getTaxInclusiveTotalPrice() != null ? dto.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ }
+ })
.reduce(BigDecimal.ZERO, BigDecimal::add));
salesLedgerMapper.insert(salesLedger);
@@ -411,10 +432,54 @@
BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
salesLedgerProduct.setType(1);
- // 璁＄畻涓嶅惈绋庢�讳环
- salesLedgerProduct.setTaxExclusiveTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice().divide(new BigDecimal(1).add(salesLedgerProduct.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP));
+
salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxExclusiveTotalPrice());
+
+ if (isPrivate) {
+ // 瀵圭涓氬姟
+ if (salesLedgerProduct.getFreight() == null) salesLedgerProduct.setFreight(BigDecimal.ZERO);
+ if (salesLedgerProduct.getUnitPrice() != null && salesLedgerProduct.getQuantity() != null) {
+ if (salesLedgerProduct.getPriceWithFreight() == null) {
+ salesLedgerProduct.setPriceWithFreight(salesLedgerProduct.getUnitPrice().add(salesLedgerProduct.getFreight()));
+ }
+ if (salesLedgerProduct.getTotalPrice() == null) {
+ salesLedgerProduct.setTotalPrice(salesLedgerProduct.getPriceWithFreight().multiply(salesLedgerProduct.getQuantity()));
+ }
+ }
+
+ BigDecimal tp = salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO;
+ salesLedgerProduct.setTaxInclusiveTotalPrice(tp);
+ salesLedgerProduct.setTaxExclusiveTotalPrice(salesLedgerProduct.getUnitPrice() != null ?
+ salesLedgerProduct.getUnitPrice().multiply(salesLedgerProduct.getQuantity()) : tp);
+
+ // 浣跨敤鍚繍璐规�讳环
+ salesLedgerProduct.setNoInvoiceAmount(tp);
+ salesLedgerProduct.setPendingInvoiceTotal(tp);
+
+ salesLedgerProduct.setTaxRate(null);
+ salesLedgerProduct.setTaxInclusiveUnitPrice(null);
+ salesLedgerProduct.setInvoiceType(null);
+ } else {
+ // 瀵瑰叕涓氬姟閫昏緫
+ if (salesLedgerProduct.getTaxInclusiveTotalPrice() != null && salesLedgerProduct.getTaxRate() != null) {
+ salesLedgerProduct.setTaxExclusiveTotalPrice(
+ salesLedgerProduct.getTaxInclusiveTotalPrice()
+ .divide(new BigDecimal(1).add(salesLedgerProduct.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP)
+ );
+ }
+
+ // 瀵瑰叕浣跨敤鍚◣鎬讳环
+ BigDecimal titp = salesLedgerProduct.getTaxInclusiveTotalPrice() != null ? salesLedgerProduct.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ salesLedgerProduct.setNoInvoiceAmount(titp);
+ salesLedgerProduct.setPendingInvoiceTotal(titp);
+
+ salesLedgerProduct.setUnitPrice(null);
+ salesLedgerProduct.setTotalPrice(null);
+ salesLedgerProduct.setFreight(BigDecimal.ZERO);
+ salesLedgerProduct.setPriceWithFreight(null);
+ }
+
+ // 鍖归厤浜у搧绉嶇被鍜岃鏍煎瀷鍙锋槧灏処D
list.stream()
.filter(map -> map.get("productName").equals(salesLedgerProduct.getProductCategory()) && map.get("model").equals(salesLedgerProduct.getSpecificationModel()))
.findFirst()
@@ -422,20 +487,12 @@
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);
// 娣诲姞鐢熶骇鏁版嵁
salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
@@ -444,9 +501,9 @@
return AjaxResult.success("瀵煎叆鎴愬姛");
} catch (Exception e) {
- e.printStackTrace();
+ log.error("瀵煎叆澶辫触锛�", e);
+ throw new RuntimeException("瀵煎叆鏁版嵁杩囩▼涓彂鐢熶簡閿欒锛�" + e.getMessage());
}
- return AjaxResult.success("瀵煎叆澶辫触");
}
@Override
@@ -612,16 +669,23 @@
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();
- if (productList != null && !productList.isEmpty()) {
- handleSalesLedgerProducts(salesLedger.getId(), productList, EnumUtil.fromCode(SaleEnum.class, salesLedgerDto.getType()));
+ if (productList == null || productList.isEmpty()){
+ throw new ServiceException("鏂板/淇敼澶辫触,閿�鍞骇鍝佷笉鑳戒负绌�");
+ }
+ handleSalesLedgerProducts(salesLedger.getId(), productList, EnumUtil.fromCode(SaleEnum.class, salesLedgerDto.getType()), salesLedger.getSalesType());
+
+ Function<SalesLedgerProduct, BigDecimal> amountGetter =
+ Integer.valueOf(2).equals(salesLedger.getSalesType()) ?
+ p -> p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO
+ : p -> p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+
updateMainContractAmount(
salesLedger.getId(),
productList,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ amountGetter,
salesLedgerMapper,
SalesLedger.class
);
- }
// 5. 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
if (salesLedgerDto.getTempFileIds() != null && !salesLedgerDto.getTempFileIds().isEmpty()) {
@@ -712,6 +776,10 @@
@Override
public void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type) {
+ handleSalesLedgerProducts(salesLedgerId, products, type, 1);
+ }
+
+ public void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type, Integer salesType) {
// 鎸塈D鍒嗙粍锛屽尯鍒嗘柊澧炲拰鏇存柊鐨勮褰�
Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream()
.peek(p -> p.setSalesLedgerId(salesLedgerId))
@@ -732,11 +800,16 @@
for (SalesLedgerProduct salesLedgerProduct : insertList) {
salesLedgerProduct.setType(type.getCode());
salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
- salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ if (Integer.valueOf(2).equals(salesType)) {
+ salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO);
+ salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO);
+ } else {
+ salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ }
salesLedgerProductMapper.insert(salesLedgerProduct);
// 娣诲姞鐢熶骇鏁版嵁
- salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
+// salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
}
}
}
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 87688e1..e17554a 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.SupplierManageMapper">
- <select id="supplierListPage" resultType="com.ruoyi.basic.dto.SupplierManageDto">
+ <select id="supplierListPage" resultType="com.ruoyi.basic.pojo.SupplierManage">
SELECT
T1.id,
T1.supplier_name,
@@ -41,6 +41,7 @@
SELECT
T1.id,
T1.supplier_name,
+ T1.supplier_type,
T1.taxpayer_identification_num,
T1.company_address,
T1.company_phone,
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index a122e90..4e482f2 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -22,8 +22,7 @@
pm.model as productModelName,
ppo.quantity,
ppo.scrap_qty,
- pm.unit,
- sl.sales_contract_no salesContractNo
+ pm.unit
from
production_product_main ppm
left join product_work_order pwo on pwo.id = ppm.work_order_id
@@ -33,7 +32,6 @@
left join production_product_output ppo on ppm.id = ppo.product_main_id
left join product_model pm on pm.id = ppo.product_model_id
left join product p on p.id = pm.product_id
- left join sales_ledger sl on sl.id = po.sales_ledger_id
left join sys_user u on u.user_id = ppm.user_id
<where>
<if test="c.nickName != null and c.nickName != ''">
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 1aed9b4..ac248cd 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -28,6 +28,7 @@
pl.template_name,
pl.approve_user_ids,
sm.is_white,
+ sm.supplier_type AS supplierType,
pl.approval_status,
pl.payment_method,
pl.remarks
@@ -65,8 +66,8 @@
<if test="c.supplierId != null">
AND pl.supplier_id = #{c.supplierId}
</if>
- <if test="c.approvalStatus != null">
- AND pl.approval_status = #{c.approvalStatus}
+ <if test="c.supplierType != null">
+ AND sm.supplier_type = #{c.supplierType}
</if>
</where>
ORDER BY pl.entry_date DESC
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerTemplateMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerTemplateMapper.xml
index de0ddcf..2d19229 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerTemplateMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerTemplateMapper.xml
@@ -24,6 +24,7 @@
<result column="payment_method" property="paymentMethod" />
<result column="execution_date" property="executionDate" />
<result column="template_name" property="templateName" />
+ <result column="template_type" property="templateType" />
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 71ad49f..d119c79 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -43,7 +43,8 @@
</select>
<select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
- SELECT T1.id,
+ SELECT
+ T1.id,
T1.sales_contract_no,
T1.customer_contract_no,
T1.project_name,
@@ -56,12 +57,13 @@
T1.attachment_materials,
T1.tenant_id,
T1.contract_amount,
- T1.contract_amount as noInvoiceAmountTotal,
+ T1.contract_amount AS noInvoiceAmountTotal,
T1.execution_date,
- T2.nick_name AS entry_person_name,
+ T2.nick_name AS entry_person_name,
T1.payment_method,
T1.delivery_date,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
+ T3.customer_type AS customerType,
CASE
WHEN shipping_status_counts.total_count = 0 THEN false
WHEN shipping_status_counts.unshipped_count = 0 THEN true
@@ -69,6 +71,7 @@
END AS is_fh
FROM sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
+ LEFT JOIN customer T3 ON T1.customer_id = T3.id
LEFT JOIN (
SELECT sales_ledger_id,
COUNT(*) as total_count,
@@ -78,25 +81,28 @@
) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
<where>
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
+ AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
</if>
<if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
+ AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
</if>
<if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
+ AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
</if>
<if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
</if>
<if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
+ AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
</if>
<if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
+ AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
+ </if>
+ <if test="salesLedgerDto.customerType != null and salesLedgerDto.customerType != '' ">
+ AND T3.customer_type = #{salesLedgerDto.customerType}
</if>
</where>
- order by T1.entry_date desc
+ ORDER BY T1.entry_date DESC
</select>
<select id="selectIncomeStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
diff --git "a/src/main/resources/static/\351\207\207\350\264\255\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\207\207\350\264\255\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index 7c08b61..a908de0 100644
--- "a/src/main/resources/static/\351\207\207\350\264\255\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\207\207\350\264\255\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
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..889ad8b 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