From 260dd6fe156265832544715192ce1491e9c2afd6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 26 六月 2026 13:41:13 +0800
Subject: [PATCH] fix(stock): 解决库存管理中的重复键异常问题 - 在采购台账服务中添加净合同金额字段设置 - 在销售台账服务中添加净合同金额字段设置 - 在入库记录服务中为库存插入操作添加重复键异常处理 - 在入库记录服务中为非库存插入操作添加重复键异常处理 - 在库存服务中为库存插入操作添加重复键异常处理 - 统一处理数据库唯一键约束冲突,避免系统错误

---
 src/main/java/com/ruoyi/common/constant/GenConstants.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/constant/GenConstants.java b/src/main/java/com/ruoyi/common/constant/GenConstants.java
index 65c2d7c..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";
 
@@ -29,8 +32,10 @@
     public static final String PARENT_MENU_NAME = "parentMenuName";
 
     /** 鏁版嵁搴撳瓧绗︿覆绫诲瀷 */
-    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "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" };
@@ -74,8 +79,11 @@
     /** 鏃ユ湡鎺т欢 */
     public static final String HTML_DATETIME = "datetime";
 
-    /** 涓婁紶鎺т欢 */
-    public static final String HTML_UPLOAD_IMAGE = "uploadImage";
+    /** 鍥剧墖涓婁紶鎺т欢 */
+    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+
+    /** 鏂囦欢涓婁紶鎺т欢 */
+    public static final String HTML_FILE_UPLOAD = "fileUpload";
 
     /** 瀵屾枃鏈帶浠� */
     public static final String HTML_EDITOR = "editor";
@@ -101,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