product-inventory-management-after.git

			@@ -14,6 +14,7 @@
			import com.ruoyi.basic.mapper.ProductModelMapper;
			import com.ruoyi.basic.pojo.Customer;
			import com.ruoyi.basic.pojo.CustomerRegions;
			import com.ruoyi.basic.pojo.ProductModel;
			import com.ruoyi.basic.service.ICustomerRegionsService;
			import com.ruoyi.common.enums.FileNameType;
			import com.ruoyi.common.enums.SaleEnum;
			@@ -197,6 +198,20 @@
			productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId());
			productWrapper.eq(SalesLedgerProduct::getType, 1);
			List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
			Map<Long, ProductModel> productModelMap = Collections.emptyMap();
			if (CollectionUtils.isNotEmpty(products)) {
			List<Long> productModelIds = products.stream()
			.map(SalesLedgerProduct::getProductModelId)
			.filter(Objects::nonNull)
			.distinct()
			.collect(Collectors.toList());
			if (CollectionUtils.isNotEmpty(productModelIds)) {
			List<ProductModel> productModels = productModelMapper.selectBatchIds(productModelIds);
			if (CollectionUtils.isNotEmpty(productModels)) {
			productModelMap = productModels.stream().collect(Collectors.toMap(ProductModel::getId, Function.identity()));
			}
			}
			}
			for (SalesLedgerProduct product : products) {
			product.setOriginalNoInvoiceNum(product.getNoInvoiceNum());
			// 提供临时未开票数，未开票金额供前段计算
			@@ -228,6 +243,20 @@
			List<SalesLedgerProductProcess> processList = salesLedgerProductProcessService.listByIds(processIds);
			processList.forEach(p -> p.setQuantity(processQuantityMap.get(p.getId())));
			product.setSalesProductProcessList(processList);
			}
			ProductModel productModel = productModelMap.get(product.getProductModelId());
			if (productModel != null) {
			product.setThickness(productModel.getThickness());
			}
			if (product.getWidth() != null && product.getHeight() != null) {
			BigDecimal pieceArea = product.getWidth().multiply(product.getHeight()).divide(new BigDecimal(1000000), 2, RoundingMode.HALF_UP);
			if (product.getActualPieceArea() == null) {
			product.setActualPieceArea(pieceArea);
			}
			BigDecimal quantity = product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity();
			if (product.getActualTotalArea() == null) {
			product.setActualTotalArea(pieceArea.multiply(quantity).setScale(2, RoundingMode.HALF_UP));
			}
			}
			}

			@@ -389,12 +418,6 @@
			// 客户数据
			List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>().in(Customer::getCustomerName,
			salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getCustomerName).collect(Collectors.toList())));
			// // 规格型号数据
			// List<ProductModel> productModels = productModelMapper.selectList(new LambdaQueryWrapper<ProductModel>().in(ProductModel::getModel,
			// salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getSpecificationModel).collect(Collectors.toList())));
			// // 产品大类数据
			// List<Product> productList = productMapper.selectList(new LambdaQueryWrapper<Product>().in(Product::getProductName,
			// salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getProductCategory).collect(Collectors.toList())));
			List<Map<String, Object>> list = productModelMapper.getProductAndModelList();
			// 录入人数据
			List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
			@@ -404,7 +427,7 @@
			.eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())
			.last("LIMIT 1"));
			if (salesLedger1 != null) {
			continue;
			throw new ServiceException("导入失败：合同号 [" + salesLedgerImportDto.getSalesContractNo() + "] 已存在，请检查后重新导入");
			}
			SalesLedger salesLedger = new SalesLedger();
			BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
			@@ -426,7 +449,7 @@
			.map(SysUser::getUserId)
			.orElse(null);
			if (aLong == null)
			throw new RuntimeException("录入人:" + salesLedger.getEntryPerson() + ",无对应用户！");
			throw new ServiceException("录入人:" + salesLedger.getEntryPerson() + ",无对应用户！");
			salesLedger.setEntryPerson(aLong.toString());
			// 销售产品数据绑定，通过销售单号获取对应销售产品数据
			List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
			@@ -439,10 +462,12 @@
			.reduce(BigDecimal.ZERO, BigDecimal::add));
			salesLedgerMapper.insert(salesLedger);


			for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
			SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
			BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
			salesLedgerProduct.setFloorCode(salesLedgerProductImportDto.getFloorNo());
			salesLedgerProduct.setProcessRequirement(salesLedgerProductImportDto.getProcessingRequirements());
			salesLedgerProduct.setRemark(salesLedgerProductImportDto.getRemarks());
			salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
			salesLedgerProduct.setType(1);
			// 计算不含税总价
			@@ -456,21 +481,48 @@
			salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
			salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
			});
			// salesLedgerProduct.setProductId(productList.stream()
			// .filter(product -> product.getProductName().equals(salesLedgerProduct.getProductCategory()))
			// .findFirst()
			// .map(Product::getId)
			// .orElse(null));
			// salesLedgerProduct.setProductModelId(productModels.stream()
			// .filter(productModel -> productModel.getModel().equals(salesLedgerProduct.getSpecificationModel()))
			// .findFirst()
			// .map(ProductModel::getId)
			// .orElse(null));
			salesLedgerProduct.setRegister(loginUser.getNickName());
			salesLedgerProduct.setRegisterDate(LocalDateTime.now());
			salesLedgerProduct.setApproveStatus(0);
			salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
			salesLedgerProductMapper.insert(salesLedgerProduct);

			// 处理额外加工信息
			String extraProcessing = salesLedgerProductImportDto.getExtraProcessing();
			if (StringUtils.hasText(extraProcessing)) {
			List<SalesLedgerProductProcess> processList = new ArrayList<>();
			// 中英文分号
			String[] items = extraProcessing.split("[;；]");
			for (String item : items) {
			if (StringUtils.hasText(item)) {
			String[] parts = item.split("[-—~～]");
			if (parts.length >= 2) {
			String processName = parts[0].trim();
			String qtyStr = parts[1].trim();
			try {
			BigDecimal quantity = new BigDecimal(qtyStr);
			SalesLedgerProductProcess process = salesLedgerProductProcessService.getOne(
			new LambdaQueryWrapper<SalesLedgerProductProcess>()
			.eq(SalesLedgerProductProcess::getProcessName, processName)
			.last("LIMIT 1")
			);
			if (process != null) {
			SalesLedgerProductProcess p = new SalesLedgerProductProcess();
			p.setId(process.getId());
			p.setQuantity(quantity.intValue());
			processList.add(p);
			}
			} catch (Exception e) {
			log.error("解析额外加工数量失败: {}", qtyStr);
			}
			}
			}
			}
			if (!processList.isEmpty()) {
			salesLedgerProductProcessBindService.updateProductProcessBind(processList, salesLedgerProduct.getId());
			}
			}

			// 添加生产数据
			salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
			}