product-inventory-management-after.git

			@@ -8,15 +8,23 @@
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ruoyi.account.service.AccountIncomeService;
			import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
			import com.ruoyi.account.mapper.sales.AccountInvoiceApplicationMapper;
			import com.ruoyi.account.mapper.sales.AccountSalesCollectionMapper;
			import com.ruoyi.account.pojo.sales.AccountInvoiceApplication;
			import com.ruoyi.account.pojo.sales.AccountSalesCollection;
			import com.ruoyi.basic.dto.StorageAttachmentDTO;
			import com.ruoyi.basic.enums.ApplicationTypeEnum;
			import com.ruoyi.basic.enums.RecordTypeEnum;
			import com.ruoyi.basic.mapper.CustomerMapper;
			import com.ruoyi.basic.mapper.CustomerPrivatePoolMapper;
			import com.ruoyi.basic.mapper.ProductMapper;
			import com.ruoyi.basic.mapper.ProductModelMapper;
			import com.ruoyi.basic.pojo.Customer;
			import com.ruoyi.basic.pojo.ProductModel;
			import com.ruoyi.basic.utils.FileUtil;
			import com.ruoyi.common.enums.FileNameType;
			import com.ruoyi.common.enums.SaleEnum;
			import com.ruoyi.common.exception.base.BaseException;
			import com.ruoyi.common.utils.AmountUtils;
			import com.ruoyi.common.utils.DateUtils;
			import com.ruoyi.common.utils.EnumUtil;
			import com.ruoyi.common.utils.SecurityUtils;
			@@ -25,7 +33,6 @@
			import com.ruoyi.framework.security.LoginUser;
			import com.ruoyi.framework.web.domain.AjaxResult;
			import com.ruoyi.other.mapper.TempFileMapper;
			import com.ruoyi.other.pojo.TempFile;
			import com.ruoyi.production.mapper.ProductionProductInputMapper;
			import com.ruoyi.production.mapper.ProductionProductMainMapper;
			import com.ruoyi.production.mapper.ProductionProductOutputMapper;
			@@ -38,14 +45,21 @@
			import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
			import com.ruoyi.quality.mapper.QualityInspectMapper;
			import com.ruoyi.sales.dto.*;
			import com.ruoyi.sales.mapper.*;
			import com.ruoyi.sales.pojo.*;
			import com.ruoyi.sales.mapper.CommonFileMapper;
			import com.ruoyi.sales.mapper.SalesLedgerMapper;
			import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
			import com.ruoyi.sales.mapper.ShippingInfoMapper;
			import com.ruoyi.sales.pojo.CommonFile;
			import com.ruoyi.sales.pojo.SalesLedger;
			import com.ruoyi.sales.pojo.SalesLedgerProduct;
			import com.ruoyi.sales.pojo.ShippingInfo;
			import com.ruoyi.sales.service.ISalesLedgerService;
			import com.ruoyi.sales.vo.SalesLedgerVo;
			import lombok.RequiredArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.io.FilenameUtils;
			import org.jetbrains.annotations.Nullable;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.data.redis.core.script.DefaultRedisScript;
			@@ -53,15 +67,10 @@
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.multipart.MultipartFile;

			import java.io.IOException;
			import java.io.InputStream;
			import java.lang.reflect.Field;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.nio.file.Files;
			import java.nio.file.Path;
			import java.nio.file.Paths;
			import java.nio.file.StandardCopyOption;
			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.time.YearMonth;
			@@ -84,33 +93,40 @@
			private static final String LOCK_PREFIX = "contract_no_lock:";
			private static final long LOCK_WAIT_TIMEOUT = 10; // 锁等待超时时间（秒）
			private static final long LOCK_EXPIRE_TIME = 30; // 锁自动过期时间（秒）
			private final AccountIncomeService accountIncomeService;
			private final SalesLedgerMapper salesLedgerMapper;
			private final CustomerMapper customerMapper;
			private final SalesLedgerProductMapper salesLedgerProductMapper;
			private final SalesLedgerProductServiceImpl salesLedgerProductServiceImpl;
			private final CommonFileMapper commonFileMapper;
			private final TempFileMapper tempFileMapper;
			private final ReceiptPaymentMapper receiptPaymentMapper;
			private final ShippingInfoServiceImpl shippingInfoServiceImpl;
			private final CommonFileServiceImpl commonFileService;
			private final ShippingInfoMapper shippingInfoMapper;
			private final InvoiceLedgerMapper invoiceLedgerMapper;
			private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
			private final InvoiceRegistrationMapper invoiceRegistrationMapper;
			private final ProductionProductMainMapper productionProductMainMapper;
			private final ProductionProductOutputMapper productionProductOutputMapper;
			private final ProductionProductInputMapper productionProductInputMapper;
			private final QualityInspectMapper qualityInspectMapper;
			private final ProductModelMapper productModelMapper;
			private final RedisTemplate<String, String> redisTemplate;
			private final SysDeptMapper sysDeptMapper;
			private final FileUtil fileUtil;
			private final AccountInvoiceApplicationMapper accountInvoiceApplicationMapper;
			private final AccountSalesCollectionMapper accountSalesCollectionMapper;

			@Autowired
			private SysDeptMapper sysDeptMapper;
			@Value("${file.upload-dir}")
			private String uploadDir;
			private final ProductionProductMainService productionProductMainService;
			private final PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
			private final SysUserMapper sysUserMapper;
			private final CustomerPrivatePoolMapper customerPrivatePoolMapper;
			@Autowired
			private ProductModelMapper productModelMapper;

			@Autowired
			private ProductMapper productMapper;
			@Autowired
			private ProductionProductMainService productionProductMainService;
			@Autowired
			private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
			;
			@Autowired
			private SysUserMapper sysUserMapper;

			@Override
			public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
			@@ -135,14 +151,14 @@
			List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(productWrapper);
			if (type.equals(SaleEnum.PURCHASE)) {
			// 查询退货信息
			List<Long> productIds = salesLedgerProducts.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList());
			List<Long> productIds = salesLedgerProducts.stream().map(SalesLedgerProduct::getProductModelId).collect(Collectors.toList());
			List<SimpleReturnOrderGroupDto> groupListByProductIds = new ArrayList<>();
			if(CollectionUtils.isNotEmpty(productIds)){
			if (CollectionUtils.isNotEmpty(productIds)) {
			groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
			}
			Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getSalesLedgerProductId, SimpleReturnOrderGroupDto::getSumReturnQuantity));
			Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getProductModelId, SimpleReturnOrderGroupDto::getSumReturnQuantity));
			salesLedgerProducts.forEach(item -> {
			BigDecimal returnQuality = returnOrderGroupDtoMap.getOrDefault(item.getId(), BigDecimal.ZERO);
			BigDecimal returnQuality = returnOrderGroupDtoMap.getOrDefault(item.getProductModelId(), BigDecimal.ZERO);
			item.setReturnQuality(returnQuality);
			item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
			});
			@@ -163,11 +179,8 @@
			productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId());
			productWrapper.eq(SalesLedgerProduct::getType, 1);
			List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
			AmountUtils.normalizeSalesLedgerProducts(products);
			for (SalesLedgerProduct product : products) {
			product.setOriginalNoInvoiceNum(product.getNoInvoiceNum());
			// 提供临时未开票数，未开票金额供前段计算
			product.setTempnoInvoiceAmount(product.getNoInvoiceAmount());
			product.setTempNoInvoiceNum(product.getNoInvoiceNum());
			product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());
			product.setRegisterDate(LocalDateTime.now());
			// 发货信息
			@@ -176,7 +189,11 @@
			.orderByDesc(ShippingInfo::getCreateTime)
			.last("limit 1"));
			if (shippingInfo != null) {
			product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
			product.setShippingDate(shippingInfo.getShippingDate());
			product.setShippingStatus(shippingInfo.getStatus());
			product.setExpressCompany(shippingInfo.getExpressCompany());
			product.setExpressNumber(shippingInfo.getExpressNumber());
			}
			}

			@@ -189,11 +206,18 @@
			// 4. 转换 DTO
			SalesLedgerDto resultDto = new SalesLedgerDto();
			BeanUtils.copyProperties(salesLedger, resultDto);
			AmountUtils.normalizeContractAmount(resultDto);
			if (!products.isEmpty()) {
			resultDto.setHasChildren(true);
			resultDto.setProductData(products);
			resultDto.setSalesLedgerFiles(salesLedgerFiles);
			}

			StorageAttachmentDTO attachmentQuery = new StorageAttachmentDTO();
			attachmentQuery.setApplication(ApplicationTypeEnum.FILE.getType());
			attachmentQuery.setRecordType(RecordTypeEnum.SALES_LEDGER.getType());
			attachmentQuery.setRecordId(salesLedger.getId());
			resultDto.setStorageBlobVOs(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(attachmentQuery));
			return resultDto;
			}

			@@ -268,57 +292,47 @@

			@Override
			public List<MonthlyAmountDto> getAmountHalfYear(Integer type) {

			LocalDate now = LocalDate.now();
			List<MonthlyAmountDto> result = new ArrayList<>();

			for (int i = 5; i >= 0; i--) {
			YearMonth yearMonth = YearMonth.from(now.minusMonths(i));
			LocalDateTime startTime = yearMonth.atDay(1).atStartOfDay();
			LocalDateTime endTime = yearMonth.atEndOfMonth().atTime(23, 59, 59);

			// 回款金额
			LambdaQueryWrapper<ReceiptPayment> receiptPaymentQuery = new LambdaQueryWrapper<>();
			receiptPaymentQuery
			.ge(ReceiptPayment::getCreateTime, startTime)
			.le(ReceiptPayment::getCreateTime, endTime);

			List<ReceiptPayment> receiptPayments =
			receiptPaymentMapper.selectList(receiptPaymentQuery);

			BigDecimal receiptAmount = receiptPayments.stream()
			.map(ReceiptPayment::getReceiptPaymentAmount)
			.filter(Objects::nonNull)
			.reduce(BigDecimal.ZERO, BigDecimal::add);

			// 开票金额
			LambdaQueryWrapper<InvoiceLedger> invoiceLedgerQuery = new LambdaQueryWrapper<>();
			invoiceLedgerQuery
			.ge(InvoiceLedger::getCreateTime, startTime)
			.le(InvoiceLedger::getCreateTime, endTime);

			List<InvoiceLedger> invoiceLedgers =
			invoiceLedgerMapper.selectList(invoiceLedgerQuery);

			BigDecimal invoiceAmount = invoiceLedgers.stream()
			.map(InvoiceLedger::getInvoiceTotal)
			.filter(Objects::nonNull)
			.reduce(BigDecimal.ZERO, BigDecimal::add);

			LocalDate startTime = yearMonth.atDay(1);
			LocalDate endTime = yearMonth.atEndOfMonth();
			MonthlyAmountDto dto = new MonthlyAmountDto();
			dto.setMonth(yearMonth.format(DateTimeFormatter.ofPattern("yyyy-MM")));
			dto.setReceiptAmount(receiptAmount);
			dto.setInvoiceAmount(invoiceAmount);

			//回款金额
			List<AccountSalesCollection> accountSalesCollections = accountSalesCollectionMapper.selectList(new LambdaQueryWrapper<AccountSalesCollection>()
			.between(AccountSalesCollection::getCollectionDate, startTime, endTime));
			BigDecimal totalIncome = Optional.of(
			accountSalesCollections.stream()
			.map(AccountSalesCollection::getCollectionAmount)
			.filter(Objects::nonNull)
			.reduce(BigDecimal.ZERO, BigDecimal::add)
			).orElse(BigDecimal.ZERO);
			dto.setReceiptAmount(totalIncome);
			//开票金额
			List<AccountInvoiceApplication> accountInvoiceApplications = accountInvoiceApplicationMapper.selectList(new LambdaQueryWrapper<AccountInvoiceApplication>()
			.eq(AccountInvoiceApplication::getStatus, 1)
			.between(AccountInvoiceApplication::getApplyDate, startTime, endTime));
			BigDecimal totalInvoiceAmount = Optional.of(
			accountInvoiceApplications.stream()
			.map(AccountInvoiceApplication::getInvoiceAmount)
			.filter(Objects::nonNull)
			.reduce(BigDecimal.ZERO, BigDecimal::add)
			).orElse(BigDecimal.ZERO);
			dto.setInvoiceAmount(totalInvoiceAmount);
			result.add(dto);
			}

			return result;
			}

			@Override
			public IPage<SalesLedger> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto) {
			return salesLedgerMapper.selectSalesLedgerListPage(page, salesLedgerDto);
			public IPage<SalesLedgerVo> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto) {
			IPage<SalesLedgerVo> result = salesLedgerMapper.selectSalesLedgerListPage(page, salesLedgerDto);
			if (!CollectionUtils.isEmpty(result.getRecords())) {
			result.getRecords().forEach(AmountUtils::normalizeContractAmount);
			}
			return result;
			}

			@Override
			@@ -348,16 +362,41 @@
			// 录入人数据
			List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
			salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getEntryPerson).collect(Collectors.toList())));
			for (SalesLedgerImportDto salesLedgerImportDto : salesLedgerImportDtoList) {
			SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
			.eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())
			.last("LIMIT 1"));
			if (salesLedger1 != null) {
			// 销售单号重复校验：文件内重复或库内已存在的，直接失败并回显原有销售单号
			List<String> duplicateContractNos = new ArrayList<>();
			Set<String> importContractNos = new HashSet<>();
			for (SalesLedgerImportDto item : salesLedgerImportDtoList) {
			String contractNo = StringUtils.trim(item.getSalesContractNo());
			if (StringUtils.isEmpty(contractNo)) {
			continue;
			}
			if (contractNo.length() > 50) {
			return AjaxResult.error("销售单号【" + contractNo + "】长度不能超过50个字符");
			}
			if (!importContractNos.add(contractNo)) {
			duplicateContractNos.add(contractNo);
			}
			}
			if (CollectionUtils.isNotEmpty(duplicateContractNos)) {
			return AjaxResult.error("导入文件中存在重复的销售单号：" + String.join("、", duplicateContractNos));
			}
			if (CollectionUtils.isNotEmpty(importContractNos)) {
			List<SalesLedger> existLedgers = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
			.in(SalesLedger::getSalesContractNo, importContractNos)
			.select(SalesLedger::getId, SalesLedger::getSalesContractNo));
			if (CollectionUtils.isNotEmpty(existLedgers)) {
			String existNos = existLedgers.stream()
			.map(SalesLedger::getSalesContractNo)
			.distinct()
			.collect(Collectors.joining("、"));
			return AjaxResult.error("以下销售单号已存在，不能重复新增：" + existNos);
			}
			}
			for (SalesLedgerImportDto salesLedgerImportDto : salesLedgerImportDtoList) {
			SalesLedger salesLedger = new SalesLedger();
			BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
			salesLedger.setExecutionDate(DateUtils.toLocalDate(salesLedgerImportDto.getExecutionDate()));
			salesLedger.setDeliveryDate(DateUtils.toLocalDate(salesLedgerImportDto.getDeliveryDate()));
			// 通过客户名称查询客户ID，客户合同号
			salesLedger.setCustomerId(customers.stream()
			.filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))
			@@ -375,7 +414,7 @@
			.map(SysUser::getUserId)
			.orElse(null);
			if (aLong == null)
			throw new RuntimeException("录入人:" + salesLedger.getEntryPerson() + ",无对应用户！");
			throw new RuntimeException("录入人:" + salesLedger.getEntryPerson() + ",无对应用户！请填写系统用户的昵称（不是登录账号）");
			salesLedger.setEntryPerson(aLong.toString());
			// 销售产品数据绑定，通过销售单号获取对应销售产品数据
			List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
			@@ -394,16 +433,29 @@
			BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
			salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
			salesLedgerProduct.setType(1);
			// 物料编码 -> 产品编码
			String materialCode = StringUtils.trim(salesLedgerProductImportDto.getMaterialCode());
			if (StringUtils.isNotEmpty(materialCode)) {
			salesLedgerProduct.setProductCode(materialCode);
			}
			AmountUtils.normalizeSalesLedgerProduct(salesLedgerProduct);
			// 计算不含税总价
			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());
			salesLedgerProduct.setTaxExclusiveTotalPrice(
			AmountUtils.calcTaxExclusiveTotalPrice(
			salesLedgerProduct.getTaxInclusiveTotalPrice(),
			salesLedgerProduct.getTaxRate()
			)
			);
			list.stream()
			.filter(map -> map.get("productName").equals(salesLedgerProduct.getProductCategory()) && map.get("model").equals(salesLedgerProduct.getSpecificationModel()))
			.filter(map -> Objects.equals(map.get("productName"), salesLedgerProduct.getProductCategory()) && Objects.equals(map.get("model"), salesLedgerProduct.getSpecificationModel()))
			.findFirst()
			.ifPresent(map -> {
			salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
			salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
			// 未填物料编码时，按产品型号回填产品编码
			if (StringUtils.isEmpty(salesLedgerProduct.getProductCode()) && map.get("productCode") != null) {
			salesLedgerProduct.setProductCode(map.get("productCode").toString());
			}
			});
			// salesLedgerProduct.setProductId(productList.stream()
			// .filter(product -> product.getProductName().equals(salesLedgerProduct.getProductCategory()))
			@@ -418,7 +470,7 @@
			salesLedgerProduct.setRegister(loginUser.getNickName());
			salesLedgerProduct.setRegisterDate(LocalDateTime.now());
			salesLedgerProduct.setApproveStatus(0);
			salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
			salesLedgerProduct.setIsProduction(parseProductionFlag(salesLedgerProductImportDto.getIsProduction()));
			salesLedgerProductMapper.insert(salesLedgerProduct);
			// 添加生产数据
			salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
			@@ -428,8 +480,8 @@
			return AjaxResult.success("导入成功");
			} catch (Exception e) {
			e.printStackTrace();
			return AjaxResult.error("导入失败：" + e.getMessage());
			}
			return AjaxResult.success("导入失败");
			}

			@Override
			@@ -451,10 +503,6 @@
			productWrapper.eq(SalesLedgerProduct::getType, 1);
			List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
			for (SalesLedgerProduct product : products) {
			product.setOriginalNoInvoiceNum(product.getNoInvoiceNum());
			// 提供临时未开票数，未开票金额供前段计算
			product.setTempnoInvoiceAmount(product.getNoInvoiceAmount());
			product.setTempNoInvoiceNum(product.getNoInvoiceNum());
			product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());
			product.setRegisterDate(LocalDateTime.now());
			// 发货信息
			@@ -462,14 +510,16 @@
			.eq(ShippingInfo::getSalesLedgerProductId, product.getId())
			.orderByDesc(ShippingInfo::getCreateTime)
			.last("limit 1"));
			product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
			product.setShippingDate(shippingInfo.getShippingDate());
			if (shippingInfo != null) {
			product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
			product.setShippingDate(shippingInfo.getShippingDate());
			product.setShippingStatus(shippingInfo.getStatus());
			product.setExpressCompany(shippingInfo.getExpressCompany());
			product.setExpressNumber(shippingInfo.getExpressNumber());
			}
			}
			// 过滤只保留发货记录
			products = products.stream().filter(product -> "已发货".equals(product.getShippingStatus())).collect(Collectors.toList());
			products = products.stream().filter(product -> "审核通过".equals(product.getShippingStatus())).collect(Collectors.toList());
			if (!products.isEmpty()) {
			salesLedger.setHasChildren(true);
			salesLedger.setProductData(products);
			@@ -514,13 +564,14 @@
			// 删除销售管理数据
			LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
			queryWrapper.in(SalesLedgerProduct::getSalesLedgerId, idList)
			.eq(SalesLedgerProduct::getType, 1)
			.select(SalesLedgerProduct::getId);

			List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(queryWrapper);
			List<Long> productIds = products.stream()
			.map(SalesLedgerProduct::getId)
			.collect(Collectors.toList());
			//删除生产计划
			//删除生产数据
			salesLedgerProductServiceImpl.deleteProductionData(productIds);

			// 批量删除产品子表
			@@ -528,29 +579,8 @@
			salesLedgerProductMapper.deleteBatchIds(productIds);
			}

			LambdaQueryWrapper<InvoiceRegistrationProduct> wrapper = new LambdaQueryWrapper<>();
			wrapper.in(InvoiceRegistrationProduct::getSalesLedgerId, idList);
			List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(wrapper);
			List<Integer> invoiceLedgerIds = new ArrayList<>();
			if (CollectionUtils.isNotEmpty(invoiceRegistrationProducts)) {
			LambdaQueryWrapper<InvoiceLedger> wrapperOne = new LambdaQueryWrapper<>();
			wrapperOne.in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList()));
			List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(wrapperOne);
			if (CollectionUtils.isNotEmpty(invoiceLedgers)) {
			invoiceLedgerIds = invoiceLedgers.stream().map(InvoiceLedger::getId).collect(Collectors.toList());
			}
			invoiceLedgerMapper.delete(wrapperOne);
			}
			invoiceRegistrationProductMapper.delete(wrapper);
			LambdaQueryWrapper<InvoiceRegistration> wrapperTwo = new LambdaQueryWrapper<>();
			wrapperTwo.in(InvoiceRegistration::getSalesLedgerId, idList);
			invoiceRegistrationMapper.delete(wrapperTwo);

			if (CollectionUtils.isNotEmpty(invoiceLedgerIds)) {
			LambdaQueryWrapper<ReceiptPayment> wrapperTree = new LambdaQueryWrapper<>();
			wrapperTree.in(ReceiptPayment::getInvoiceLedgerId, invoiceLedgerIds);
			receiptPaymentMapper.delete(wrapperTree);
			}
			// 删除发货台账记录
			List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
			.in(ShippingInfo::getSalesLedgerId, idList));
			@@ -575,128 +605,83 @@
			@Override
			@Transactional(rollbackFor = Exception.class)
			public int addOrUpdateSalesLedger(SalesLedgerDto salesLedgerDto) {
			try {
			// 1. 校验客户信息
			CustomerPrivatePoolDto customer = customerPrivatePoolMapper.selectInfo(salesLedgerDto.getCustomerId());
			if (customer == null) {
			throw new BaseException("客户不存在");
			}

			// 2. DTO转Entity
			SalesLedger salesLedger = convertToEntity(salesLedgerDto);
			salesLedger.setCustomerName(customer.getCustomerName());
			salesLedger.setTenantId(customer.getTenantId());
			// 3. 新增或更新主表
			if (salesLedger.getId() == null) {
			String contractNo = generateSalesContractNo();
			salesLedger.setSalesContractNo(contractNo);
			salesLedgerMapper.insert(salesLedger);
			} else {
			salesLedgerMapper.updateById(salesLedger);
			}

			// 4. 处理子表数据
			List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();
			if (productList != null && !productList.isEmpty()) {
			handleSalesLedgerProducts(salesLedger.getId(), productList, EnumUtil.fromCode(SaleEnum.class, salesLedgerDto.getType()));
			updateMainContractAmount(
			salesLedger.getId(),
			productList,
			SalesLedgerProduct::getTaxInclusiveTotalPrice,
			salesLedgerMapper,
			SalesLedger.class
			);
			}

			// 5. 迁移临时文件到正式目录
			if (salesLedgerDto.getTempFileIds() != null && !salesLedgerDto.getTempFileIds().isEmpty()) {
			migrateTempFilesToFormal(salesLedger.getId(), salesLedgerDto.getTempFileIds());
			}
			return 1;
			} catch (IOException e) {
			throw new BaseException("文件迁移失败: " + e.getMessage());
			// 1. 校验客户信息
			Customer customer = customerMapper.selectById(salesLedgerDto.getCustomerId());
			if (customer == null) {
			throw new BaseException("客户不存在");
			}

			// 2. DTO转Entity
			SalesLedger salesLedger = convertToEntity(salesLedgerDto);
			AmountUtils.normalizeContractAmount(salesLedger);
			salesLedger.setCustomerName(customer.getCustomerName());
			salesLedger.setTenantId(customer.getTenantId());
			// 3. 销售合同号唯一校验（支持字母、数字及特殊字符，不做字符集限制）
			String contractNo = StringUtils.trim(salesLedger.getSalesContractNo());
			if (StringUtils.isNotEmpty(contractNo)) {
			if (contractNo.length() > 50) {
			throw new BaseException("销售合同号长度不能超过50个字符");
			}
			checkSalesContractNoUnique(contractNo, salesLedger.getId());
			salesLedger.setSalesContractNo(contractNo);
			}
			// 4. 新增或更新主表
			if (salesLedger.getId() == null) {
			if (StringUtils.isEmpty(contractNo)) {
			contractNo = generateSalesContractNo();
			}
			salesLedger.setSalesContractNo(contractNo);
			salesLedgerMapper.insert(salesLedger);
			} else {
			salesLedgerMapper.updateById(salesLedger);
			}


			// 5. 处理子表数据
			List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();
			if (productList != null && !productList.isEmpty()) {
			AmountUtils.normalizeSalesLedgerProducts(productList);
			handleSalesLedgerProducts(salesLedger.getId(), productList, EnumUtil.fromCode(SaleEnum.class, salesLedgerDto.getType()));
			updateMainContractAmount(
			salesLedger.getId(),
			productList,
			SalesLedgerProduct::getTaxInclusiveTotalPrice,
			salesLedgerMapper,
			SalesLedger.class
			);
			}

			// 5. 保存销售台账附件
			fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.SALES_LEDGER, salesLedger.getId(), salesLedgerDto.getStorageBlobDTOs());

			return 1;
			}

			/**
			* 将临时文件迁移到正式目录
			*
			* @param businessId 业务ID（销售台账ID）
			* @param tempFileIds 临时文件ID列表
			* @throws IOException 文件操作异常
			* 销售合同号唯一校验（编辑时排除自身）
			*/
			private void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException {
			if (CollectionUtils.isEmpty(tempFileIds)) {
			return;
			}

			// 构建正式目录路径（按业务类型和日期分组）
			String formalDir = uploadDir + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE);

			Path formalDirPath = Paths.get(formalDir);

			// 确保正式目录存在（递归创建）
			if (!Files.exists(formalDirPath)) {
			Files.createDirectories(formalDirPath);
			}

			for (String tempFileId : tempFileIds) {
			// 查询临时文件记录
			TempFile tempFile = tempFileMapper.selectById(tempFileId);
			if (tempFile == null) {
			log.warn("临时文件不存在，跳过处理: {}", tempFileId);
			continue;
			}

			// 构建正式文件名（包含业务ID和时间戳，避免冲突）
			String originalFilename = tempFile.getOriginalName();
			String fileExtension = FilenameUtils.getExtension(originalFilename);
			String formalFilename = businessId + "_" +
			System.currentTimeMillis() + "_" +
			UUID.randomUUID().toString().substring(0, 8) +
			(StringUtils.hasText(fileExtension) ? "." + fileExtension : "");

			Path formalFilePath = formalDirPath.resolve(formalFilename);

			try {
			// 执行文件迁移（使用原子操作确保安全性）
			// Files.move(
			// Paths.get(tempFile.getTempPath()),
			// formalFilePath,
			// StandardCopyOption.REPLACE_EXISTING,
			// StandardCopyOption.ATOMIC_MOVE
			// );
			// 原子移动失败，使用复制+删除
			Files.copy(Paths.get(tempFile.getTempPath()), formalFilePath, StandardCopyOption.REPLACE_EXISTING);
			Files.deleteIfExists(Paths.get(tempFile.getTempPath()));
			log.info("文件迁移成功: {} -> {}", tempFile.getTempPath(), formalFilePath);

			// 更新文件记录（关联到业务ID）
			CommonFile fileRecord = new CommonFile();
			fileRecord.setCommonId(businessId);
			fileRecord.setName(originalFilename);
			fileRecord.setUrl(formalFilePath.toString());
			fileRecord.setCreateTime(LocalDateTime.now());
			//销售
			fileRecord.setType(FileNameType.SALE.getValue());
			commonFileMapper.insert(fileRecord);

			// 删除临时文件记录
			tempFileMapper.deleteById(tempFile);

			log.info("文件迁移成功: {} -> {}", tempFile.getTempPath(), formalFilePath);
			} catch (IOException e) {
			log.error("文件迁移失败: {}", tempFile.getTempPath(), e);
			// 可选择回滚事务或记录失败文件
			throw new IOException("文件迁移异常", e);
			}
			private void checkSalesContractNoUnique(String salesContractNo, Long currentId) {
			LambdaQueryWrapper<SalesLedger> queryWrapper = new LambdaQueryWrapper<>();
			queryWrapper.eq(SalesLedger::getSalesContractNo, salesContractNo)
			.ne(currentId != null, SalesLedger::getId, currentId)
			.last("limit 1");
			SalesLedger duplicate = salesLedgerMapper.selectOne(queryWrapper);
			if (duplicate != null) {
			throw new BaseException("销售合同号" + salesContractNo + "已存在（销售单号：" + duplicate.getSalesContractNo() + "），请重新填写");
			}
			}

			// 文件迁移方法

			@Override
			public void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type) {
			// 产品编码兜底：前端未传时按产品型号回填
			products.forEach(p -> {
			if (StringUtils.isEmpty(p.getProductCode()) && p.getProductModelId() != null) {
			ProductModel productModel = productModelMapper.selectById(p.getProductModelId());
			if (productModel != null) {
			p.setProductCode(productModel.getProductCode());
			}
			}
			});
			// 按ID分组，区分新增和更新的记录
			Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream()
			.peek(p -> p.setSalesLedgerId(salesLedgerId))
			@@ -708,6 +693,7 @@
			// 执行更新操作
			if (!updateList.isEmpty()) {
			for (SalesLedgerProduct product : updateList) {
			AmountUtils.normalizeSalesLedgerProduct(product);
			product.setType(type.getCode());
			salesLedgerProductMapper.updateById(product);
			}
			@@ -715,15 +701,24 @@
			// 执行插入操作
			if (!insertList.isEmpty()) {
			for (SalesLedgerProduct salesLedgerProduct : insertList) {
			AmountUtils.normalizeSalesLedgerProduct(salesLedgerProduct);
			salesLedgerProduct.setType(type.getCode());
			salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
			salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
			salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
			salesLedgerProductMapper.insert(salesLedgerProduct);
			// 添加生产数据
			salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
			}
			}
			}

			/**
			* 解析导入的“是否生产”列：支持 1/0、是/否
			*/
			private static boolean parseProductionFlag(String value) {
			if (StringUtils.isEmpty(value)) {
			return false;
			}
			String v = value.trim();
			return "1".equals(v) \|\| "是".equals(v) \|\| "true".equalsIgnoreCase(v) \|\| "yes".equalsIgnoreCase(v);
			}

			private SalesLedger convertToEntity(SalesLedgerDto dto) {
			@@ -762,14 +757,15 @@
			}

			// 2. 查询当天/公司已存在的序列号（与原逻辑一致）
			Long tenantId = SecurityUtils.getLoginUser().getTenantId();
			if (null != tenantId) {
			//获取公司编号
			SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
			if (!ObjectUtils.isEmpty(sysDept)) {
			datePart = (StringUtils.isEmpty(sysDept.getDeptNick()) ? "" : sysDept.getDeptNick()) + datePart;
			}
			}
			// Long tenantId = SecurityUtils.getLoginUser().getTenantId();
			// if (null != tenantId) {
			//获取公司编号
			// SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
			// if (!ObjectUtils.isEmpty(sysDept)) {
			// datePart = (StringUtils.isEmpty(sysDept.getDeptNick()) ? "" : sysDept.getDeptNick()) + datePart;
			// }
			// }
			datePart = "D" + datePart;
			List<Integer> existingSequences = salesLedgerMapper.selectSequencesByDate(datePart);
			int nextSequence = findFirstMissingSequence(existingSequences);

			@@ -828,7 +824,7 @@

			Field amountField = mainEntityClass.getDeclaredField("contractAmount");
			amountField.setAccessible(true);
			amountField.set(entity, totalAmount);
			amountField.set(entity, AmountUtils.scaleAmount(totalAmount));

			mainMapper.updateById(entity);
			} catch (Exception e) {
			@@ -865,4 +861,31 @@
			return totalAmount;
			}
			}

			@Override
			public Map<String, Object> getPrintData(Long id) {
			SalesLedgerDto dto = new SalesLedgerDto();
			dto.setId(id);
			SalesLedgerDto ledger = getSalesLedgerWithProducts(dto);
			if (ledger == null) {
			return null;
			}
			SysDept dept = sysDeptMapper.selectDeptById(100L);
			Map<String, Object> result = new HashMap<>();
			result.put("companyName", dept != null ? dept.getDeptName() : "");
			result.put("ledger", ledger);
			return result;
			}

			@Override
			public Map<Long, SalesLedgerEditFlagDto> getEditFlags(List<Long> ids) {
			if (CollectionUtils.isEmpty(ids)) {
			return new HashMap<>();
			}
			List<SalesLedgerEditFlagDto> flags = salesLedgerMapper.selectEditFlags(ids);
			return flags.stream().collect(Collectors.toMap(
			SalesLedgerEditFlagDto::getSalesLedgerId,
			Function.identity(),
			(existing, replacement) -> existing));
			}
			}