product-inventory-management-after.git

			@@ -27,6 +27,7 @@
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.exception.base.BaseException;
			import com.ruoyi.common.utils.*;
			import com.ruoyi.common.utils.excel.ExcelUtils;
			import com.ruoyi.common.utils.poi.ExcelUtil;
			import com.ruoyi.framework.security.LoginUser;
			import com.ruoyi.other.mapper.TempFileMapper;
			@@ -75,8 +76,12 @@
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.data.redis.core.script.DefaultRedisScript;
			import org.springframework.security.core.Authentication;
			import org.springframework.security.core.context.SecurityContext;
			import org.springframework.security.core.context.SecurityContextHolder;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.support.TransactionTemplate;
			import org.springframework.web.multipart.MultipartFile;

			import javax.servlet.http.HttpServletResponse;
			@@ -96,6 +101,7 @@
			import java.time.ZoneId;
			import java.time.format.DateTimeFormatter;
			import java.util.*;
			import java.util.concurrent.ConcurrentHashMap;
			import java.util.concurrent.TimeUnit;
			import java.util.function.Function;
			import java.util.stream.Collectors;
			@@ -187,6 +193,8 @@
			private SysUserMapper sysUserMapper;

			private final ICustomerRegionsService customerRegionsService;
			@Autowired
			private TransactionTemplate transactionTemplate;

			@Override
			public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
			@@ -483,7 +491,7 @@
			salesLedger.setIsFh(isFh);

			salesLedger.setIsEdit(!isFh);


			// 根据 reviewStatus 控制反审相关字段的显示
			if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() != 2) {
			// 当 reviewStatus 不为 2 时，隐藏反审时间、反审人和反审人ID
			@@ -788,11 +796,11 @@
			salesLedgerProcessRouteService.saveBatch(salesLedgerProcessRouteList);

			List<SalesLedgerProcessRoute> savedRoutes = salesLedgerProcessRouteService.list(new LambdaQueryWrapper<SalesLedgerProcessRoute>()
			.eq(SalesLedgerProcessRoute::getSalesLedgerId, salesLedger.getId())
			.eq(SalesLedgerProcessRoute::getProcessRouteId, processRoute.getId()));
			.eq(SalesLedgerProcessRoute::getSalesLedgerId, salesLedger.getId())
			.eq(SalesLedgerProcessRoute::getProcessRouteId, processRoute.getId()));
			Map<Long, SalesLedgerProcessRoute> routeMap = savedRoutes.stream()
			.filter(item -> item.getProcessRouteItemId() != null)
			.collect(Collectors.toMap(SalesLedgerProcessRoute::getProcessRouteItemId, item -> item, (a, b) -> a));
			.filter(item -> item.getProcessRouteItemId() != null)
			.collect(Collectors.toMap(SalesLedgerProcessRoute::getProcessRouteItemId, item -> item, (a, b) -> a));

			Map<Long, SalesLedgerProcessRouteRecord> inputRecordMap = new HashMap<>();
			if (CollectionUtils.isNotEmpty(salesLedgerProcessRouteDto.getRecordList())) {
			@@ -815,7 +823,11 @@
			record.setSalesLedgerProcessRouteId(route.getId());
			Integer isCompleted = inputRecord != null && inputRecord.getIsCompleted() != null ? inputRecord.getIsCompleted() : 0;
			record.setIsCompleted(isCompleted);
			record.setCompletedTime(Objects.equals(isCompleted, 1) ? LocalDateTime.now() : null);
			if (Objects.equals(isCompleted, 1)) {
			record.setCompletedTime(inputRecord != null && inputRecord.getCompletedTime() != null ? inputRecord.getCompletedTime() : LocalDateTime.now());
			} else {
			record.setCompletedTime(null);
			}
			routeRecordList.add(record);
			}
			salesLedgerProcessRouteRecordService.saveBatch(routeRecordList);
			@@ -1160,7 +1172,7 @@
			@Transactional(readOnly = true)
			public String generateSalesContractNo() {
			LocalDate currentDate = LocalDate.now();
			String datePart = currentDate.format(DateTimeFormatter.BASIC_ISO_DATE);
			String datePart = currentDate.format(DateTimeFormatter.ofPattern("yyMMdd"));
			String lockKey = LOCK_PREFIX + datePart;
			String lockValue = Thread.currentThread().getId() + "-" + System.nanoTime(); // 唯一标识锁持有者

			@@ -1212,9 +1224,9 @@
			SalesLedgerProcessRouteDto dto = new SalesLedgerProcessRouteDto();
			List<SalesLedgerProcessRoute> list = baseMapper.selectSalesProcess(salesLedgerId);
			List<SalesLedgerProcessRouteRecord> recordList = salesLedgerProcessRouteRecordService.list(
			new LambdaQueryWrapper<SalesLedgerProcessRouteRecord>()
			.eq(SalesLedgerProcessRouteRecord::getSalesLedgerId, salesLedgerId)
			.orderByAsc(SalesLedgerProcessRouteRecord::getId)
			new LambdaQueryWrapper<SalesLedgerProcessRouteRecord>()
			.eq(SalesLedgerProcessRouteRecord::getSalesLedgerId, salesLedgerId)
			.orderByAsc(SalesLedgerProcessRouteRecord::getId)
			);
			if (CollectionUtils.isNotEmpty(list)) {
			Long processRouteId = list.get(0).getProcessRouteId();
			@@ -1244,8 +1256,8 @@
			dto.setList(list);
			if (CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(recordList)) {
			Map<Long, Long> routeItemIdMap = list.stream()
			.filter(item -> item.getId() != null && item.getProcessRouteItemId() != null)
			.collect(Collectors.toMap(SalesLedgerProcessRoute::getId, SalesLedgerProcessRoute::getProcessRouteItemId, (a, b) -> a));
			.filter(item -> item.getId() != null && item.getProcessRouteItemId() != null)
			.collect(Collectors.toMap(SalesLedgerProcessRoute::getId, SalesLedgerProcessRoute::getProcessRouteItemId, (a, b) -> a));
			recordList.forEach(record -> {
			if (record != null && record.getSalesLedgerProcessRouteId() != null) {
			record.setProcessRouteItemId(routeItemIdMap.get(record.getSalesLedgerProcessRouteId()));
			@@ -1821,7 +1833,7 @@
			LoginUser loginUser = SecurityUtils.getLoginUser();
			ApproveProcessVO approveProcessVO = new ApproveProcessVO();
			approveProcessVO.setApproveType(ApproveTypeEnum.STOCK_IN.getCode());
			approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
			approveProcessVO.setApproveDeptId(208L);
			approveProcessVO.setApproveReason("入库审批:" + ledger.getSalesContractNo());
			approveProcessVO.setApproveRemark("salesStock:" + ledger.getId() + ":" + productIds);
			approveProcessVO.setApproveUserIds(approveUserIds);
			@@ -1898,7 +1910,11 @@
			BigDecimal stockedQty = item.getStockedQuantity() == null ? BigDecimal.ZERO : item.getStockedQuantity();
			return orderQty.compareTo(BigDecimal.ZERO) <= 0 \|\| stockedQty.compareTo(orderQty) >= 0;
			});
			ledger.setStockStatus(allStocked ? 2 : (hasStocked ? 1 : 0));
			int newStockStatus = allStocked ? 2 : (hasStocked ? 1 : 0);
			if (newStockStatus > 0 && ledger.getDeliveryDate() == null) {
			ledger.setDeliveryDate(LocalDate.now().plusDays(7));
			}
			ledger.setStockStatus(newStockStatus);
			baseMapper.updateById(ledger);
			}

			@@ -1988,7 +2004,7 @@
			LoginUser loginUser = SecurityUtils.getLoginUser();
			ApproveProcessVO approveProcessVO = new ApproveProcessVO();
			approveProcessVO.setApproveType(ApproveTypeEnum.STOCK_IN.getCode());
			approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
			approveProcessVO.setApproveDeptId(208L);
			approveProcessVO.setApproveReason(reason);
			approveProcessVO.setApproveRemark(remark);
			approveProcessVO.setApproveUserIds(approveUserIds);
			@@ -2063,7 +2079,11 @@
			return sq != null && sq.compareTo(BigDecimal.ZERO) > 0;
			});
			boolean allLinesFull = ledgerAllProducts.stream().allMatch(p -> Objects.equals(p.getProductStockStatus(), 2));
			salesLedger.setStockStatus(allLinesFull ? 2 : (anyInbound ? 1 : 0));
			int newStockStatus = allLinesFull ? 2 : (anyInbound ? 1 : 0);
			if (newStockStatus > 0 && salesLedger.getDeliveryDate() == null) {
			salesLedger.setDeliveryDate(LocalDate.now().plusDays(7));
			}
			salesLedger.setStockStatus(newStockStatus);
			baseMapper.updateById(salesLedger);
			}

			@@ -2143,7 +2163,7 @@
			LoginUser loginUser = SecurityUtils.getLoginUser();
			ApproveProcessVO approveProcessVO = new ApproveProcessVO();
			approveProcessVO.setApproveType(ApproveTypeEnum.STOCK_IN.getCode());
			approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
			approveProcessVO.setApproveDeptId(208L);
			approveProcessVO.setApproveReason(reason);
			approveProcessVO.setApproveRemark(remark);
			approveProcessVO.setApproveUserIds(approveUserIds);
			@@ -2436,7 +2456,6 @@
			}

			@Override
			@Transactional(rollbackFor = Exception.class)
			public void shippingImport(MultipartFile file) {
			if (file == null \|\| file.isEmpty()) {
			throw new ServiceException("导入失败,导入文件数据不能为空");
			@@ -2454,105 +2473,246 @@
			}
			Map<String, List<SalesShippingImportDto>> groupedByOrderNo = list.stream().filter(Objects::nonNull).collect(Collectors.groupingBy(SalesShippingImportDto::getOrderNo, LinkedHashMap::new, Collectors.toList()));

			for (Map.Entry<String, List<SalesShippingImportDto>> entry : groupedByOrderNo.entrySet()) {
			String orderNo = entry.getKey();
			if (!StringUtils.hasText(orderNo)) {
			throw new ServiceException("导入失败,存在订单编号为空的数据");
			}
			List<SalesShippingImportDto> rowList = entry.getValue();
			if (CollectionUtils.isEmpty(rowList)) {
			continue;
			}
			SalesLedger ledger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>().eq(SalesLedger::getSalesContractNo, orderNo).last("LIMIT 1"));
			if (ledger == null) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]不存在,无法补录已发货数据");
			}
			List<SalesLedgerProduct> dbProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId()).eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
			if (CollectionUtils.isEmpty(dbProducts)) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]没有销售产品,无法补录发货");
			}
			Map<String, List<SalesLedgerProduct>> productByCategory = dbProducts.stream().collect(Collectors.groupingBy(p -> StringUtils.hasText(p.getProductCategory()) ? p.getProductCategory().trim() : ""));
			Set<String> importedRowKeys = new HashSet<>();
			// final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
			// List<String> errorMessages = Collections.synchronizedList(new ArrayList<>());
			groupedByOrderNo.forEach((orderNo, rowList) -> {
			// SecurityContext originalContext = SecurityContextHolder.getContext();
			// SecurityContext ctx = SecurityContextHolder.createEmptyContext();
			// ctx.setAuthentication(authentication);
			// SecurityContextHolder.setContext(ctx);
			try {
			if (!StringUtils.hasText(orderNo)) {
			throw new ServiceException("导入失败,存在订单编号为空的数据");
			}
			if (CollectionUtils.isEmpty(rowList)) {
			return;
			}
			if (StringUtils.hasText(rowList.get(0).getCustomerName()) && rowList.get(0).getCustomerName().startsWith("补片")) {
			return;
			}
			rowList.sort(Comparator.comparing(r -> buildCategoryProductName(r) + "\|\|" + buildSpecificationModel(r)));
			SalesLedger ledger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>().eq(SalesLedger::getSalesContractNo, orderNo).last("LIMIT 1"));
			if (ledger == null) {
			// throw new ServiceException("导入失败,订单编号[" + orderNo + "]不存在,无法补录已发货数据");
			return;
			}
			List<SalesLedgerProduct> dbProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId()).eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
			if (CollectionUtils.isEmpty(dbProducts)) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]没有销售产品,无法补录发货");
			}
			dbProducts.sort(Comparator.comparing(SalesLedgerProduct::getProductModelId, Comparator.nullsLast(Comparator.naturalOrder())));
			Map<String, List<SalesLedgerProduct>> productByCategory = dbProducts.stream().collect(Collectors.groupingBy(p -> StringUtils.hasText(p.getProductCategory()) ? p.getProductCategory().trim() : ""));
			Set<String> importedRowKeys = new HashSet<>();

			for (SalesShippingImportDto row : rowList) {
			BigDecimal shipQty = defaultDecimal(row.getQuantity());
			if (shipQty.compareTo(BigDecimal.ZERO) <= 0) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在数量小于等于0的数据");
			}
			String rowKey = buildShippingRowKey(ledger.getId(), row);
			if (!importedRowKeys.add(rowKey)) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在重复发货明细行");
			}
			Map<SalesLedgerProduct, BigDecimal> allocations = allocateShippingProductLines(orderNo, row, productByCategory, dbProducts);
			for (Map.Entry<SalesLedgerProduct, BigDecimal> alloc : allocations.entrySet()) {
			SalesLedgerProduct dbProduct = alloc.getKey();
			BigDecimal allocQty = alloc.getValue();
			if (dbProduct.getProductModelId() == null) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]产品规格未维护,无法补录出库");
			for (SalesShippingImportDto row : rowList) {
			BigDecimal shipQty = defaultDecimal(row.getQuantity());
			if (shipQty.compareTo(BigDecimal.ZERO) <= 0) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在数量小于等于0的数据");
			}
			// 历史已发货补录：直接写入入库+出库记录
			stockUtils.addStock(
			ledger.getId(),
			dbProduct.getId(),
			dbProduct.getProductModelId(),
			allocQty,
			StockInQualifiedRecordTypeEnum.SALE_STOCK_IN.getCode(),
			dbProduct.getId()
			);
			stockUtils.substractStock(
			ledger.getId(),
			dbProduct.getId(),
			dbProduct.getProductModelId(),
			allocQty,
			StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(),
			dbProduct.getId()
			);
			BigDecimal oldShipped = defaultDecimal(dbProduct.getShippedQuantity());
			BigDecimal newShipped = oldShipped.add(allocQty);
			dbProduct.setStockedQuantity(defaultDecimal(dbProduct.getQuantity()));
			dbProduct.setShippedQuantity(newShipped);
			dbProduct.setApproveStatus(3);
			updateProductStockStatus(dbProduct);
			dbProduct.fillRemainingQuantity();
			updateProductShipStatus(dbProduct);
			salesLedgerProductMapper.updateById(dbProduct);

			ShippingInfo shippingInfo = new ShippingInfo();
			shippingInfo.setSalesLedgerId(ledger.getId());
			shippingInfo.setSalesLedgerProductId(dbProduct.getId());
			shippingInfo.setStatus("已发货");
			shippingInfo.setShippingNo(row.getShippingNo());
			shippingInfo.setType("货车");
			shippingInfo.setShippingCarNumber("无");
			shippingInfo.setShippingDate(row.getReportDate());
			long existedShippingCount = shippingInfoMapper.selectCount(new LambdaQueryWrapper<ShippingInfo>().eq(ShippingInfo::getSalesLedgerId, ledger.getId()).eq(ShippingInfo::getSalesLedgerProductId, dbProduct.getId()).eq(StringUtils.hasText(row.getShippingNo()), ShippingInfo::getShippingNo, row.getShippingNo()).eq(row.getReportDate() != null, ShippingInfo::getShippingDate, row.getReportDate()));
			if (existedShippingCount > 0) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在重复发货记录,请勿重复导入");
			String rowKey = buildShippingRowKey(ledger.getId(), row);
			if (!importedRowKeys.add(rowKey)) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在重复发货明细行");
			}
			shippingInfoMapper.insert(shippingInfo);
			createShippingQualityInspect(ledger, dbProduct, row, allocQty);
			}
			}
			Map<SalesLedgerProduct, BigDecimal> allocations = allocateShippingProductLines(orderNo, row, productByCategory, dbProducts);
			for (Map.Entry<SalesLedgerProduct, BigDecimal> alloc : allocations.entrySet()) {
			SalesLedgerProduct dbProduct = alloc.getKey();
			BigDecimal allocQty = alloc.getValue();
			if (dbProduct.getProductModelId() == null) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]产品规格未维护,无法补录出库");
			}
			Long inspectId = createShippingQualityInspect(ledger, dbProduct, row, allocQty);
			// 历史已发货补录：直接写入入库+出库记录
			stockUtils.addStock(
			ledger.getId(),
			dbProduct.getId(),
			dbProduct.getProductModelId(),
			allocQty,
			StockInQualifiedRecordTypeEnum.SALE_QC_OK_IN.getCode(),
			inspectId != null ? inspectId : dbProduct.getId()
			);
			stockUtils.substractStock(
			ledger.getId(),
			dbProduct.getId(),
			dbProduct.getProductModelId(),
			allocQty,
			StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(),
			dbProduct.getId()
			);

			List<SalesLedgerProduct> latestProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId()).eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
			boolean allShipped = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().allMatch(p -> {
			BigDecimal qty = defaultDecimal(p.getQuantity());
			BigDecimal shipped = defaultDecimal(p.getShippedQuantity());
			return shipped.compareTo(qty) >= 0;
			});
			boolean anyInbound = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().anyMatch(p -> defaultDecimal(p.getStockedQuantity()).compareTo(BigDecimal.ZERO) > 0);
			boolean allInbound = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().allMatch(p -> {
			BigDecimal qty = defaultDecimal(p.getQuantity());
			BigDecimal stocked = defaultDecimal(p.getStockedQuantity());
			return qty.compareTo(BigDecimal.ZERO) <= 0 \|\| stocked.compareTo(qty) >= 0;
			});
			if (allShipped && rowList.get(0).getReportDate() != null) {
			ledger.setDeliveryDate(DateUtils.toLocalDate(rowList.get(0).getReportDate()));
			}
			ledger.setStockStatus(allInbound ? 2 : (anyInbound ? 1 : 0));
			ledger.setDeliveryStatus(allShipped ? 5 : 1);
			salesLedgerMapper.updateById(ledger);
			}
			StockInRecord inRecord = stockInRecordMapper.selectOne(new LambdaQueryWrapper<StockInRecord>()
			.eq(StockInRecord::getSalesLedgerProductId, dbProduct.getId())
			.orderByDesc(StockInRecord::getId).last("LIMIT 1"));
			if (inRecord != null) {
			String batch = "RK";
			if (row.getReportDate() != null) {
			String dateStr = new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(row.getReportDate());
			batch += dateStr + "-" + row.getReportDate().getTime();
			} else {
			batch += System.currentTimeMillis() + "-" + inRecord.getId();
			}
			inRecord.setInboundBatches(batch);
			if (row.getReportDate() != null) {
			LocalDateTime reportDateTime = LocalDateTime.ofInstant(row.getReportDate().toInstant(), ZoneId.systemDefault());
			inRecord.setCreateTime(reportDateTime);
			inRecord.setUpdateTime(reportDateTime);
			}
			stockInRecordMapper.updateById(inRecord);
			}

			StockOutRecord outRecord = stockOutRecordMapper.selectOne(new LambdaQueryWrapper<StockOutRecord>()
			.eq(StockOutRecord::getSalesLedgerProductId, dbProduct.getId())
			.orderByDesc(StockOutRecord::getId).last("LIMIT 1"));
			if (outRecord != null) {
			String batch = "CK";
			if (row.getReportDate() != null) {
			String dateStr = new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(row.getReportDate());
			batch += dateStr + "-" + row.getReportDate().getTime();
			} else {
			batch += System.currentTimeMillis() + "-" + outRecord.getId();
			}
			outRecord.setOutboundBatches(batch);
			if (row.getReportDate() != null) {
			LocalDateTime reportDateTime = LocalDateTime.ofInstant(row.getReportDate().toInstant(), ZoneId.systemDefault());
			outRecord.setCreateTime(reportDateTime);
			outRecord.setUpdateTime(reportDateTime);
			}
			stockOutRecordMapper.updateById(outRecord);
			}

			BigDecimal oldShipped = defaultDecimal(dbProduct.getShippedQuantity());
			BigDecimal newShipped = oldShipped.add(allocQty);
			dbProduct.setStockedQuantity(defaultDecimal(dbProduct.getQuantity()));
			dbProduct.setShippedQuantity(newShipped);
			dbProduct.setApproveStatus(3);
			updateProductStockStatus(dbProduct);
			dbProduct.fillRemainingQuantity();
			updateProductShipStatus(dbProduct);
			salesLedgerProductMapper.updateById(dbProduct);

			ShippingInfo shippingInfo = new ShippingInfo();
			shippingInfo.setSalesLedgerId(ledger.getId());
			shippingInfo.setSalesLedgerProductId(dbProduct.getId());
			shippingInfo.setStatus("已发货");
			shippingInfo.setShippingNo(row.getShippingNo());
			shippingInfo.setType("货车");
			shippingInfo.setShippingCarNumber("无");
			shippingInfo.setShippingDate(row.getReportDate());
			long existedShippingCount = shippingInfoMapper.selectCount(new LambdaQueryWrapper<ShippingInfo>()
			.eq(ShippingInfo::getSalesLedgerId, ledger.getId())
			.eq(ShippingInfo::getSalesLedgerProductId, dbProduct.getId())
			.eq(StringUtils.hasText(row.getShippingNo()), ShippingInfo::getShippingNo, row.getShippingNo())
			.eq(row.getReportDate() != null, ShippingInfo::getShippingDate, row.getReportDate()));
			if (existedShippingCount > 0) {
			// continue;
			List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
			.eq(ShippingInfo::getSalesLedgerId, ledger.getId())
			.eq(ShippingInfo::getSalesLedgerProductId, dbProduct.getId())
			.eq(StringUtils.hasText(row.getShippingNo()), ShippingInfo::getShippingNo, row.getShippingNo())
			.eq(row.getReportDate() != null, ShippingInfo::getShippingDate, row.getReportDate()));
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在重复发货记录,请勿重复导入");
			}
			shippingInfoMapper.insert(shippingInfo);
			// createShippingQualityInspect moved up
			}
			}

			List<SalesLedgerProduct> latestProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId()).eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
			boolean allShipped = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().allMatch(p -> {
			BigDecimal qty = defaultDecimal(p.getQuantity());
			BigDecimal shipped = defaultDecimal(p.getShippedQuantity());
			return shipped.compareTo(qty) >= 0;
			});
			boolean anyInbound = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().anyMatch(p -> defaultDecimal(p.getStockedQuantity()).compareTo(BigDecimal.ZERO) > 0);
			boolean allInbound = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().allMatch(p -> {
			BigDecimal qty = defaultDecimal(p.getQuantity());
			BigDecimal stocked = defaultDecimal(p.getStockedQuantity());
			return qty.compareTo(BigDecimal.ZERO) <= 0 \|\| stocked.compareTo(qty) >= 0;
			});
			if (allShipped && rowList.get(0).getReportDate() != null) {
			ledger.setDeliveryDate(DateUtils.toLocalDate(rowList.get(0).getReportDate()));
			}
			ledger.setStockStatus(allInbound ? 2 : (anyInbound ? 1 : 0));
			ledger.setDeliveryStatus(allShipped ? 5 : 1);
			// ledger.setReviewStatus(1);

			Long entryUserId = StringUtils.hasText(ledger.getEntryPerson()) ? Long.parseLong(ledger.getEntryPerson()) : 1L;
			Long entryDeptId = 1L;
			if (StringUtils.hasText(ledger.getEntryPerson())) {
			try {
			SysUser entryUser = sysUserMapper.selectById(ledger.getEntryPerson());
			if (entryUser != null && entryUser.getDeptId() != null) {
			entryDeptId = entryUser.getDeptId();
			}
			} catch (Exception ignored) {
			}
			}
			String reportDateStr = rowList.get(0).getReportDate() != null ? new java.text.SimpleDateFormat("yyyy-MM-dd").format(rowList.get(0).getReportDate()) : java.time.LocalDate.now().toString();

			try {
			String productIds = latestProducts.stream().map(p -> String.valueOf(p.getId())).collect(Collectors.joining(","));
			String inboundApproveUserIds = resolveApproveUserIds(null, ledger.getId(), INBOUND_BIZ_TYPE_WEB);
			if (StringUtils.isEmpty(inboundApproveUserIds)) {
			inboundApproveUserIds = "1";
			}

			ApproveProcessVO stockInVo = new ApproveProcessVO();
			stockInVo.setApproveType(ApproveTypeEnum.STOCK_IN.getCode());
			stockInVo.setApproveDeptId(208L);
			stockInVo.setApproveReason("入库审批:" + ledger.getSalesContractNo());
			stockInVo.setApproveRemark("salesStock:" + ledger.getId() + ":" + productIds);
			stockInVo.setApproveUserIds(inboundApproveUserIds);
			stockInVo.setApproveUser(entryUserId);
			stockInVo.setApproveTime(reportDateStr);
			approveProcessService.addApprove(stockInVo);

			ApproveProcess savedStockIn = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
			.eq(ApproveProcess::getApproveReason, stockInVo.getApproveReason())
			.eq(ApproveProcess::getApproveType, stockInVo.getApproveType())
			.orderByDesc(ApproveProcess::getId).last("LIMIT 1"));
			if (savedStockIn != null) {
			savedStockIn.setApproveStatus(2);
			savedStockIn.setApproveOverTime(rowList.get(0).getReportDate());
			approveProcessService.updateById(savedStockIn);
			}
			} catch (Exception e) {
			log.error("自动生成入库审批申请失败", e);
			throw new ServiceException("生成入库申请审批失败:{}" + e.getMessage());
			}

			try {
			ApproveProcessVO deliveryVo = new ApproveProcessVO();
			deliveryVo.setApproveType(ApproveTypeEnum.DELIVERY.getCode());
			deliveryVo.setApproveDeptId(208L);
			deliveryVo.setApproveReason("发货审批:" + ledger.getSalesContractNo());
			deliveryVo.setApproveUserIds("1");
			deliveryVo.setApproveUser(entryUserId);
			deliveryVo.setApproveTime(reportDateStr);
			approveProcessService.addApprove(deliveryVo);

			ApproveProcess savedDelivery = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
			.eq(ApproveProcess::getApproveReason, deliveryVo.getApproveReason())
			.eq(ApproveProcess::getApproveType, deliveryVo.getApproveType())
			.orderByDesc(ApproveProcess::getId).last("LIMIT 1"));
			if (savedDelivery != null) {
			savedDelivery.setApproveStatus(2);
			savedDelivery.setApproveOverTime(rowList.get(0).getReportDate());
			approveProcessService.updateById(savedDelivery);
			}
			} catch (Exception e) {
			log.error("自动生成发货审批申请失败", e);
			throw new ServiceException("生成发货申请审批失败:{}" + e.getMessage());
			}

			salesLedgerMapper.updateById(ledger);
			} catch (Exception e) {
			log.error("订单 {} 已发货记录导入失败", orderNo, e);
			// errorMessages.add("订单 [" + orderNo + "] 导入失败: " + e.getMessage());
			}
			// SecurityContextHolder.setContext(originalContext);
			});
			// if (!errorMessages.isEmpty()) {
			// throw new ServiceException("部分数据导入失败:\n" + String.join("\n", errorMessages));
			// }
			}

			@Override
			@@ -2573,10 +2733,10 @@
			throw new ServiceException("导入失败,文件数据为空");
			}
			List<SysUser> allUsers = sysUserMapper.selectList(null);
			Map<String, SysUser> userByNickNameMap = allUsers.stream().filter(Objects::nonNull).filter(u -> StringUtils.hasText(u.getNickName())).collect(Collectors.toMap(SysUser::getNickName, Function.identity(), (a, b) -> a));
			Map<String, SysUser> userByUserNameMap = allUsers.stream().filter(Objects::nonNull).filter(u -> StringUtils.hasText(u.getUserName())).collect(Collectors.toMap(SysUser::getUserName, Function.identity(), (a, b) -> a));
			Map<String, SysUser> userByNickNameMap = new ConcurrentHashMap<>(allUsers.stream().filter(Objects::nonNull).filter(u -> StringUtils.hasText(u.getNickName())).collect(Collectors.toMap(SysUser::getNickName, Function.identity(), (a, b) -> a)));
			Map<String, SysUser> userByUserNameMap = new ConcurrentHashMap<>(allUsers.stream().filter(Objects::nonNull).filter(u -> StringUtils.hasText(u.getUserName())).collect(Collectors.toMap(SysUser::getUserName, Function.identity(), (a, b) -> a)));

			Map<String, Customer> customerNameMap = customerMapper.selectList(null).stream().filter(Objects::nonNull).filter(c -> StringUtils.hasText(c.getCustomerName())).collect(Collectors.toMap(Customer::getCustomerName, Function.identity(), (a, b) -> a));
			Map<String, Customer> customerNameMap = new ConcurrentHashMap<>(customerMapper.selectList(null).stream().filter(Objects::nonNull).filter(c -> StringUtils.hasText(c.getCustomerName())).collect(Collectors.toMap(Customer::getCustomerName, Function.identity(), (a, b) -> a)));
			List<CustomerRegions> allRegions = customerRegionsService.list();
			CustomerRegions hebiRegion = allRegions.stream().filter(Objects::nonNull).filter(r -> "鹤壁".equals(r.getRegionsName())).findFirst().orElseGet(() -> {
			CustomerRegions region = new CustomerRegions();
			@@ -2585,7 +2745,7 @@
			customerRegionsService.save(region);
			return region;
			});
			Map<String, Product> productNameMap = productMapper.selectList(null).stream().filter(Objects::nonNull).filter(p -> StringUtils.hasText(p.getProductName())).collect(Collectors.toMap(Product::getProductName, Function.identity(), (a, b) -> a));
			Map<String, Product> productNameMap = new ConcurrentHashMap<>(productMapper.selectList(null).stream().filter(Objects::nonNull).filter(p -> StringUtils.hasText(p.getProductName())).collect(Collectors.toMap(Product::getProductName, Function.identity(), (a, b) -> a)));
			Product finishedGoodsParent = productNameMap.get("成品");
			if (finishedGoodsParent == null \|\| finishedGoodsParent.getId() == null) {
			finishedGoodsParent = new Product();
			@@ -2594,120 +2754,317 @@
			productMapper.insert(finishedGoodsParent);
			productNameMap.put("成品", finishedGoodsParent);
			}
			Map<String, ProductModel> productModelKeyMap = productModelMapper.selectList(null).stream().filter(Objects::nonNull).filter(m -> m.getProductId() != null && StringUtils.hasText(m.getModel())).collect(Collectors.toMap(m -> buildProductModelKey(m.getProductId(), m.getModel()), Function.identity(), (a, b) -> a));
			Map<String, ProductModel> productModelKeyMap = new ConcurrentHashMap<>(productModelMapper.selectList(null).stream().filter(Objects::nonNull).filter(m -> m.getProductId() != null && StringUtils.hasText(m.getModel())).collect(Collectors.toMap(m -> buildProductModelKey(m.getProductId(), m.getModel()), Function.identity(), (a, b) -> a)));

			List<String> extraProcessNames = Arrays.asList("打孔", "挖缺", "安全角", "磨边");
			Map<String, SalesLedgerProductProcess> processMap = salesLedgerProductProcessService.list(new LambdaQueryWrapper<SalesLedgerProductProcess>().in(SalesLedgerProductProcess::getProcessName, extraProcessNames)).stream().filter(Objects::nonNull).filter(p -> StringUtils.hasText(p.getProcessName())).collect(Collectors.toMap(SalesLedgerProductProcess::getProcessName, Function.identity(), (a, b) -> a));
			List<String> extraProcessNames = Arrays.asList("打孔", "挖缺", "安全角", "磨边", "精磨边", "运费", "加急费");
			Map<String, SalesLedgerProductProcess> processMap = new ConcurrentHashMap<>(salesLedgerProductProcessService.list(new LambdaQueryWrapper<SalesLedgerProductProcess>().in(SalesLedgerProductProcess::getProcessName, extraProcessNames)).stream().filter(Objects::nonNull).filter(p -> StringUtils.hasText(p.getProcessName())).collect(Collectors.toMap(SalesLedgerProductProcess::getProcessName, Function.identity(), (a, b) -> a)));
			List<ProcessRoute> processRoutes = processRouteMapper.selectList(new LambdaQueryWrapper<ProcessRoute>().eq(ProcessRoute::getProductModelId, 0L));
			Map<String, ProcessRoute> routeNameMap = processRoutes.stream().filter(Objects::nonNull).filter(r -> StringUtils.hasText(r.getProcessRouteName())).collect(Collectors.toMap(r -> normalizeRouteFlowKey(r.getProcessRouteName()), Function.identity(), this::chooseBetterRoute));
			Map<Long, List<ProcessRouteItem>> routeItemMap = Collections.emptyMap();
			Map<String, ProcessRoute> routeNameMap = new ConcurrentHashMap<>(processRoutes.stream().filter(Objects::nonNull).filter(r -> StringUtils.hasText(r.getProcessRouteName())).collect(Collectors.toMap(r -> normalizeRouteFlowKey(r.getProcessRouteName()), Function.identity(), this::chooseBetterRoute)));
			Map<Long, List<ProcessRouteItem>> routeItemMap = new ConcurrentHashMap<>();
			List<Long> routeIds = processRoutes.stream().map(ProcessRoute::getId).filter(Objects::nonNull).collect(Collectors.toList());
			if (CollectionUtils.isNotEmpty(routeIds)) {
			routeItemMap = processRouteItemMapper.selectList(new LambdaQueryWrapper<ProcessRouteItem>().in(ProcessRouteItem::getRouteId, routeIds).orderByAsc(ProcessRouteItem::getDragSort).orderByAsc(ProcessRouteItem::getId)).stream().filter(Objects::nonNull).collect(Collectors.groupingBy(ProcessRouteItem::getRouteId));
			routeItemMap.putAll(processRouteItemMapper.selectList(new LambdaQueryWrapper<ProcessRouteItem>().in(ProcessRouteItem::getRouteId, routeIds).orderByAsc(ProcessRouteItem::getDragSort).orderByAsc(ProcessRouteItem::getId)).stream().filter(Objects::nonNull).collect(Collectors.groupingBy(ProcessRouteItem::getRouteId)));
			}

			final Map<Long, List<ProcessRouteItem>> finalRouteItemMap = routeItemMap;
			final Product finalFinishedGoodsParent = finishedGoodsParent;

			Map<String, List<SalesNotShippingImportDto>> groupedByOrderNo = list.stream().filter(Objects::nonNull).collect(Collectors.groupingBy(SalesNotShippingImportDto::getOrderNo, LinkedHashMap::new, Collectors.toList()));

			for (Map.Entry<String, List<SalesNotShippingImportDto>> entry : groupedByOrderNo.entrySet()) {
			String orderNo = entry.getKey();
			if (!StringUtils.hasText(orderNo)) {
			throw new ServiceException("导入失败,存在订单编号为空的数据");
			}
			List<SalesNotShippingImportDto> rowList = entry.getValue();
			if (CollectionUtils.isEmpty(rowList)) {
			continue;
			}
			SalesNotShippingImportDto first = rowList.get(0);
			SalesLedger exists = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>().eq(SalesLedger::getSalesContractNo, orderNo).last("LIMIT 1"));
			if (exists != null) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]已存在");
			}

			SalesLedger ledger = new SalesLedger();
			SysUser creatorUser = resolveImportUser(first.getCreator(), userByNickNameMap, userByUserNameMap, "制单员", orderNo);
			ledger.setSalesContractNo(orderNo);
			ledger.setCustomerContractNo(first.getContractNo());
			ledger.setProjectName(first.getProjectName());
			ledger.setSalesman(first.getSalesman());
			Customer customer = getOrCreateImportCustomer(first.getCustomerName(), customerNameMap, hebiRegion.getId());
			ledger.setCustomerName(customer.getCustomerName());
			ledger.setRemarks(first.getRemark());
			ledger.setEntryPerson(String.valueOf(creatorUser.getUserId()));
			ledger.setEntryDate(first.getReportDate());
			if (first.getReportDate() != null) {
			ledger.setExecutionDate(DateUtils.toLocalDate(first.getReportDate()));
			}
			ledger.setDeliveryDate(first.getDeliveryDeadline() == null ? (first.getReportDate() == null ? LocalDate.now().plusDays(7) : DateUtils.toLocalDate(first.getReportDate()).plusDays(7)) : DateUtils.toLocalDate(first.getDeliveryDeadline()));
			ledger.setDeliveryStatus(1);
			ledger.setStockStatus(0);

			ledger.setCustomerId(customer.getId());
			ledger.setCustomerContractNo(StringUtils.hasText(ledger.getCustomerContractNo()) ? ledger.getCustomerContractNo() : customer.getTaxpayerIdentificationNumber());

			ledger.setContractAmount(BigDecimal.ZERO);
			salesLedgerMapper.insert(ledger);
			bindImportProcessRoute(ledger.getId(), rowList, routeNameMap, routeItemMap);

			BigDecimal contractAmount = BigDecimal.ZERO;
			for (SalesNotShippingImportDto row : rowList) {
			SalesLedgerProduct product = new SalesLedgerProduct();
			product.setSalesLedgerId(ledger.getId());
			product.setType(SaleEnum.SALE.getCode());
			String specificationModel = buildSpecificationModel(row);
			Product importProduct = resolveOrCreateImportProduct(row, productNameMap, finishedGoodsParent, orderNo);
			ProductModel importProductModel = resolveOrCreateImportProductModel(importProduct, specificationModel, row.getGlassThickness(), productModelKeyMap);
			product.setProductCategory(row.getProductSubCategory());
			product.setSpecificationModel(specificationModel);
			product.setProductId(importProduct.getId());
			product.setProductModelId(importProductModel.getId());
			product.setFloorCode(row.getFloorNo());
			product.setWidth(defaultDecimal(row.getWidth()));
			product.setHeight(defaultDecimal(row.getHeight()));
			product.setQuantity(defaultDecimal(row.getQuantity()));
			product.setActualPieceArea(defaultDecimal(row.getActualSingleArea()));
			product.setActualTotalArea(defaultDecimal(row.getActualTotalArea()));
			product.setSettlePieceArea(defaultDecimal(row.getSettlementSingleArea()));
			product.setSettleTotalArea(defaultDecimal(row.getSettlementTotalArea()));
			product.setTaxInclusiveUnitPrice(defaultDecimal(row.getUnitPrice()));
			product.setPerimeter(defaultDecimal(row.getPerimeter()));
			product.setHeavyBox(defaultDecimal(row.getHeavyBox()));
			product.setProcessRequirement(row.getProcessRequirement());
			product.setRemark(StringUtils.hasText(row.getAuditRemark()) ? row.getAuditRemark() : row.getRemark());
			product.setApproveStatus(0);
			product.setProductStockStatus(0);
			product.setRegister(creatorUser.getNickName());
			product.setRegisterDate(row.getReportDate() == null ? LocalDateTime.now() : LocalDateTime.ofInstant(row.getReportDate().toInstant(), ZoneId.systemDefault()));

			BigDecimal qty = defaultDecimal(product.getQuantity());
			if (qty.compareTo(BigDecimal.ZERO) <= 0) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在数量小于等于0的数据");
			// final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
			// List<String> errorMessages = Collections.synchronizedList(new ArrayList<>());
			groupedByOrderNo.forEach((orderNo, rowList) -> {
			// SecurityContext originalContext = SecurityContextHolder.getContext();
			// SecurityContext ctx = SecurityContextHolder.createEmptyContext();
			// ctx.setAuthentication(authentication);
			// SecurityContextHolder.setContext(ctx);
			try {
			if (!StringUtils.hasText(orderNo)) {
			throw new ServiceException("导入失败,存在订单编号为空的数据");
			}

			BigDecimal lineAmount = defaultDecimal(row.getGlassAmount()).add(defaultDecimal(row.getOtherProcessFee()));
			if (lineAmount.compareTo(BigDecimal.ZERO) <= 0 && product.getTaxInclusiveUnitPrice().compareTo(BigDecimal.ZERO) > 0 && product.getSettleTotalArea().compareTo(BigDecimal.ZERO) > 0) {
			lineAmount = product.getTaxInclusiveUnitPrice().multiply(product.getSettleTotalArea()).setScale(2, RoundingMode.HALF_UP);
			if (CollectionUtils.isEmpty(rowList)) {
			return;
			}
			product.setTaxRate(BigDecimal.ZERO);
			product.setTaxInclusiveTotalPrice(lineAmount);
			product.setTaxExclusiveTotalPrice(lineAmount);
			product.setNoInvoiceNum(qty);
			product.setNoInvoiceAmount(lineAmount);
			product.setPendingInvoiceTotal(lineAmount);
			product.fillRemainingQuantity();
			salesLedgerProductMapper.insert(product);
			rowList.sort(Comparator.comparing(r -> buildCategoryProductName(r) + "\|\|" + buildSpecificationModel(r)));
			SalesNotShippingImportDto first = rowList.get(0);
			SalesLedger exists = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>().eq(SalesLedger::getSalesContractNo, orderNo).last("LIMIT 1"));
			if (exists != null) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]已存在");
			}

			List<SalesLedgerProductProcess> bindProcessList = buildImportProcessBinds(row, processMap);
			if (CollectionUtils.isNotEmpty(bindProcessList)) {
			salesLedgerProductProcessBindService.updateProductProcessBind(bindProcessList, product.getId());
			SalesLedger ledger = new SalesLedger();
			SysUser creatorUser = resolveImportUser(first.getCreator(), userByNickNameMap, userByUserNameMap, "制单员", orderNo);
			ledger.setSalesContractNo(orderNo);
			ledger.setCustomerContractNo(first.getContractNo());
			ledger.setProjectName(first.getProjectName());
			ledger.setSalesman(first.getSalesman());
			Customer customer = getOrCreateImportCustomer(first.getCustomerName(), customerNameMap, hebiRegion.getId());
			ledger.setCustomerName(customer.getCustomerName());
			ledger.setRemarks(first.getRemark());
			ledger.setEntryPerson(String.valueOf(creatorUser.getUserId()));
			ledger.setEntryDate(first.getReportDate());
			if (first.getReportDate() != null) {
			ledger.setExecutionDate(DateUtils.toLocalDate(first.getReportDate()));
			}
			ledger.setDeliveryDate(first.getDeliveryDeadline() == null ? (first.getReportDate() == null ? LocalDate.now().plusDays(7) : DateUtils.toLocalDate(first.getReportDate()).plusDays(7)) : DateUtils.toLocalDate(first.getDeliveryDeadline()));
			ledger.setDeliveryStatus(1);
			ledger.setStockStatus(0);
			ledger.setReviewStatus(0);

			ledger.setCustomerId(customer.getId());
			ledger.setCustomerContractNo(StringUtils.hasText(ledger.getCustomerContractNo()) ? ledger.getCustomerContractNo() : customer.getTaxpayerIdentificationNumber());

			ledger.setContractAmount(BigDecimal.ZERO);
			salesLedgerMapper.insert(ledger);
			bindImportProcessRoute(ledger.getId(), rowList, routeNameMap, finalRouteItemMap);
			int reviewCount = 0;

			BigDecimal contractAmount = BigDecimal.ZERO;
			for (SalesNotShippingImportDto row : rowList) {
			SalesLedgerProduct product = new SalesLedgerProduct();
			product.setSalesLedgerId(ledger.getId());
			product.setType(SaleEnum.SALE.getCode());
			String specificationModel = buildSpecificationModel(row);
			Product importProduct = resolveOrCreateImportProduct(row, productNameMap, finalFinishedGoodsParent, orderNo);
			ProductModel importProductModel = resolveOrCreateImportProductModel(importProduct, specificationModel, row.getGlassThickness(), productModelKeyMap);
			product.setProductCategory(row.getProductSubCategory());
			product.setSpecificationModel(specificationModel);
			product.setProductId(importProduct.getId());
			product.setProductModelId(importProductModel.getId());
			product.setFloorCode(row.getFloorNo());
			product.setWidth(defaultDecimal(row.getWidth()));
			product.setHeight(defaultDecimal(row.getHeight()));
			product.setQuantity(defaultDecimal(row.getQuantity()));
			product.setActualPieceArea(defaultDecimal(row.getActualSingleArea()));
			product.setActualTotalArea(defaultDecimal(row.getActualTotalArea()));
			product.setSettlePieceArea(defaultDecimal(row.getSettlementSingleArea()));
			product.setSettleTotalArea(defaultDecimal(row.getSettlementTotalArea()));
			product.setTaxInclusiveUnitPrice(defaultDecimal(row.getUnitPrice()));
			product.setPerimeter(defaultDecimal(row.getPerimeter()));
			product.setHeavyBox(defaultDecimal(row.getHeavyBox()));
			product.setProcessRequirement(row.getProcessRequirement());
			product.setRemark(StringUtils.hasText(row.getAuditRemark()) ? row.getAuditRemark() : row.getRemark());
			product.setApproveStatus(0);
			product.setProductStockStatus(0);
			product.setRegister(creatorUser.getNickName());
			product.setRegisterDate(row.getReportDate() == null ? LocalDateTime.now() : LocalDateTime.ofInstant(row.getReportDate().toInstant(), ZoneId.systemDefault()));

			BigDecimal qty = defaultDecimal(product.getQuantity());
			if (qty.compareTo(BigDecimal.ZERO) <= 0) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在数量小于等于0的数据");
			}

			BigDecimal lineAmount = defaultDecimal(row.getGlassAmount()).add(defaultDecimal(row.getOtherProcessFee()));
			if (lineAmount.compareTo(BigDecimal.ZERO) <= 0 && product.getTaxInclusiveUnitPrice().compareTo(BigDecimal.ZERO) > 0 && product.getSettleTotalArea().compareTo(BigDecimal.ZERO) > 0) {
			lineAmount = product.getTaxInclusiveUnitPrice().multiply(product.getSettleTotalArea()).setScale(2, RoundingMode.HALF_UP);
			}
			product.setTaxRate(BigDecimal.ZERO);
			product.setTaxInclusiveTotalPrice(lineAmount);
			product.setTaxExclusiveTotalPrice(lineAmount);
			product.setNoInvoiceNum(qty);
			product.setNoInvoiceAmount(lineAmount);
			product.setPendingInvoiceTotal(lineAmount);
			product.fillRemainingQuantity();
			salesLedgerProductMapper.insert(product);
			if (StringUtils.isNotEmpty(row.getAuditor())) {
			reviewCount++;
			}

			List<SalesLedgerProductProcess> bindProcessList = buildImportProcessBinds(row, processMap);
			if (CollectionUtils.isNotEmpty(bindProcessList)) {
			salesLedgerProductProcessBindService.updateProductProcessBind(bindProcessList, product.getId());
			}

			// 本项目无生产模块，无需向 ProductOrder 表中新增数据
			// salesLedgerProductServiceImpl.addProductionData(product);
			contractAmount = contractAmount.add(lineAmount);

			if (customer.getCustomerName() != null && customer.getCustomerName().startsWith("补片")) {
			Long inspectId = createNotShippingQualityInspect(ledger, product, row, qty);
			stockUtils.addStock(
			ledger.getId(),
			product.getId(),
			product.getProductModelId(),
			qty,
			StockInQualifiedRecordTypeEnum.SALE_QC_OK_IN.getCode(),
			inspectId != null ? inspectId : product.getId()
			);
			stockUtils.substractStock(
			ledger.getId(),
			product.getId(),
			product.getProductModelId(),
			qty,
			StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(),
			product.getId()
			);

			StockInRecord inRecord = stockInRecordMapper.selectOne(new LambdaQueryWrapper<StockInRecord>()
			.eq(StockInRecord::getSalesLedgerProductId, product.getId())
			.orderByDesc(StockInRecord::getId).last("LIMIT 1"));
			if (inRecord != null) {
			String batch = "RK";
			if (row.getReportDate() != null) {
			String dateStr = new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(row.getReportDate());
			batch += dateStr + "-" + row.getReportDate().getTime();
			} else {
			batch += System.currentTimeMillis() + "-" + inRecord.getId();
			}
			inRecord.setInboundBatches(batch);
			if (row.getReportDate() != null) {
			LocalDateTime reportDateTime = LocalDateTime.ofInstant(row.getReportDate().toInstant(), ZoneId.systemDefault());
			inRecord.setCreateTime(reportDateTime);
			inRecord.setUpdateTime(reportDateTime);
			}
			stockInRecordMapper.updateById(inRecord);
			}

			StockOutRecord outRecord = stockOutRecordMapper.selectOne(new LambdaQueryWrapper<StockOutRecord>()
			.eq(StockOutRecord::getSalesLedgerProductId, product.getId())
			.orderByDesc(StockOutRecord::getId).last("LIMIT 1"));
			if (outRecord != null) {
			String batch = "CK";
			if (row.getReportDate() != null) {
			String dateStr = new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(row.getReportDate());
			batch += dateStr + "-" + row.getReportDate().getTime();
			} else {
			batch += System.currentTimeMillis() + "-" + outRecord.getId();
			}
			outRecord.setOutboundBatches(batch);
			if (row.getReportDate() != null) {
			LocalDateTime reportDateTime = LocalDateTime.ofInstant(row.getReportDate().toInstant(), ZoneId.systemDefault());
			outRecord.setCreateTime(reportDateTime);
			outRecord.setUpdateTime(reportDateTime);
			}
			stockOutRecordMapper.updateById(outRecord);
			}

			product.setStockedQuantity(qty);
			product.setShippedQuantity(qty);
			product.setApproveStatus(3);
			updateProductStockStatus(product);
			product.fillRemainingQuantity();
			updateProductShipStatus(product);
			salesLedgerProductMapper.updateById(product);

			ShippingInfo shippingInfo = new ShippingInfo();
			shippingInfo.setSalesLedgerId(ledger.getId());
			shippingInfo.setSalesLedgerProductId(product.getId());
			shippingInfo.setStatus("已发货");
			if (row.getReportDate() != null) {
			String dateStr = new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(row.getReportDate());
			shippingInfo.setShippingNo("CK" + dateStr + "-" + row.getReportDate().getTime());
			} else {
			shippingInfo.setShippingNo("CK" + System.currentTimeMillis());
			}
			shippingInfo.setType("货车");
			shippingInfo.setShippingCarNumber("无");
			shippingInfo.setShippingDate(row.getReportDate());
			shippingInfoMapper.insert(shippingInfo);
			// createNotShippingQualityInspect moved up
			}
			}

			ledger.setContractAmount(contractAmount);
			if (reviewCount == rowList.size()) {
			ledger.setReviewStatus(1);
			}

			if (customer.getCustomerName() != null && customer.getCustomerName().startsWith("补片")) {
			List<SalesLedgerProduct> latestProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId()).eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
			boolean allShipped = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().allMatch(p -> {
			BigDecimal pQty = defaultDecimal(p.getQuantity());
			BigDecimal shipped = defaultDecimal(p.getShippedQuantity());
			return shipped.compareTo(pQty) >= 0;
			});
			boolean anyInbound = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().anyMatch(p -> defaultDecimal(p.getStockedQuantity()).compareTo(BigDecimal.ZERO) > 0);
			boolean allInbound = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().allMatch(p -> {
			BigDecimal pQty = defaultDecimal(p.getQuantity());
			BigDecimal stocked = defaultDecimal(p.getStockedQuantity());
			return pQty.compareTo(BigDecimal.ZERO) <= 0 \|\| stocked.compareTo(pQty) >= 0;
			});
			if (allShipped && rowList.get(0).getReportDate() != null) {
			ledger.setDeliveryDate(DateUtils.toLocalDate(rowList.get(0).getReportDate()));
			}
			ledger.setStockStatus(allInbound ? 2 : (anyInbound ? 1 : 0));
			ledger.setDeliveryStatus(allShipped ? 5 : 1);

			Long entryUserId = StringUtils.hasText(ledger.getEntryPerson()) ? Long.parseLong(ledger.getEntryPerson()) : 1L;
			Long entryDeptId = 1L;
			if (StringUtils.hasText(ledger.getEntryPerson())) {
			try {
			SysUser entryUser = sysUserMapper.selectById(ledger.getEntryPerson());
			if (entryUser != null && entryUser.getDeptId() != null) {
			entryDeptId = entryUser.getDeptId();
			}
			} catch (Exception ignored) {
			}
			}
			String reportDateStr = rowList.get(0).getReportDate() != null ? new java.text.SimpleDateFormat("yyyy-MM-dd").format(rowList.get(0).getReportDate()) : LocalDate.now().toString();

			try {
			String productIds = latestProducts.stream().map(p -> String.valueOf(p.getId())).collect(Collectors.joining(","));
			String inboundApproveUserIds = resolveApproveUserIds(null, ledger.getId(), INBOUND_BIZ_TYPE_WEB);
			if (StringUtils.isEmpty(inboundApproveUserIds)) {
			inboundApproveUserIds = "1";
			}

			ApproveProcessVO stockInVo = new ApproveProcessVO();
			stockInVo.setApproveType(ApproveTypeEnum.STOCK_IN.getCode());
			stockInVo.setApproveDeptId(208L);
			stockInVo.setApproveReason("入库审批:" + ledger.getSalesContractNo());
			stockInVo.setApproveRemark("salesStock:" + ledger.getId() + ":" + productIds);
			stockInVo.setApproveUserIds(inboundApproveUserIds);
			stockInVo.setApproveUser(entryUserId);
			stockInVo.setApproveTime(reportDateStr);
			approveProcessService.addApprove(stockInVo);

			ApproveProcess savedStockIn = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
			.eq(ApproveProcess::getApproveReason, stockInVo.getApproveReason())
			.eq(ApproveProcess::getApproveType, stockInVo.getApproveType())
			.orderByDesc(ApproveProcess::getId).last("LIMIT 1"));
			if (savedStockIn != null) {
			savedStockIn.setApproveStatus(2);
			savedStockIn.setApproveOverTime(rowList.get(0).getReportDate());
			approveProcessService.updateById(savedStockIn);
			}
			} catch (Exception e) {
			log.error("自动生成入库审批申请失败", e);
			}

			try {
			ApproveProcessVO deliveryVo = new ApproveProcessVO();
			deliveryVo.setApproveType(ApproveTypeEnum.DELIVERY.getCode());
			deliveryVo.setApproveDeptId(208L);
			deliveryVo.setApproveReason("发货审批:" + ledger.getSalesContractNo());
			deliveryVo.setApproveUserIds("1");
			deliveryVo.setApproveUser(entryUserId);
			deliveryVo.setApproveTime(reportDateStr);
			approveProcessService.addApprove(deliveryVo);

			ApproveProcess savedDelivery = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
			.eq(ApproveProcess::getApproveReason, deliveryVo.getApproveReason())
			.eq(ApproveProcess::getApproveType, deliveryVo.getApproveType())
			.orderByDesc(ApproveProcess::getId).last("LIMIT 1"));
			if (savedDelivery != null) {
			savedDelivery.setApproveStatus(2);
			savedDelivery.setApproveOverTime(rowList.get(0).getReportDate());
			approveProcessService.updateById(savedDelivery);
			}
			} catch (Exception e) {
			log.error("自动生成发货审批申请失败", e);
			}
			}

			salesLedgerMapper.updateById(ledger);
			} catch (Exception e) {
			log.error("订单 {} 未发货记录导入失败", orderNo, e);
			// errorMessages.add("订单 [" + orderNo + "] 导入失败: " + e.getMessage());
			}

			salesLedgerProductServiceImpl.addProductionData(product);
			contractAmount = contractAmount.add(lineAmount);
			}

			ledger.setContractAmount(contractAmount);
			salesLedgerMapper.updateById(ledger);
			}
			// SecurityContextHolder.setContext(originalContext);
			});
			// if (!errorMessages.isEmpty()) {
			// throw new ServiceException("部分数据导入失败:\n" + String.join("\n", errorMessages));
			// }
			}

			private List<SalesLedgerProductProcess> buildImportProcessBinds(SalesNotShippingImportDto row, Map<String, SalesLedgerProductProcess> processMap) {
			@@ -2716,6 +3073,9 @@
			mergeProcessQuantity(processQuantityMap, "挖缺", toProcessQuantity(row.getNotching()));
			mergeProcessQuantity(processQuantityMap, "安全角", toProcessQuantity(row.getSafetyCorner()));
			mergeProcessQuantity(processQuantityMap, "磨边", toProcessQuantity(row.getGrindingIrregular()));
			mergeProcessQuantity(processQuantityMap, "精磨边", toProcessQuantity(row.getFineGrinding()));
			mergeProcessQuantity(processQuantityMap, "运费", toProcessQuantity(row.getFreightFee()));
			mergeProcessQuantity(processQuantityMap, "加急费", toProcessQuantity(row.getUrgentFee()));

			List<SalesLedgerProductProcess> result = new ArrayList<>();
			for (Map.Entry<String, Integer> entry : processQuantityMap.entrySet()) {
			@@ -2769,6 +3129,11 @@
			if (CollectionUtils.isEmpty(processNames)) {
			throw new ServiceException("导入失败,工艺路线[" + flowKey + "]解析失败");
			}
			synchronized (("ROUTE_" + flowKey).intern()) {
			ProcessRoute exists = routeNameMap.get(flowKey);
			if (exists != null && exists.getId() != null) {
			return exists;
			}
			ProcessRoute route = new ProcessRoute();
			route.setProductModelId(0L);
			route.setProcessRouteName(flowKey);
			@@ -2791,6 +3156,7 @@
			routeNameMap.put(flowKey, route);
			routeItemMap.put(route.getId(), routeItems);
			return route;
			}
			}

			private void mergeProcessQuantity(Map<String, Integer> processQuantityMap, String processName, Integer quantity) {
			@@ -2867,12 +3233,18 @@
			if (exists != null && exists.getId() != null) {
			return exists;
			}
			synchronized (("CUSTOMER_" + key).intern()) {
			exists = customerNameMap.get(key);
			if (exists != null && exists.getId() != null) {
			return exists;
			}
			Customer customer = new Customer();
			customer.setCustomerName(key);
			customer.setRegionsId(hebiRegionId);
			customerMapper.insert(customer);
			customerNameMap.put(key, customer);
			return customer;
			}
			}

			private Product resolveOrCreateImportProduct(SalesNotShippingImportDto row, Map<String, Product> productNameMap, Product finishedGoodsParent, String orderNo) {
			@@ -2894,12 +3266,18 @@
			if (!StringUtils.hasText(newProductName)) {
			throw new ServiceException("导入失败,订单编号[" + orderNo + "]产品名称和产品分类均为空");
			}
			synchronized (("PRODUCT_" + newProductName).intern()) {
			Product product = productNameMap.get(newProductName);
			if (product != null && product.getId() != null) {
			return product;
			}
			Product created = new Product();
			created.setParentId(finishedGoodsParent == null ? null : finishedGoodsParent.getId());
			created.setProductName(newProductName);
			productMapper.insert(created);
			productNameMap.put(newProductName, created);
			return created;
			}
			}

			private ProductModel resolveOrCreateImportProductModel(Product product, String modelName, BigDecimal thickness, Map<String, ProductModel> productModelKeyMap) {
			@@ -2911,16 +3289,36 @@
			if (exists != null && exists.getId() != null) {
			return exists;
			}
			synchronized (("MODEL_" + key).intern()) {
			exists = productModelKeyMap.get(key);
			if (exists != null && exists.getId() != null) {
			return exists;
			}
			ProductModel created = new ProductModel();
			created.setProductId(product.getId());
			created.setModel(modelName.trim());
			created.setThickness(thickness);
			created.setUnit("mm");
			productModelMapper.insert(created);
			productModelKeyMap.put(key, created);
			return created;
			}
			}

			private String buildSpecificationModel(SalesNotShippingImportDto row) {
			if (StringUtils.hasText(row.getProductName())) {
			return row.getProductName().trim();
			}
			if (StringUtils.hasText(row.getProductSubCategory())) {
			return row.getProductSubCategory().trim();
			}
			if (StringUtils.hasText(row.getProductCategory())) {
			return row.getProductCategory().trim();
			}
			return "";
			}

			private String buildSpecificationModel(SalesShippingImportDto row) {
			if (StringUtils.hasText(row.getProductName())) {
			return row.getProductName().trim();
			}
			@@ -3032,16 +3430,21 @@
			String shippingNo = StringUtils.hasText(row.getShippingNo()) ? row.getShippingNo().trim() : "";
			String dateStr = row.getReportDate() == null ? "" : String.valueOf(row.getReportDate().getTime());
			String subCategory = StringUtils.hasText(row.getProductSubCategory()) ? row.getProductSubCategory().trim() : "";
			return ledgerId + "\|" + subCategory + "\|" + shippingNo + "\|" + dateStr + "\|" + defaultDecimal(row.getQuantity());
			Long sequence = row.getSequence();
			if (sequence == null) {
			throw new ServiceException("新增失败,导入出库单编号为空");
			}
			return ledgerId + "\|" + subCategory + "\|" + shippingNo + "\|" + dateStr + "\|" + defaultDecimal(row.getQuantity()) + "\|" + sequence;
			}

			private void createShippingQualityInspect(SalesLedger ledger, SalesLedgerProduct dbProduct, SalesShippingImportDto row, BigDecimal inspectQty) {
			private Long createShippingQualityInspect(SalesLedger ledger, SalesLedgerProduct dbProduct, SalesShippingImportDto row, BigDecimal inspectQty) {
			if (ledger == null \|\| dbProduct == null \|\| inspectQty == null \|\| inspectQty.compareTo(BigDecimal.ZERO) <= 0) {
			return;
			return null;
			}
			Date checkDate = row.getReportDate() != null ? row.getReportDate() : new Date();
			QualityInspect qualityInspect = new QualityInspect();
			qualityInspect.setInspectType(2);
			qualityInspect.setPurchaseLedgerId(dbProduct.getId());
			qualityInspect.setCheckTime(checkDate);
			qualityInspect.setCustomer(StringUtils.hasText(ledger.getCustomerName()) ? ledger.getCustomerName() : row.getCustomerName());
			qualityInspect.setCheckName(StringUtils.hasText(row.getCreator()) ? row.getCreator().trim() : null);
			@@ -3068,12 +3471,19 @@
			}
			qualityInspectMapper.insert(qualityInspect);

			if (row.getReportDate() != null) {
			LocalDateTime reportDateTime = LocalDateTime.ofInstant(row.getReportDate().toInstant(), ZoneId.systemDefault());
			qualityInspect.setCreateTime(reportDateTime);
			qualityInspect.setUpdateTime(reportDateTime);
			qualityInspectMapper.updateById(qualityInspect);
			}

			if (selectedStandard == null \|\| selectedStandard.getId() == null) {
			return;
			return qualityInspect.getId();
			}
			List<QualityTestStandardParam> standardParams = qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, selectedStandard.getId()));
			if (CollectionUtils.isEmpty(standardParams)) {
			return;
			return qualityInspect.getId();
			}
			List<QualityInspectParam> inspectParams = standardParams.stream().map(item -> {
			QualityInspectParam param = new QualityInspectParam();
			@@ -3086,6 +3496,69 @@
			return param;
			}).collect(Collectors.toList());
			inspectParams.forEach(qualityInspectParamMapper::insert);
			return qualityInspect.getId();
			}

			private Long createNotShippingQualityInspect(SalesLedger ledger, SalesLedgerProduct dbProduct, SalesNotShippingImportDto row, BigDecimal inspectQty) {
			if (ledger == null \|\| dbProduct == null \|\| inspectQty == null \|\| inspectQty.compareTo(BigDecimal.ZERO) <= 0) {
			return null;
			}
			Date checkDate = row.getReportDate() != null ? row.getReportDate() : new Date();
			QualityInspect qualityInspect = new QualityInspect();
			qualityInspect.setInspectType(2);
			qualityInspect.setPurchaseLedgerId(dbProduct.getId());
			qualityInspect.setCheckTime(checkDate);
			qualityInspect.setCustomer(StringUtils.hasText(ledger.getCustomerName()) ? ledger.getCustomerName() : row.getCustomerName());
			qualityInspect.setCheckName(StringUtils.hasText(row.getCreator()) ? row.getCreator().trim() : null);
			qualityInspect.setProductId(dbProduct.getProductId());
			qualityInspect.setProductName(dbProduct.getProductCategory());
			qualityInspect.setModel(dbProduct.getSpecificationModel());
			qualityInspect.setUnit(resolveInspectUnit(dbProduct));
			qualityInspect.setQuantity(inspectQty);
			qualityInspect.setQualifiedQuantity(inspectQty);
			qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
			qualityInspect.setPassRate(BigDecimal.valueOf(100));
			qualityInspect.setCheckResult("合格");
			qualityInspect.setInspectState(1);
			qualityInspect.setApprovalStatus(1);
			qualityInspect.setProductModelId(dbProduct.getProductModelId());

			QualityTestStandard selectedStandard = null;
			if (dbProduct.getProductId() != null) {
			List<QualityTestStandard> standards = qualityTestStandardMapper.getQualityTestStandardByProductId(dbProduct.getProductId(), 2, null);
			if (CollectionUtils.isNotEmpty(standards)) {
			selectedStandard = standards.get(0);
			qualityInspect.setTestStandardId(selectedStandard.getId());
			}
			}
			qualityInspectMapper.insert(qualityInspect);

			if (row.getReportDate() != null) {
			LocalDateTime reportDateTime = LocalDateTime.ofInstant(row.getReportDate().toInstant(), ZoneId.systemDefault());
			qualityInspect.setCreateTime(reportDateTime);
			qualityInspect.setUpdateTime(reportDateTime);
			qualityInspectMapper.updateById(qualityInspect);
			}

			if (selectedStandard == null \|\| selectedStandard.getId() == null) {
			return qualityInspect.getId();
			}
			List<QualityTestStandardParam> standardParams = qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, selectedStandard.getId()));
			if (CollectionUtils.isEmpty(standardParams)) {
			return qualityInspect.getId();
			}
			List<QualityInspectParam> inspectParams = standardParams.stream().map(item -> {
			QualityInspectParam param = new QualityInspectParam();
			param.setInspectId(qualityInspect.getId());
			param.setParameterItem(item.getParameterItem());
			param.setUnit(item.getUnit());
			param.setStandardValue(item.getStandardValue());
			param.setControlValue(item.getControlValue());
			param.setTestValue("无瑕疵");
			return param;
			}).collect(Collectors.toList());
			inspectParams.forEach(qualityInspectParamMapper::insert);
			return qualityInspect.getId();
			}

			private String resolveInspectUnit(SalesLedgerProduct dbProduct) {
			@@ -3222,7 +3695,7 @@
			LoginUser loginUser = SecurityUtils.getLoginUser();
			ApproveProcessVO approveProcessVO = new ApproveProcessVO();
			approveProcessVO.setApproveType(7);
			approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
			approveProcessVO.setApproveDeptId(208L);
			approveProcessVO.setApproveReason("发货审批:" + salesLedger.getSalesContractNo());
			approveProcessVO.setApproveRemark(remarkJson);
			approveProcessVO.setApproveUserIds(dto.getApproveUserIds().trim());
			@@ -3404,7 +3877,7 @@
			baseMapper.updateById(salesLedger);
			}



			/**
			* 处理销售台账反审逻辑
			* 1. 设置反审相关信息（时间、人员）
			@@ -3475,8 +3948,8 @@

			// 复制产品到新台账
			List<SalesLedgerProduct> originalProducts = salesLedgerProductMapper.selectList(
			Wrappers.<SalesLedgerProduct>lambdaQuery()
			.eq(SalesLedgerProduct::getSalesLedgerId, id)
			Wrappers.<SalesLedgerProduct>lambdaQuery()
			.eq(SalesLedgerProduct::getSalesLedgerId, id)
			);
			for (SalesLedgerProduct originalProduct : originalProducts) {
			SalesLedgerProduct newProduct = new SalesLedgerProduct();
			@@ -3509,15 +3982,15 @@
			salesLedger.setCounterReviewPerson(loginUser.getUser().getNickName());
			salesLedger.setCounterReviewPersonId(loginUser.getUserId());
			salesLedger.setReviewStatus(2);


			Long originalSalesLedgerId = salesLedger.getId();


			// 2. 查询原销售台账数据
			SalesLedger originalLedger = salesLedgerMapper.selectById(originalSalesLedgerId);
			if (originalLedger == null) {
			throw new ServiceException("原订单不存在，无法反审");
			}


			// 3. 创建新的销售台账，复制原台账数据
			SalesLedger newLedger = new SalesLedger();
			BeanUtils.copyProperties(originalLedger, newLedger);
			@@ -3529,16 +4002,16 @@
			newLedger.setCounterReviewTime(null); // 清空反审时间
			newLedger.setCounterReviewPerson(null); // 清空反审人
			newLedger.setCounterReviewPersonId(null); // 清空反审人ID


			// 4. 插入新的销售台账
			salesLedgerMapper.insert(newLedger);


			// 5. 查询并复制原台账的所有产品数据
			List<SalesLedgerProduct> originalProducts = salesLedgerProductMapper.selectList(
			Wrappers.<SalesLedgerProduct>lambdaQuery()
			.eq(SalesLedgerProduct::getSalesLedgerId, originalSalesLedgerId)
			Wrappers.<SalesLedgerProduct>lambdaQuery()
			.eq(SalesLedgerProduct::getSalesLedgerId, originalSalesLedgerId)
			);


			for (SalesLedgerProduct originalProduct : originalProducts) {
			// 5.1 创建新产品记录，复制原产品数据
			SalesLedgerProduct newProduct = new SalesLedgerProduct();
			@@ -3553,20 +4026,20 @@
			newProduct.setAvailableQuality(newProduct.getQuantity().subtract(newProduct.getReturnQuality())); // 重新计算可用数量
			newProduct.setProductStockStatus(0); // 产品库存状态重置为0
			newProduct.fillRemainingQuantity(); // 重新计算剩余数量


			// 5.2 插入新产品记录
			salesLedgerProductMapper.insert(newProduct);
			}


			// 6. 处理原订单的库存数据（生成反审出入库记录）
			processOriginalOrderStock(originalSalesLedgerId);


			// 7. 清除原订单的质检记录
			clearQualityInspectRecords(originalSalesLedgerId);


			// 8. 清除原订单的发货信息和发货审批记录
			clearShippingAndApprovalRecords(originalSalesLedgerId);


			// 9. 取消原订单相关的审批流程
			cancelApproveProcesses(originalSalesLedgerId, originalLedger.getSalesContractNo());
			}
			@@ -3577,8 +4050,8 @@
			private void clearQualityInspectRecords(Long originalSalesLedgerId) {
			// 删除与原订单关联的质检记录
			qualityInspectMapper.delete(
			Wrappers.<QualityInspect>lambdaQuery()
			.eq(QualityInspect::getPurchaseLedgerId, originalSalesLedgerId)
			Wrappers.<QualityInspect>lambdaQuery()
			.eq(QualityInspect::getPurchaseLedgerId, originalSalesLedgerId)
			);
			}

			@@ -3588,27 +4061,27 @@
			private void clearShippingAndApprovalRecords(Long originalSalesLedgerId) {
			// 1. 查询原订单的所有发货信息
			List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(
			Wrappers.<ShippingInfo>lambdaQuery()
			.eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
			Wrappers.<ShippingInfo>lambdaQuery()
			.eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
			);


			// 2. 删除发货审批记录
			if (!CollectionUtils.isEmpty(shippingInfos)) {
			List<Long> shippingInfoIds = shippingInfos.stream()
			.map(ShippingInfo::getId)
			.collect(Collectors.toList());

			.map(ShippingInfo::getId)
			.collect(Collectors.toList());

			shipmentApprovalMapper.delete(
			Wrappers.<ShipmentApproval>lambdaQuery()
			.eq(ShipmentApproval::getSalesLedgerId, originalSalesLedgerId)
			.or()
			.in(ShipmentApproval::getShippingInfoId, shippingInfoIds)
			Wrappers.<ShipmentApproval>lambdaQuery()
			.eq(ShipmentApproval::getSalesLedgerId, originalSalesLedgerId)
			.or()
			.in(ShipmentApproval::getShippingInfoId, shippingInfoIds)
			);


			// 3. 删除发货信息记录
			shippingInfoMapper.delete(
			Wrappers.<ShippingInfo>lambdaQuery()
			.eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
			Wrappers.<ShippingInfo>lambdaQuery()
			.eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
			);
			}
			}
			@@ -3619,26 +4092,26 @@
			private void cancelApproveProcesses(Long originalSalesLedgerId, String originalSalesContractNo) {
			// 取消入库审批流程
			List<ApproveProcess> stockInApproveProcesses = approveProcessService.list(
			new LambdaQueryWrapper<ApproveProcess>()
			.eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode())
			.like(ApproveProcess::getApproveRemark, "salesStock:" + originalSalesLedgerId + ":")
			.eq(ApproveProcess::getApproveDelete, 0)
			new LambdaQueryWrapper<ApproveProcess>()
			.eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode())
			.like(ApproveProcess::getApproveRemark, "salesStock:" + originalSalesLedgerId + ":")
			.eq(ApproveProcess::getApproveDelete, 0)
			);


			for (ApproveProcess process : stockInApproveProcesses) {
			process.setApproveStatus(3); // 设置为审批失败状态
			process.setApproveDelete(1); // 标记为已删除
			approveProcessService.updateById(process);
			}


			// 取消发货审批流程
			List<ApproveProcess> deliveryApproveProcesses = approveProcessService.list(
			new LambdaQueryWrapper<ApproveProcess>()
			.eq(ApproveProcess::getApproveType, 7) // 发货审批类型
			.like(ApproveProcess::getApproveReason, "发货审批:" + originalSalesContractNo)
			.eq(ApproveProcess::getApproveDelete, 0)
			new LambdaQueryWrapper<ApproveProcess>()
			.eq(ApproveProcess::getApproveType, 7) // 发货审批类型
			.like(ApproveProcess::getApproveReason, "发货审批:" + originalSalesContractNo)
			.eq(ApproveProcess::getApproveDelete, 0)
			);


			for (ApproveProcess process : deliveryApproveProcesses) {
			process.setApproveStatus(3); // 设置为审批失败状态
			process.setApproveDelete(1); // 标记为已删除
			@@ -3654,10 +4127,10 @@
			private void processOriginalOrderStock(Long originalSalesLedgerId) {
			// 1. 查询原订单的所有入库记录
			List<StockInRecord> stockInRecords = stockInRecordMapper.selectList(
			Wrappers.<StockInRecord>lambdaQuery()
			.eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
			Wrappers.<StockInRecord>lambdaQuery()
			.eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
			);


			// 2. 删除入库记录并扣减库存
			for (StockInRecord stockInRecord : stockInRecords) {
			// 从库存表中扣减相应数量
			@@ -3666,19 +4139,19 @@
			stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
			stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
			}


			// 3. 删除所有入库记录
			stockInRecordMapper.delete(
			Wrappers.<StockInRecord>lambdaQuery()
			.eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
			Wrappers.<StockInRecord>lambdaQuery()
			.eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
			);


			// 4. 查询原订单的所有出库记录
			List<StockOutRecord> stockOutRecords = stockOutRecordMapper.selectList(
			Wrappers.<StockOutRecord>lambdaQuery()
			.eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
			Wrappers.<StockOutRecord>lambdaQuery()
			.eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
			);


			// 5. 删除出库记录并增加库存
			for (StockOutRecord stockOutRecord : stockOutRecords) {
			// 向库存表中增加相应数量
			@@ -3687,38 +4160,14 @@
			stockInventoryDto.setQualitity(stockOutRecord.getStockOutNum());
			stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
			}


			// 6. 删除所有出库记录
			stockOutRecordMapper.delete(
			Wrappers.<StockOutRecord>lambdaQuery()
			.eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
			Wrappers.<StockOutRecord>lambdaQuery()
			.eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
			);
			}

			@Override
			@Transactional(rollbackFor = Exception.class)
			public void markOrderCompleted(List<Long> ids) {
			if (CollectionUtils.isEmpty(ids)) {
			throw new ServiceException("请选择要标记完成的订单");
			}
			for (Long id : ids) {
			SalesLedger ledger = salesLedgerMapper.selectById(id);
			if (ledger == null) {
			throw new ServiceException("订单不存在，无法标记完成");
			}
			if (ledger.getReviewStatus() == null \|\| ledger.getReviewStatus() != 1) {
			throw new ServiceException("订单" + ledger.getSalesContractNo() + "不是已审核状态，无法标记完成");
			}
			if (ledger.getOrderStatus() != null && ledger.getOrderStatus() == 1) {
			throw new ServiceException("订单" + ledger.getSalesContractNo() + "已完成，无需重复标记");
			}
			}
			salesLedgerMapper.update(null,
			Wrappers.<SalesLedger>lambdaUpdate()
			.in(SalesLedger::getId, ids)
			.set(SalesLedger::getOrderStatus, 1)
			);
			}

			@Override
			public void incrementPrintCount(Long id, String printType) {
			@@ -3735,16 +4184,16 @@
			if ("label".equals(printType)) {
			int currentCount = ledger.getLabelPrintCount() == null ? 0 : ledger.getLabelPrintCount();
			salesLedgerMapper.update(null,
			Wrappers.<SalesLedger>lambdaUpdate()
			.eq(SalesLedger::getId, id)
			.set(SalesLedger::getLabelPrintCount, currentCount + 1)
			Wrappers.<SalesLedger>lambdaUpdate()
			.eq(SalesLedger::getId, id)
			.set(SalesLedger::getLabelPrintCount, currentCount + 1)
			);
			} else {
			int currentCount = ledger.getDocumentPrintCount() == null ? 0 : ledger.getDocumentPrintCount();
			salesLedgerMapper.update(null,
			Wrappers.<SalesLedger>lambdaUpdate()
			.eq(SalesLedger::getId, id)
			.set(SalesLedger::getDocumentPrintCount, currentCount + 1)
			Wrappers.<SalesLedger>lambdaUpdate()
			.eq(SalesLedger::getId, id)
			.set(SalesLedger::getDocumentPrintCount, currentCount + 1)
			);
			}
			}
			@@ -3756,8 +4205,8 @@
			Page<SalesLedger> page = new Page<>(-1, -1);
			// 使用 Wrappers 构建升序查询
			LambdaQueryWrapper<SalesLedger> queryWrapper = Wrappers.<SalesLedger>lambdaQuery()
			.orderByAsc(SalesLedger::getEntryDate)
			.orderByAsc(SalesLedger::getId);
			.orderByAsc(SalesLedger::getEntryDate)
			.orderByAsc(SalesLedger::getId);

			// 添加查询条件
			if (salesLedgerDto.getCustomerName() != null && !salesLedgerDto.getCustomerName().isEmpty()) {
			@@ -3784,12 +4233,10 @@
			if (salesLedgerDto.getReviewStatus() != null) {
			queryWrapper.eq(SalesLedger::getReviewStatus, salesLedgerDto.getReviewStatus());
			}
			if (salesLedgerDto.getOrderStatus() != null) {
			queryWrapper.eq(SalesLedger::getOrderStatus, salesLedgerDto.getOrderStatus());
			}

			if (salesLedgerDto.getReviewStatusList() != null && !salesLedgerDto.getReviewStatusList().isEmpty()) {
			queryWrapper.and(w -> w.in(SalesLedger::getReviewStatus, salesLedgerDto.getReviewStatusList())
			.or().isNull(SalesLedger::getReviewStatus));
			.or().isNull(SalesLedger::getReviewStatus));
			}

			IPage<SalesLedger> ledgerPage = salesLedgerMapper.selectPage(page, queryWrapper);
			@@ -3810,23 +4257,23 @@
			ledgerDto.setEntryPersonName(ledger.getEntryPersonName());
			ledgerDto.setEntryDate(ledger.getEntryDate());
			ledgerDto.setExecutionDate(ledger.getExecutionDate() != null ?
			java.sql.Date.valueOf(ledger.getExecutionDate()) : null);
			java.sql.Date.valueOf(ledger.getExecutionDate()) : null);
			ledgerDto.setDeliveryDate(ledger.getDeliveryDate() != null ?
			java.sql.Date.valueOf(ledger.getDeliveryDate()) : null);
			java.sql.Date.valueOf(ledger.getDeliveryDate()) : null);
			ledgerDto.setContractAmount(ledger.getContractAmount());
			ledgerDto.setRemarks(ledger.getRemarks());
			ledgerDto.setCustomerRemarks(ledger.getCustomerRemarks());
			ledgerDto.setDeliveryStatusText(getDeliveryStatusText(ledger.getDeliveryStatus()));
			ledgerDto.setStockStatusText(getStockStatusText(ledger.getStockStatus()));
			ledgerDto.setReviewStatusText(getReviewStatusText(ledger.getReviewStatus()));
			ledgerDto.setOrderStatusText(getOrderStatusText(ledger.getOrderStatus()));

			ledgerExportList.add(ledgerDto);

			// 查询该台账的产品列表
			List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
			Wrappers.<SalesLedgerProduct>lambdaQuery()
			.eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId())
			.eq(SalesLedgerProduct::getType, 1)
			Wrappers.<SalesLedgerProduct>lambdaQuery()
			.eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId())
			.eq(SalesLedgerProduct::getType, 1)
			);

			for (SalesLedgerProduct product : products) {
			@@ -3897,11 +4344,11 @@
			}

			LambdaQueryWrapper<SalesLedgerProcessRouteRecord> queryWrapper = Wrappers.<SalesLedgerProcessRouteRecord>lambdaQuery()
			.eq(SalesLedgerProcessRouteRecord::getIsCompleted, 1)
			.ge(SalesLedgerProcessRouteRecord::getCompletedTime, startTime)
			.le(SalesLedgerProcessRouteRecord::getCompletedTime, endTime)
			.orderByAsc(SalesLedgerProcessRouteRecord::getCompletedTime)
			.orderByAsc(SalesLedgerProcessRouteRecord::getId);
			.eq(SalesLedgerProcessRouteRecord::getIsCompleted, 1)
			.ge(SalesLedgerProcessRouteRecord::getCompletedTime, startTime)
			.le(SalesLedgerProcessRouteRecord::getCompletedTime, endTime)
			.orderByAsc(SalesLedgerProcessRouteRecord::getCompletedTime)
			.orderByAsc(SalesLedgerProcessRouteRecord::getId);

			if (CollectionUtils.isNotEmpty(salesLedgerIds)) {
			queryWrapper.in(SalesLedgerProcessRouteRecord::getSalesLedgerId, salesLedgerIds);
			@@ -3915,45 +4362,45 @@

			if (CollectionUtils.isNotEmpty(completedRoutes)) {
			List<Long> routeSalesLedgerIds = completedRoutes.stream()
			.map(SalesLedgerProcessRouteRecord::getSalesLedgerId)
			.filter(Objects::nonNull)
			.distinct()
			.collect(Collectors.toList());
			.map(SalesLedgerProcessRouteRecord::getSalesLedgerId)
			.filter(Objects::nonNull)
			.distinct()
			.collect(Collectors.toList());
			List<Long> salesLedgerProcessRouteIds = completedRoutes.stream()
			.map(SalesLedgerProcessRouteRecord::getSalesLedgerProcessRouteId)
			.filter(Objects::nonNull)
			.distinct()
			.collect(Collectors.toList());
			.map(SalesLedgerProcessRouteRecord::getSalesLedgerProcessRouteId)
			.filter(Objects::nonNull)
			.distinct()
			.collect(Collectors.toList());

			if (CollectionUtils.isNotEmpty(routeSalesLedgerIds)) {
			salesLedgerMap = salesLedgerMapper.selectBatchIds(routeSalesLedgerIds).stream()
			.filter(Objects::nonNull)
			.collect(Collectors.toMap(SalesLedger::getId, item -> item, (a, b) -> a));
			.filter(Objects::nonNull)
			.collect(Collectors.toMap(SalesLedger::getId, item -> item, (a, b) -> a));
			List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
			.in(SalesLedgerProduct::getSalesLedgerId, routeSalesLedgerIds)
			.eq(SalesLedgerProduct::getType, 1)
			.orderByAsc(SalesLedgerProduct::getSalesLedgerId)
			.orderByAsc(SalesLedgerProduct::getId));
			.in(SalesLedgerProduct::getSalesLedgerId, routeSalesLedgerIds)
			.eq(SalesLedgerProduct::getType, 1)
			.orderByAsc(SalesLedgerProduct::getSalesLedgerId)
			.orderByAsc(SalesLedgerProduct::getId));
			productMap = products.stream().collect(Collectors.groupingBy(
			SalesLedgerProduct::getSalesLedgerId,
			LinkedHashMap::new,
			Collectors.toList()
			SalesLedgerProduct::getSalesLedgerId,
			LinkedHashMap::new,
			Collectors.toList()
			));
			}

			if (CollectionUtils.isNotEmpty(salesLedgerProcessRouteIds)) {
			routeMap = salesLedgerProcessRouteService.listByIds(salesLedgerProcessRouteIds).stream()
			.filter(Objects::nonNull)
			.collect(Collectors.toMap(SalesLedgerProcessRoute::getId, item -> item, (a, b) -> a));
			.filter(Objects::nonNull)
			.collect(Collectors.toMap(SalesLedgerProcessRoute::getId, item -> item, (a, b) -> a));
			List<Long> processRouteItemIds = routeMap.values().stream()
			.map(SalesLedgerProcessRoute::getProcessRouteItemId)
			.filter(Objects::nonNull)
			.distinct()
			.collect(Collectors.toList());
			.map(SalesLedgerProcessRoute::getProcessRouteItemId)
			.filter(Objects::nonNull)
			.distinct()
			.collect(Collectors.toList());
			if (CollectionUtils.isNotEmpty(processRouteItemIds)) {
			processRouteItemMap = processRouteItemMapper.selectBatchIds(processRouteItemIds).stream()
			.filter(Objects::nonNull)
			.collect(Collectors.toMap(ProcessRouteItem::getId, item -> item, (a, b) -> a));
			.filter(Objects::nonNull)
			.collect(Collectors.toMap(ProcessRouteItem::getId, item -> item, (a, b) -> a));
			}
			}
			}
			@@ -3970,8 +4417,8 @@
			final Map<Long, ProcessRouteItem> finalProcessRouteItemMap = processRouteItemMap;
			LinkedHashMap<String, List<List<Object>>> sheetMap = new LinkedHashMap<>();
			List<Long> orderedProcessRouteItemIds = routeGroupMap.keySet().stream()
			.sorted((left, right) -> compareProcessRouteItem(left, right, finalProcessRouteItemMap))
			.collect(Collectors.toList());
			.sorted((left, right) -> compareProcessRouteItem(left, right, finalProcessRouteItemMap))
			.collect(Collectors.toList());

			for (Long processRouteItemId : orderedProcessRouteItemIds) {
			ProcessRouteItem processRouteItem = finalProcessRouteItemMap.get(processRouteItemId);
			@@ -4007,7 +4454,7 @@
			sheetMap.put("工艺路线", sheetData);
			}

			com.ruoyi.common.utils.excel.ExcelUtils.exportManySheet(response, "销售台账工艺路线导出", sheetMap);
			ExcelUtils.exportManySheet(response, "销售台账工艺路线导出", sheetMap);
			} catch (Exception e) {
			log.error("导出售后台账工艺路线失败", e);
			throw new ServiceException("导出售后台账工艺路线失败：" + e.getMessage());
			@@ -4053,7 +4500,7 @@

			private List<Object> buildProcessRouteRow(SalesLedger salesLedger, SalesLedgerProduct product, SalesLedgerProcessRouteRecord route) {
			List<Object> row = new ArrayList<>();
			row.add(salesLedger.getEntryDate() == null ? "" : DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, salesLedger.getEntryDate()));
			row.add(route.getCompletedTime() == null ? "" : route.getCompletedTime().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			row.add(salesLedger.getSalesContractNo());
			row.add(salesLedger.getCustomerName());
			row.add(product == null ? "" : product.getSpecificationModel());
			@@ -4082,7 +4529,7 @@
			}
			if (product.getWidth() != null && product.getHeight() != null) {
			BigDecimal area = product.getWidth().multiply(product.getHeight())
			.divide(new BigDecimal("1000000"), 2, RoundingMode.HALF_UP);
			.divide(new BigDecimal("1000000"), 2, RoundingMode.HALF_UP);
			return area.multiply(qty).setScale(2, RoundingMode.HALF_UP);
			}
			return BigDecimal.ZERO;
			@@ -4090,8 +4537,8 @@

			private String buildUniqueSheetName(Map<String, List<List<Object>>> sheetMap, ProcessRouteItem processRouteItem, Long processRouteItemId) {
			String baseName = processRouteItem != null && StringUtils.hasText(processRouteItem.getProcessName())
			? processRouteItem.getProcessName()
			: "工序" + processRouteItemId;
			? processRouteItem.getProcessName()
			: "工序" + processRouteItemId;
			baseName = sanitizeSheetName(baseName);
			String sheetName = baseName;
			int suffix = 2;
			@@ -4180,43 +4627,51 @@
			private String getDeliveryStatusText(Integer status) {
			if (status == null) return "未知";
			switch (status) {
			case 1: return "未发货";
			case 2: return "审批中";
			case 3: return "审批不通过";
			case 4: return "审批通过";
			case 5: return "已发货";
			case 6: return "部分发货";
			default: return "未知";
			case 1:
			return "未发货";
			case 2:
			return "审批中";
			case 3:
			return "审批不通过";
			case 4:
			return "审批通过";
			case 5:
			return "已发货";
			case 6:
			return "部分发货";
			default:
			return "未知";
			}
			}

			private String getStockStatusText(Integer status) {
			if (status == null) return "未知";
			switch (status) {
			case 0: return "未入库";
			case 1: return "部分入库";
			case 2: return "已入库";
			case 3: return "审批中";
			default: return "未知";
			case 0:
			return "未入库";
			case 1:
			return "部分入库";
			case 2:
			return "已入库";
			case 3:
			return "审批中";
			default:
			return "未知";
			}
			}

			private String getReviewStatusText(Integer status) {
			if (status == null) return "待审核";
			switch (status) {
			case 0: return "待审核";
			case 1: return "已审核";
			case 2: return "已反审";
			default: return "待审核";
			case 0:
			return "待审核";
			case 1:
			return "已审核";
			case 2:
			return "已反审";
			default:
			return "待审核";
			}
			}

			private String getOrderStatusText(Integer status) {
			if (status == null \|\| status == 0) return "进行中";
			switch (status) {
			case 0: return "进行中";
			case 1: return "已完成";
			default: return "进行中";
			}
			}
			}