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/mapper.java.vm |   80 ++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/main/resources/vm/java/mapper.java.vm b/src/main/resources/vm/java/mapper.java.vm
index 4c02b0f..585c817 100644
--- a/src/main/resources/vm/java/mapper.java.vm
+++ b/src/main/resources/vm/java/mapper.java.vm
@@ -1,6 +1,7 @@
 package ${packageName}.mapper;
 
 import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import ${packageName}.domain.${ClassName};
 #if($table.sub)
 import ${packageName}.domain.${subClassName};
@@ -8,23 +9,22 @@
 
 /**
  * ${functionName}Mapper鎺ュ彛
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
-{
+public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
     /**
      * 鏌ヨ${functionName}
-     * 
-     * @param ${pkColumn.javaField} ${functionName}ID
+     *
+     * @param ${pkColumn.javaField} ${functionName}涓婚敭
      * @return ${functionName}
      */
-    public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 鏌ヨ${functionName}鍒楄〃
-     * 
+     *
      * @param ${className} ${functionName}
      * @return ${functionName}闆嗗悎
      */
@@ -32,7 +32,7 @@
 
     /**
      * 鏂板${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 缁撴灉
      */
@@ -40,7 +40,7 @@
 
     /**
      * 淇敼${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 缁撴灉
      */
@@ -48,44 +48,44 @@
 
     /**
      * 鍒犻櫎${functionName}
-     * 
-     * @param ${pkColumn.javaField} ${functionName}ID
+     *
+     * @param ${pkColumn.javaField} ${functionName}涓婚敭
      * @return 缁撴灉
      */
-    public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 鎵归噺鍒犻櫎${functionName}
-     * 
-     * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁ID
+     *
+     * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
      * @return 缁撴灉
      */
-    public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-#if($table.sub)
+    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    #if($table.sub)
 
-    /**
-     * 鎵归噺鍒犻櫎${subTable.functionName}
-     * 
-     * @param customerIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
-     * @return 缁撴灉
-     */
-    public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-    
-    /**
-     * 鎵归噺鏂板${subTable.functionName}
-     * 
-     * @param ${subclassName}List ${subTable.functionName}鍒楄〃
-     * @return 缁撴灉
-     */
-    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
-    
+        /**
+         * 鎵归噺鍒犻櫎${subTable.functionName}
+         *
+         * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+         * @return 缁撴灉
+         */
+        public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
 
-    /**
-     * 閫氳繃${functionName}ID鍒犻櫎${subTable.functionName}淇℃伅
-     * 
-     * @param roleId 瑙掕壊ID
-     * @return 缁撴灉
-     */
-    public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
-#end
+        /**
+         * 鎵归噺鏂板${subTable.functionName}
+         *
+         * @param ${subclassName}List ${subTable.functionName}鍒楄〃
+         * @return 缁撴灉
+         */
+        public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
+
+
+        /**
+         * 閫氳繃${functionName}涓婚敭鍒犻櫎${subTable.functionName}淇℃伅
+         *
+         * @param ${pkColumn.javaField} ${functionName}ID
+         * @return 缁撴灉
+         */
+        public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
+    #end
 }

--
Gitblit v1.9.3