mom-pro2-after.git

			@@ -21,9 +21,6 @@
			import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
			import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
			import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
			import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
			import cn.iocoder.yudao.module.mes.api.productsales.MesWmProductSalesLineApi;
			import cn.iocoder.yudao.module.mes.api.salesnotice.MesWmSalesNoticeApi;
			import cn.iocoder.yudao.module.mes.api.wms.MesWmStockApi;
			import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
			import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
			@@ -63,12 +60,6 @@
			private MdmItemApi mdmItemApi;
			@Resource
			private AdminUserApi adminUserApi;
			@Resource
			private MesWmSalesNoticeApi salesNoticeApi;
			@Resource
			private MesWmProductSalesLineApi productSalesLineApi;
			@Resource
			private MesProMpsApi mpsApi;
			@Resource
			private StorageAttachmentApi storageAttachmentApi;
			@Resource
			@@ -155,14 +146,11 @@
			// 2. 批量查询关联数据
			Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
			convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductId));
			Map<Long, String> batchCodeMap = productSalesLineApi.getBatchCodesBySaleOrderItemIds(
			convertSet(saleOrderItemList, ErpSaleOrderItemDO::getId));
			Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
			convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductUnitId));
			// 3. 转换订单项
			List<ErpSaleOrderRespVO.Item> itemVOList = BeanUtils.toBean(saleOrderItemList, ErpSaleOrderRespVO.Item.class, item -> {
			item.setStockCount(mesWmStockApi.getStockQuantity(item.getProductId()));
			item.setBatchCode(batchCodeMap.get(item.getId()));
			MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
			item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
			.setProductSpecification(mdmItem.getSpecification()));
			@@ -213,54 +201,13 @@
			// 1.4 管理员信息
			Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
			convertSet(pageResult.getList(), saleOrder -> Long.parseLong(saleOrder.getCreator())));
			// 1.5 发货通知单信息
			Map<Long, Boolean> salesNoticeMap = salesNoticeApi.checkSalesNoticeBySaleOrderIds(
			convertSet(pageResult.getList(), ErpSaleOrderDO::getId));
			// 1.6 出库批号
			Map<Long, String> batchCodeMap = productSalesLineApi.getBatchCodesBySaleOrderItemIds(
			convertSet(saleOrderItemList, ErpSaleOrderItemDO::getId));
			// 1.7 计量单位
			// 1.5 计量单位
			Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
			convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductUnitId));
			// 1.8 检查是否可以生成发货通知单（需要生产的明细对应的 MPS 是否已完成）
			// 筛选出需要生产的明细ID
			List<Long> needProductionItemIds = saleOrderItemList.stream()
			.filter(item -> item.getNeedProduction() != null && item.getNeedProduction() == 1)
			.map(ErpSaleOrderItemDO::getId)
			.toList();
			Map<Long, Boolean> canCreateSalesNoticeMap = new java.util.HashMap<>();
			if (!needProductionItemIds.isEmpty()) {
			// 按订单分组明细ID
			Map<Long, List<Long>> orderItemIdsMap = new java.util.HashMap<>();
			for (ErpSaleOrderItemDO item : saleOrderItemList) {
			orderItemIdsMap.computeIfAbsent(item.getOrderId(), k -> new java.util.ArrayList<>())
			.add(item.getId());
			}
			// 检查每个订单
			for (Map.Entry<Long, List<Long>> entry : orderItemIdsMap.entrySet()) {
			List<Long> itemIds = entry.getValue().stream()
			.filter(id -> {
			ErpSaleOrderItemDO item = saleOrderItemList.stream()
			.filter(i -> i.getId().equals(id))
			.findFirst().orElse(null);
			return item != null && item.getNeedProduction() != null && item.getNeedProduction() == 1;
			}
			).toList();
			if (itemIds.isEmpty()) {
			canCreateSalesNoticeMap.put(entry.getKey(), true);
			} else {
			canCreateSalesNoticeMap.put(entry.getKey(), mpsApi.checkCanCreateSalesNotice(itemIds));
			}
			}
			} else {
			// 没有需要生产的明细，都可以生成发货通知单
			pageResult.getList().forEach(order -> canCreateSalesNoticeMap.put(order.getId(), true));
			}
			// 2. 开始拼接
			return BeanUtils.toBean(pageResult, ErpSaleOrderRespVO.class, saleOrder -> {
			saleOrder.setItems(BeanUtils.toBean(saleOrderItemMap.get(saleOrder.getId()), ErpSaleOrderRespVO.Item.class,
			item -> {
			item.setBatchCode(batchCodeMap.get(item.getId()));
			MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
			item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
			.setProductSpecification(mdmItem.getSpecification()));
			@@ -270,10 +217,6 @@
			saleOrder.setProductNames(CollUtil.join(saleOrder.getItems(), "，", ErpSaleOrderRespVO.Item::getProductName));
			MapUtils.findAndThen(customerMap, saleOrder.getCustomerId(), supplier -> saleOrder.setCustomerName(supplier.getName()));
			MapUtils.findAndThen(userMap, Long.parseLong(saleOrder.getCreator()), user -> saleOrder.setCreatorName(user.getNickname()));
			// 设置是否已生成发货通知单
			saleOrder.setHasSalesNotice(salesNoticeMap.getOrDefault(saleOrder.getId(), false));
			// 设置是否可以生成发货通知单：已生成发货通知单时不显示按钮
			saleOrder.setCanCreateSalesNotice(!saleOrder.getHasSalesNotice() && canCreateSalesNoticeMap.getOrDefault(saleOrder.getId(), true));
			// 设置是否有需要生产的明细
			boolean hasNeedProduction = saleOrder.getItems().stream()
			.anyMatch(item -> item.getNeedProduction() != null && item.getNeedProduction() == 1);