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/controller/admin/purchase/vo/plan/ErpPurchasePlanRespVO.java | 3 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java | 100 ++++++++++++++++++++++++---------
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/MesWmStockApiImpl.java | 6 ++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java | 2
.gitignore | 4 +
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/MesWmStockApi.java | 9 +++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanService.java | 11 +++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchasePlanController.java | 16 +++++
yudao-server/src/main/resources/application-local.yaml | 4
9 files changed, 124 insertions(+), 31 deletions(-)
diff --git a/.gitignore b/.gitignore
index d2da0c0..6782ea1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,6 @@
### Claude Code ###
.claude/settings.local.json
.claude/worktrees/
-.claude/scheduled_tasks.json
\ No newline at end of file
+.claude/scheduled_tasks.json
+
+/.export_tmp
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchasePlanController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchasePlanController.java
index 6f85bef..a4ce778 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchasePlanController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchasePlanController.java
@@ -157,6 +157,22 @@
return success(plan.getId());
}
+ @GetMapping("/get-stock-alert-suggest-items")
+ @Operation(summary = "鑾峰彇搴撳瓨棰勮寤鸿閲囪喘鏄庣粏", description = "閬嶅巻鍚敤瀹夊叏搴撳瓨鐨勭墿鏂欙紝鎸夐粯璁や粨搴撶己閲忚繑鍥炲缓璁噰璐槑缁嗭紝涓嶈惤搴�")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-plan:create')")
+ public CommonResult<List<ErpPurchasePlanRespVO.Item>> getStockAlertSuggestItems() {
+ List<ErpPurchasePlanRespVO.Item> items = purchasePlanService.getStockAlertSuggestItems();
+ if (CollUtil.isEmpty(items)) {
+ return success(items);
+ }
+ // 1.2 鍗曚綅淇℃伅
+ Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
+ convertSet(items, ErpPurchasePlanRespVO.Item::getProductUnitId));
+ items.forEach(item -> MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(),
+ unit -> item.setProductUnitName(unit.getName())));
+ return success(items);
+ }
+
@PostMapping("/generate-requests")
@Operation(summary = "鐢熸垚閲囪喘鐢宠")
@PreAuthorize("@ss.hasPermission('erp:purchase-plan:generate-request')")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/plan/ErpPurchasePlanRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/plan/ErpPurchasePlanRespVO.java
index 8463903..9950d04 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/plan/ErpPurchasePlanRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/plan/ErpPurchasePlanRespVO.java
@@ -37,6 +37,9 @@
@Schema(description = "闇�姹傛潵婧愬悕绉�", example = "搴撳瓨棰勮")
private String demandSourceName;
+ @Schema(description = "宸ヤ綔娴佺紪鍙�", example = "b2c6c8f9-...")
+ private String processInstanceId;
+
@Schema(description = "璁″垝鏃ユ湡")
@ExcelProperty("璁″垝鏃ユ湡")
private LocalDateTime planDate;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
index 908c5ac..91c56d0 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
@@ -67,6 +67,8 @@
ErrorCode PURCHASE_PLAN_BPM_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_104_018, "閲囪喘璁″垝瀹℃壒鍒嗙被涓嶅瓨鍦紝璇峰厛鍦˙PM妯″潡鍒涘缓閲囪喘璁″垝瀹℃壒娴佺▼鍒嗙被");
ErrorCode PURCHASE_PLAN_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_030_104_019, "閲囪喘璁″垝瀹℃壒鍒嗙被涓嬫病鏈夊彲鐢ㄧ殑娴佺▼妯″瀷锛岃鍏堝垱寤哄苟鍙戝竷娴佺▼");
ErrorCode PURCHASE_PLAN_ITEM_EMPTY = new ErrorCode(1_030_104_020, "閲囪喘璁″垝鏄庣粏涓嶈兘涓虹┖");
+ ErrorCode PURCHASE_PLAN_STOCK_ALERT_NO_ITEM = new ErrorCode(1_030_104_022,
+ "娌℃湁绗﹀悎搴撳瓨棰勮鏉′欢鐨勭墿鏂欙紝璇锋鏌ョ墿鏂欐槸鍚﹂厤缃粯璁や粨搴撳拰鏈�浣庡簱瀛橈紝骞剁‘璁ゅ綋鍓嶅簱瀛樹綆浜庢渶浣庡簱瀛�");
// ========== ERP 閲囪喘鏉ョエ锛�1-030-105-000锛� ==========
ErrorCode PURCHASE_INVOICE_NOT_EXISTS = new ErrorCode(1_030_105_000, "鏉ョエ涓嶅瓨鍦�");
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanService.java
index 954d1d4..2189c51 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanService.java
@@ -2,6 +2,7 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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;
@@ -96,6 +97,16 @@
void updatePurchasePlanAuditStatus(Long id, Integer bpmResult);
/**
+ * 鑾峰彇搴撳瓨棰勮寤鸿閲囪喘鏄庣粏
+ *
+ * <p>閬嶅巻鍚敤瀹夊叏搴撳瓨鐨勭墿鏂欙紝鎸夐粯璁や粨搴撳綋鍓嶅簱瀛樹綆浜庢渶浣庡簱瀛樻椂锛�
+ * 琛ヨ冻鍒板畨鍏ㄥ簱瀛橈紙鏈厤缃垯鍥炶惤鏈�楂�/鏈�浣庡簱瀛橈級寰楀埌寤鸿閲囪喘鏄庣粏锛屼笉钀藉簱锛屼緵鏂板寮圭獥鍥炲～鏍稿銆�
+ *
+ * @return 寤鸿閲囪喘鏄庣粏鍒楄〃
+ */
+ List<ErpPurchasePlanRespVO.Item> getStockAlertSuggestItems();
+
+ /**
* 鏍规嵁搴撳瓨棰勮鑷姩鐢熸垚閲囪喘璁″垝锛堣崏绋匡級
*
* <p>閬嶅巻鍚敤瀹夊叏搴撳瓨鐨勭墿鏂欙紝褰撳墠搴撳瓨浣庝簬瀹夊叏搴撳瓨涓嬮檺鏃讹紝
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) {
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/MesWmStockApi.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/MesWmStockApi.java
index 62af579..eee0ec0 100644
--- a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/MesWmStockApi.java
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/MesWmStockApi.java
@@ -17,4 +17,13 @@
*/
BigDecimal getStockQuantity(Long itemId);
+ /**
+ * 鑾峰彇鐗╂枡鍦ㄦ寚瀹氫粨搴撶殑搴撳瓨鎬婚噺
+ *
+ * @param itemId 鐗╂枡ID
+ * @param warehouseId 浠撳簱ID
+ * @return 搴撳瓨鏁伴噺
+ */
+ BigDecimal getStockQuantity(Long itemId, Long warehouseId);
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/MesWmStockApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/MesWmStockApiImpl.java
index abcccbb..cc3a229 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/MesWmStockApiImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/MesWmStockApiImpl.java
@@ -23,8 +23,14 @@
@Override
public BigDecimal getStockQuantity(Long itemId) {
+ return getStockQuantity(itemId, null);
+ }
+
+ @Override
+ public BigDecimal getStockQuantity(Long itemId, Long warehouseId) {
MesWmMaterialStockListReqVO reqVO = new MesWmMaterialStockListReqVO();
reqVO.setItemId(itemId);
+ reqVO.setWarehouseId(warehouseId);
List<MesWmMaterialStockDO> stockList = materialStockMapper.selectList(reqVO);
if (CollUtil.isEmpty(stockList)) {
return BigDecimal.ZERO;
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 50a63a0..61026f9 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -65,7 +65,7 @@
primary: master
datasource:
master:
- url: jdbc:mysql://localhost:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+ url: jdbc:mysql://localhost:3306/mom-xgdl?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
username: root
password: 123456
@@ -75,7 +75,7 @@
host: localhost # 鍦板潃
port: 6379 # 绔彛
database: 0 # 鏁版嵁搴撶储寮�
- password: 123456
+# password: 123456
--- #################### 瀹氭椂浠诲姟鐩稿叧閰嶇疆 ####################
--
Gitblit v1.9.3