From a6f82a1a1cbb4a3dfde004cf29b91c9b4c7da7c3 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 19 九月 2023 19:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
models/product_category.go | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/models/product_category.go b/models/product_category.go
index 1f66731..1658605 100644
--- a/models/product_category.go
+++ b/models/product_category.go
@@ -10,15 +10,14 @@
type (
// ProductCategory 浜у搧鍒嗙被
ProductCategory struct {
- WmsModel
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浣嶇疆鍚嶇О"` //浣嶇疆鍚嶇О
- ParentId int `json:"parentId" gorm:"type:int;not null"` //涓婄骇id
- CompanyId int `json:"companyId" gorm:"type:int;not null"` //鍏徃id
- Company Company `json:"company" gorm:"foreignKey:CompanyId"` //鍏徃
- ForceRemovalStrategy constvar.ForceRemovalStrategy `json:"forceRemovalStrategy" gorm:"type:tinyint;not null;comment:寮哄埗涓嬫灦绛栫暐"` //寮哄埗涓嬫灦绛栫暐
- CostingMethod constvar.CostingMethod `json:"costingMethod" gorm:"type:tinyint;not null;comment:鎴愭湰鏂规硶"` //鎴愭湰鏂规硶
- InventoryValuation constvar.InventoryValuation `json:"inventoryValuation" gorm:"type:tinyint;not null;comment:鎴愭湰鏂规硶"` //搴撳瓨璁′环
+ BaseModelInt
+ Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:鍒嗙被鍚嶇О"` //浣嶇疆鍚嶇О
+ ParentId int `json:"parentId" gorm:"type:int;comment:涓婄骇鍒嗙被id"` //涓婄骇id
+ RouteId int `json:"routeId" gorm:"type:int;comment:璺嚎id"`
+ RouteName string `json:"routeName" gorm:"type:varchar(512);comment:璺嚎鍚嶇О"` //鍏徃
+ ForceRemovalStrategy constvar.ForceRemovalStrategy `json:"forceRemovalStrategy" gorm:"type:tinyint;comment:寮哄埗涓嬫灦绛栫暐"` //寮哄埗涓嬫灦绛栫暐
+ CostingMethod constvar.CostingMethod `json:"costingMethod" gorm:"type:tinyint;comment:鎴愭湰鏂规硶"` //鎴愭湰鏂规硶
+ InventoryValuation constvar.InventoryValuation `json:"inventoryValuation" gorm:"type:tinyint;comment:搴撳瓨璁′环"` //搴撳瓨璁′环
}
ProductCategorySearch struct {
@@ -33,7 +32,7 @@
)
func (slf *ProductCategory) TableName() string {
- return "wms_ProductCategory"
+ return "wms_product_category"
}
func NewProductCategorySearch() *ProductCategorySearch {
--
Gitblit v1.8.0