diff --git a/app/admin/models/inventory_change.go b/app/admin/models/inventory_change.go
index 8383e9e..f466eaa 100644
--- a/app/admin/models/inventory_change.go
+++ b/app/admin/models/inventory_change.go
@@ -8,6 +8,7 @@ import (
 	"go-admin/logger"
 	"go-admin/tools"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 	"math/rand"
 	"time"
 )
@@ -690,9 +691,14 @@ func handleInventoryAdd(gdb *gorm.DB, changeOrder ErpInventoryChangeOrder) error
 				Count:                 v.Count,
 				DispatchCount:         0,
 			}
-			err = gdb.Create(stock).Error
+			// 使用带冲突处理的插入操作
+			err = gdb.Clauses(clause.OnConflict{
+				Columns:   []clause.Column{{Name: "store_id"}, {Name: "erp_commodity_id"}},                      // 唯一约束字段
+				DoUpdates: clause.Assignments(map[string]interface{}{"count": gorm.Expr("count + ?", v.Count)}), // 冲突时累加 count
+			}).Create(stock).Error
+
 			if err != nil {
-				logger.Errorf("create stock err:", err)
+				logger.Errorf("create or update stock err:", err)
 				return err
 			}
 		}
diff --git a/app/admin/models/inventory_product.go b/app/admin/models/inventory_product.go
index a802649..add47bc 100644
--- a/app/admin/models/inventory_product.go
+++ b/app/admin/models/inventory_product.go
@@ -8,6 +8,7 @@ import (
 	"go-admin/logger"
 	"go-admin/tools"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 	"math/rand"
 	"time"
 )
@@ -648,9 +649,14 @@ func productAuditAndUpdateStock(gdb *gorm.DB, productOrder ErpInventoryProductOr
 				Count:                 v.Count,
 				DispatchCount:         0,
 			}
-			err = gdb.Create(stock).Error
+			// 使用带冲突处理的插入操作
+			err = gdb.Clauses(clause.OnConflict{
+				Columns:   []clause.Column{{Name: "store_id"}, {Name: "erp_commodity_id"}},                      // 唯一约束字段
+				DoUpdates: clause.Assignments(map[string]interface{}{"count": gorm.Expr("count + ?", v.Count)}), // 冲突时累加 count
+			}).Create(stock).Error
+
 			if err != nil {
-				logger.Errorf("create stock err:", err)
+				logger.Errorf("create or update stock err:", err)
 				return err
 			}
 		}