From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/common/constant/GenConstants.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/constant/GenConstants.java b/src/main/java/com/ruoyi/common/constant/GenConstants.java
index 0001785..e7382b3 100644
--- a/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -13,6 +13,9 @@
/** 鏍戣〃锛堝鍒犳敼鏌ワ級 */
public static final String TPL_TREE = "tree";
+ /** 涓诲瓙琛紙澧炲垹鏀规煡锛� */
+ public static final String TPL_SUB = "sub";
+
/** 鏍戠紪鐮佸瓧娈� */
public static final String TREE_CODE = "treeCode";
@@ -22,16 +25,24 @@
/** 鏍戝悕绉板瓧娈� */
public static final String TREE_NAME = "treeName";
+ /** 涓婄骇鑿滃崟ID瀛楁 */
+ public static final String PARENT_MENU_ID = "parentMenuId";
+
+ /** 涓婄骇鑿滃崟鍚嶇О瀛楁 */
+ public static final String PARENT_MENU_NAME = "parentMenuName";
+
/** 鏁版嵁搴撳瓧绗︿覆绫诲瀷 */
- public static final String[] COLUMNTYPE_STR = { "char", "varchar", "narchar", "varchar2", "tinytext", "text",
- "mediumtext", "longtext" };
+ public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+
+ /** 鏁版嵁搴撴枃鏈被鍨� */
+ public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
/** 鏁版嵁搴撴椂闂寸被鍨� */
public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
/** 鏁版嵁搴撴暟瀛楃被鍨� */
public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
- "bigint", "float", "float", "double", "decimal" };
+ "bit", "bigint", "float", "double", "decimal" };
/** 椤甸潰涓嶉渶瑕佺紪杈戝瓧娈� */
public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
@@ -68,6 +79,15 @@
/** 鏃ユ湡鎺т欢 */
public static final String HTML_DATETIME = "datetime";
+ /** 鍥剧墖涓婁紶鎺т欢 */
+ public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+
+ /** 鏂囦欢涓婁紶鎺т欢 */
+ public static final String HTML_FILE_UPLOAD = "fileUpload";
+
+ /** 瀵屾枃鏈帶浠� */
+ public static final String HTML_EDITOR = "editor";
+
/** 瀛楃涓茬被鍨� */
public static final String TYPE_STRING = "String";
@@ -89,6 +109,9 @@
/** 妯＄硦鏌ヨ */
public static final String QUERY_LIKE = "LIKE";
+ /** 鐩哥瓑鏌ヨ */
+ public static final String QUERY_EQ = "EQ";
+
/** 闇�瑕� */
public static final String REQUIRE = "1";
}
--
Gitblit v1.9.3