Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

jiangshuai

2023-09-19 a6f82a1a1cbb4a3dfde004cf29b91c9b4c7da7c3

 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 {