From d20acf38c36c11ee4428c3e74a17f5870dc61b51 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 09:51:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
model/test/product.go | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/model/test/product.go b/model/test/product.go
index e3d1951..9eeb50e 100644
--- a/model/test/product.go
+++ b/model/test/product.go
@@ -1,28 +1,28 @@
package test
-import "srm/global"
+import (
+ "srm/global"
+)
-// Product 缁撴瀯浣�
-type Product struct {
+// SupplierMaterial 缁撴瀯浣�
+type SupplierMaterial struct {
global.GVA_MODEL
- Name string `json:"name" form:"name" gorm:"column:name;comment:鍚嶇О;size:255;"`
- Number string `json:"number" form:"number" gorm:"column:number;comment:缂栫爜;size:255;"`
+ Name string `gorm:"type:varchar(191);not null;comment:鐗╂枡鍚嶇О" json:"name"`
+ Number string `json:"number" form:"number" gorm:"column:number;comment:鐗╂枡缂栫爜;size:255;"`
SupplierId uint `json:"supplierId" form:"supplierId" gorm:"column:supplier_id;comment:渚涘簲鍟唅d;size:255;"`
- Supplier Supplier `json:"supplier" gorm:"foreignKey:SupplierId;comment:渚涘簲鍟�"`
+ Supplier Supplier `json:"supplier" form:"supplier" gorm:"foreignKey:SupplierId;comment:渚涘簲鍟�"`
Unit string `json:"unit" form:"unit" gorm:"column:unit;comment:璁￠噺鍗曚綅;size:255;"`
PurchasePrice float64 `json:"purchasePrice" form:"purchasePrice" gorm:"column:purchase_price;comment:閲囪喘浠锋牸;"`
- DeliveryTime int `json:"deliveryTime" form:"deliveryTime" gorm:"column:delivery_time;comment:;size:11;"`
- ShippingDuration int `json:"shippingDuration" form:"shippingDuration" gorm:"column:shipping_duration;comment:鐗╂祦鏃堕暱;size:11;"`
+ DeliveryTime int `json:"deliveryTime" form:"deliveryTime" gorm:"column:delivery_time;comment:;size:11;"` //渚涜揣鏃堕暱
+ ShippingDuration int `json:"shippingDuration" form:"shippingDuration" gorm:"column:shipping_duration;comment:鐗╂祦鏃堕暱;size:11;"` //鐗╂祦鏃堕暱
Specifications string `json:"specifications" form:"specifications" gorm:"column:specifications;comment:瑙勬牸;size:255;"`
ModelNumber string `json:"modelNumber" form:"modelNumber" gorm:"column:model_number;comment:鍨嬪彿;size:255;"`
- ProductType string `json:"productType" form:"productType" gorm:"column:product_type;comment:浜у搧绫诲埆;size:255;"`
- MinimumStock int `json:"minimumStock" form:"minimumStock" gorm:"column:minimum_stock;comment:鏈�浣庡簱瀛�;"`
- MaximumStock int `json:"maximumStock" form:"maximumStock" gorm:"column:maximum_stock;comment:鏈�楂樺簱瀛�;"`
- Remark string `json:"remark" form:"remark" gorm:"column:remark;comment:澶囨敞;size:255;"`
- SupplierName string `json:"supplierName" gorm:"-"`
+ MinimumStock int64 `json:"minimumStock" form:"minimumStock" gorm:"column:minimum_stock;comment:鏈�浣庡簱瀛�;"`
+ MaximumStock int64 `json:"maximumStock" form:"maximumStock" gorm:"column:maximum_stock;comment:鏈�楂樺簱瀛�;"`
+ CategoryName string `gorm:"type:varchar(255);comment:浜у搧绫诲埆鍚嶇О" json:"categoryName"` //浜у搧绫诲埆鍚嶇О
}
// TableName Product 琛ㄥ悕
-func (Product) TableName() string {
- return "srm_product"
+func (SupplierMaterial) TableName() string {
+ return "srm_supplier_material"
}
--
Gitblit v1.8.0