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/resources/vm/java/domain.java.vm | 135 +++++++++++++++++++++++---------------------
1 files changed, 71 insertions(+), 64 deletions(-)
diff --git a/src/main/resources/vm/java/domain.java.vm b/src/main/resources/vm/java/domain.java.vm
index c2098c5..c65f933 100644
--- a/src/main/resources/vm/java/domain.java.vm
+++ b/src/main/resources/vm/java/domain.java.vm
@@ -3,103 +3,110 @@
#foreach ($import in $importList)
import ${import};
#end
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.rchuing.sis.common.annotation.Excel;
#if($table.crud || $table.sub)
-import com.ruoyi.framework.web.domain.BaseEntity;
+import com.rchuing.sis.common.core.domain.BaseEntity;
#elseif($table.tree)
-import com.ruoyi.framework.web.domain.TreeEntity;
+import com.fenghuang.common.core.domain.TreeEntity;
#end
/**
* ${functionName}瀵硅薄 ${tableName}
- *
+ *
* @author ${author}
* @date ${datetime}
*/
#if($table.crud || $table.sub)
-#set($Entity="BaseEntity")
+ #set($Entity="BaseEntity")
#elseif($table.tree)
-#set($Entity="TreeEntity")
+ #set($Entity="TreeEntity")
#end
+@TableName(resultMap = "${packageName}.mapper.${ClassName}Mapper.${ClassName}Result")
public class ${ClassName} extends ${Entity}
-{
- private static final long serialVersionUID = 1L;
+ {
+private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
+ #if(!$table.isSuperColumn($column.javaField))
/** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($parentheseIndex != -1)
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
-#else
- @Excel(name = "${comment}")
-#end
-#end
+ #if($column.list)
+ #set($parentheseIndex=$column.columnComment.indexOf("锛�"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #if($parentheseIndex != -1)
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ #elseif($column.javaType == 'Date')
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+ #else
+ @Excel(name = "${comment}")
+ #end
+ #end
+ #if($column.isPk == 1)
+ @TableId(value = "$column.columnName",type = IdType.AUTO)
+ #end
private $column.javaType $column.javaField;
-#end
+ #end
#end
#if($table.sub)
- /** $table.subTable.functionName淇℃伅 */
- private List<${subClassName}> ${subclassName}List;
+/** $table.subTable.functionName淇℃伅 */
+private List<${subClassName}> ${subclassName}List;
#end
#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
- public void set${AttrName}($column.javaType $column.javaField)
- {
- this.$column.javaField = $column.javaField;
- }
+ #if(!$table.isSuperColumn($column.javaField))
+ #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+ #set($AttrName=$column.javaField)
+ #else
+ #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ #end
+ public void set${AttrName}($column.javaType $column.javaField)
+ {
+ this.$column.javaField = $column.javaField;
+ }
- public $column.javaType get${AttrName}()
- {
- return $column.javaField;
- }
+ public $column.javaType get${AttrName}()
+ {
+ return $column.javaField;
+ }
+ #end
+#end
-#end
-#end
#if($table.sub)
- public List<${subClassName}> get${subClassName}List()
- {
+public List<${subClassName}> get${subClassName}List()
+ {
return ${subclassName}List;
- }
+ }
- public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
- {
+public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
+ {
this.${subclassName}List = ${subclassName}List;
- }
+ }
#end
- @Override
- public String toString() {
+@Override
+public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
+ #foreach ($column in $columns)
+ #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+ #set($AttrName=$column.javaField)
+ #else
+ #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ #end
.append("${column.javaField}", get${AttrName}())
-#end
-#if($table.sub)
+ #end
+ #if($table.sub)
.append("${subclassName}List", get${subClassName}List())
-#end
- .toString();
- }
-}
+ #end
+ .toString();
+ }
+ }
--
Gitblit v1.9.3