From dce6e9cd95969b09e381431d8c2521fa802de2c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 07 九月 2026 16:05:34 +0800
Subject: [PATCH] feat(erp): 新增库存预警建议采购功能
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 72 insertions(+), 28 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java
index c049142..255118d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java
@@ -10,6 +10,7 @@
import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.plan.ErpPurchasePlanPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.plan.ErpPurchasePlanRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.plan.ErpPurchasePlanSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchasePlanDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchasePlanItemDO;
@@ -22,8 +23,8 @@
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpPurchasePlanStatusEnum;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
-import cn.iocoder.yudao.module.mes.api.item.MesMdItemApi;
-import cn.iocoder.yudao.module.mes.api.item.dto.MesMdItemSafetyStockRespDTO;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.api.wms.MesWmStockApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -35,6 +36,7 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
@@ -90,7 +92,7 @@
private AdminUserApi adminUserApi;
@Resource
- private MesMdItemApi mesMdItemApi;
+ private MdmItemApi mdmItemApi;
@Resource
private MesWmStockApi mesWmStockApi;
@@ -275,44 +277,86 @@
}
@Override
+ public List<ErpPurchasePlanRespVO.Item> getStockAlertSuggestItems() {
+ // 1. 鑾峰彇鍚敤鐨勭墿鏂欏熀纭�鏁版嵁锛堝寘鍚粯璁や粨搴撱�佸畨鍏�/鏈�浣�/鏈�楂樺簱瀛橈級
+ List<MdmItemRespDTO> items = mdmItemApi.getItemListByStatus(0).getCheckedData();
+ if (CollUtil.isEmpty(items)) {
+ throw exception(PURCHASE_PLAN_STOCK_ALERT_NO_ITEM);
+ }
+ // 2. 鎸夐粯璁や粨搴撳簱瀛樿鍒掑缓璁噰璐噺
+ List<ErpPurchasePlanRespVO.Item> planItems = new ArrayList<>();
+ for (MdmItemRespDTO item : items) {
+ ErpPurchasePlanRespVO.Item planItem = buildStockAlertSuggestItem(item);
+ if (planItem != null) {
+ planItems.add(planItem);
+ }
+ }
+ if (CollUtil.isEmpty(planItems)) {
+ throw exception(PURCHASE_PLAN_STOCK_ALERT_NO_ITEM);
+ }
+ return planItems;
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public ErpPurchasePlanDO generatePlanFromStockAlert(String name, Long supplierId) {
- // 1. 鑾峰彇鍚敤瀹夊叏搴撳瓨鐨勭墿鏂�
- List<MesMdItemSafetyStockRespDTO> safetyStockItems = mesMdItemApi.getSafetyStockItemList();
- if (CollUtil.isEmpty(safetyStockItems)) {
- throw exception(PURCHASE_PLAN_ITEM_EMPTY);
+ // 1. 鑾峰彇搴撳瓨棰勮寤鸿閲囪喘鏄庣粏
+ List<ErpPurchasePlanRespVO.Item> suggestItems = getStockAlertSuggestItems();
+ if (CollUtil.isEmpty(suggestItems)) {
+ throw exception(PURCHASE_PLAN_STOCK_ALERT_NO_ITEM);
}
- // 2. 璁＄畻缂洪噺锛岀敓鎴愯鍒掓槑缁�
- List<ErpPurchasePlanSaveReqVO.Item> items = new ArrayList<>();
- for (MesMdItemSafetyStockRespDTO item : safetyStockItems) {
- if (item.getMinStock() == null) {
- continue;
- }
- BigDecimal stock = mesWmStockApi.getStockQuantity(item.getId());
- BigDecimal shortage = item.getMinStock().subtract(stock == null ? BigDecimal.ZERO : stock);
- if (shortage.compareTo(BigDecimal.ZERO) <= 0) {
- continue;
- }
- ErpPurchasePlanSaveReqVO.Item planItem = new ErpPurchasePlanSaveReqVO.Item();
- planItem.setProductId(item.getMdmItemId());
- planItem.setProductUnitId(item.getUnitMeasureId());
- planItem.setCount(shortage);
- items.add(planItem);
- }
- if (CollUtil.isEmpty(items)) {
- throw exception(PURCHASE_PLAN_ITEM_EMPTY);
- }
+ // 2. 杞崲涓轰繚瀛樻槑缁�
+ List<ErpPurchasePlanSaveReqVO.Item> planItems = convertList(suggestItems, item ->
+ BeanUtils.toBean(item, ErpPurchasePlanSaveReqVO.Item.class));
// 3. 鍒涘缓鑽夌閲囪喘璁″垝
ErpPurchasePlanSaveReqVO createReqVO = new ErpPurchasePlanSaveReqVO();
createReqVO.setName(name != null ? name : "搴撳瓨棰勮閲囪喘璁″垝");
createReqVO.setDemandSource(DEMAND_SOURCE_STOCK_ALERT);
createReqVO.setPlanDate(LocalDateTime.now());
createReqVO.setSupplierId(supplierId);
- createReqVO.setItems(items);
+ createReqVO.setItems(planItems);
Long planId = createPurchasePlan(createReqVO);
return purchasePlanMapper.selectById(planId);
}
+ /**
+ * 鏍规嵁鍗曚釜鐗╂枡鐨勯粯璁や粨搴撳簱瀛樻瀯寤哄缓璁噰璐槑缁�
+ *
+ * @param item 鐗╂枡鍩虹鏁版嵁
+ * @return 寤鸿閲囪喘鏄庣粏锛涙棤闇�琛ヨ揣鏃惰繑鍥� null
+ */
+ private ErpPurchasePlanRespVO.Item buildStockAlertSuggestItem(MdmItemRespDTO item) {
+ // 1. 鏈厤缃粯璁や粨搴撴垨鏈�浣庡簱瀛橈紙鏃犺ˉ璐у熀鍑嗭級鐨勭墿鏂欎笉鍙備笌瑙勫垝
+ if (item.getWarehouseId() == null || item.getMinStock() == null) {
+ return null;
+ }
+ // 2. 鏌ヨ榛樿浠撳簱鐨勫綋鍓嶅簱瀛�
+ BigDecimal currentStock = mesWmStockApi.getStockQuantity(item.getId(), item.getWarehouseId());
+ if (currentStock == null) {
+ currentStock = BigDecimal.ZERO;
+ }
+ // 3. 榛樿浠撳簱搴撳瓨涓嶄綆浜庢渶浣庡簱瀛樻椂涓嶈Е鍙戣ˉ璐�
+ if (currentStock.compareTo(item.getMinStock()) >= 0) {
+ return null;
+ }
+ // 4. 琛ヨ揣鐩爣锛氫紭鍏堣ˉ鍒板畨鍏ㄥ簱瀛橈紝鏈厤缃垯鍥炶惤鏈�楂樺簱瀛橈紝鏈�鍚庡彇鏈�浣庡簱瀛�
+ BigDecimal targetStock = item.getSafetyStock() != null ? item.getSafetyStock()
+ : (item.getMaxStock() != null ? item.getMaxStock() : item.getMinStock());
+ BigDecimal count = targetStock.subtract(currentStock);
+ if (count.compareTo(BigDecimal.ZERO) <= 0) {
+ return null;
+ }
+ ErpPurchasePlanRespVO.Item planItem = new ErpPurchasePlanRespVO.Item();
+ planItem.setProductId(item.getId());
+ planItem.setProductName(item.getName());
+ planItem.setProductUnitId(item.getUnitMeasureId());
+ planItem.setCount(count);
+ planItem.setDemandTime(LocalDate.now());
+ planItem.setRemark(String.format("榛樿浠撳簱搴撳瓨%s锛屽畨鍏ㄥ簱瀛�%s锛屾渶浣庡簱瀛�%s锛屾渶楂樺簱瀛�%s锛屽缓璁噰璐噺%s",
+ currentStock, item.getSafetyStock(), item.getMinStock(), item.getMaxStock(), count));
+ return planItem;
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public List<Long> generatePurchaseRequests(Long id) {
--
Gitblit v1.9.3