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/project/tool/gen/domain/GenTable.java | 96 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java b/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
index 98fb5fe..5cc81a0 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
@@ -28,12 +28,21 @@
@NotBlank(message = "琛ㄦ弿杩颁笉鑳戒负绌�")
private String tableComment;
+ /** 鍏宠仈鐖惰〃鐨勮〃鍚� */
+ private String subTableName;
+
+ /** 鏈〃鍏宠仈鐖惰〃鐨勫閿悕 */
+ private String subTableFkName;
+
/** 瀹炰綋绫诲悕绉�(棣栧瓧姣嶅ぇ鍐�) */
@NotBlank(message = "瀹炰綋绫诲悕绉颁笉鑳戒负绌�")
private String className;
- /** 浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔锛� */
+ /** 浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔 sub涓诲瓙琛ㄦ搷浣滐級 */
private String tplCategory;
+
+ /** 鍓嶇绫诲瀷锛坋lement-ui妯＄増 element-plus妯＄増锛� */
+ private String tplWebType;
/** 鐢熸垚鍖呰矾寰� */
@NotBlank(message = "鐢熸垚鍖呰矾寰勪笉鑳戒负绌�")
@@ -55,8 +64,17 @@
@NotBlank(message = "浣滆�呬笉鑳戒负绌�")
private String functionAuthor;
+ /** 鐢熸垚浠ｇ爜鏂瑰紡锛�0zip鍘嬬缉鍖� 1鑷畾涔夎矾寰勶級 */
+ private String genType;
+
+ /** 鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級 */
+ private String genPath;
+
/** 涓婚敭淇℃伅 */
private GenTableColumn pkColumn;
+
+ /** 瀛愯〃淇℃伅 */
+ private GenTable subTable;
/** 琛ㄥ垪淇℃伅 */
@Valid
@@ -75,7 +93,7 @@
private String treeName;
/** 涓婄骇鑿滃崟ID瀛楁 */
- private String parentMenuId;
+ private Long parentMenuId;
/** 涓婄骇鑿滃崟鍚嶇О瀛楁 */
private String parentMenuName;
@@ -110,6 +128,26 @@
this.tableComment = tableComment;
}
+ public String getSubTableName()
+ {
+ return subTableName;
+ }
+
+ public void setSubTableName(String subTableName)
+ {
+ this.subTableName = subTableName;
+ }
+
+ public String getSubTableFkName()
+ {
+ return subTableFkName;
+ }
+
+ public void setSubTableFkName(String subTableFkName)
+ {
+ this.subTableFkName = subTableFkName;
+ }
+
public String getClassName()
{
return className;
@@ -128,6 +166,16 @@
public void setTplCategory(String tplCategory)
{
this.tplCategory = tplCategory;
+ }
+
+ public String getTplWebType()
+ {
+ return tplWebType;
+ }
+
+ public void setTplWebType(String tplWebType)
+ {
+ this.tplWebType = tplWebType;
}
public String getPackageName()
@@ -180,6 +228,26 @@
this.functionAuthor = functionAuthor;
}
+ public String getGenType()
+ {
+ return genType;
+ }
+
+ public void setGenType(String genType)
+ {
+ this.genType = genType;
+ }
+
+ public String getGenPath()
+ {
+ return genPath;
+ }
+
+ public void setGenPath(String genPath)
+ {
+ this.genPath = genPath;
+ }
+
public GenTableColumn getPkColumn()
{
return pkColumn;
@@ -188,6 +256,16 @@
public void setPkColumn(GenTableColumn pkColumn)
{
this.pkColumn = pkColumn;
+ }
+
+ public GenTable getSubTable()
+ {
+ return subTable;
+ }
+
+ public void setSubTable(GenTable subTable)
+ {
+ this.subTable = subTable;
}
public List<GenTableColumn> getColumns()
@@ -240,12 +318,12 @@
this.treeName = treeName;
}
- public String getParentMenuId()
+ public Long getParentMenuId()
{
return parentMenuId;
}
- public void setParentMenuId(String parentMenuId)
+ public void setParentMenuId(Long parentMenuId)
{
this.parentMenuId = parentMenuId;
}
@@ -260,6 +338,16 @@
this.parentMenuName = parentMenuName;
}
+ public boolean isSub()
+ {
+ return isSub(this.tplCategory);
+ }
+
+ public static boolean isSub(String tplCategory)
+ {
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
+ }
+
public boolean isTree()
{
return isTree(this.tplCategory);
--
Gitblit v1.9.3