From 137441e2396cf231f9d41e5c399038dbfe01433f Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期二, 16 七月 2024 20:24:55 +0800
Subject: [PATCH] 添加字段，库存报表统计返回结果添加productType（产品类别）、productSpecs（产品规格），产品类别由原来的productType改为productCategory
---
models/location_product_amount.go | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/models/location_product_amount.go b/models/location_product_amount.go
index 6b82f7c..2c59969 100644
--- a/models/location_product_amount.go
+++ b/models/location_product_amount.go
@@ -9,11 +9,12 @@
)
type (
+ // LocationProductAmount 搴撳瓨浜у搧鏁伴噺
LocationProductAmount struct {
WmsModel
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- LocationId int `json:"locationId" gorm:"type:int;not null;comment:浣嶇疆id"` //浣嶇疆id
- WarehouseId int `json:"warehouseId" gorm:"type:int;not null;default:0;comment:浠撳簱id"`
+ LocationId int `json:"locationId" gorm:"type:int;not null;comment:浣嶇疆id"` //浣嶇疆id
+ WarehouseId int `json:"warehouseId" gorm:"type:int;not null;default:0;comment:浠撳簱id"` // 浠撳簱id
Location Location `json:"location" gorm:"foreignKey:LocationId;references:id"`
ProductCategoryID int `json:"productCategoryId" gorm:"type:int;not null;comment:浜у搧绉嶇被id"` //浜у搧绉嶇被id
ProductCategory ProductCategory `json:"productCategory" gorm:"foreignKey:ProductCategoryID;references:Id"`
@@ -48,14 +49,14 @@
ProductName string `json:"productName" gorm:"column:product_name"`
Amount decimal.Decimal `json:"amount" gorm:"column:amount"`
AmountMoreUnits []UnitItems `json:"amountMoreUnits" gorm:"-"` //鍦ㄥ簱鏁伴噺澶氬崟浣�
- Unit string `json:"unit" gorm:"column:unit"`
- CreateDate string `json:"createDate" gorm:"column:create_date"`
+ Unit string `json:"unit" gorm:"column:unit;size:50;comment:鐗╁搧鍗曚綅"`
+ CreateDate string `json:"createDate" gorm:"column:create_date;size:50;comment:鍒涘缓鏃堕棿"`
AdjustAmount decimal.Decimal `json:"adjustAmount" gorm:"column:adjust_amount"` //宸��
DifferenceAmount decimal.Decimal `json:"differenceAmount" gorm:"-"` //璁℃暟鏁伴噺
- OperationId int `json:"operationId" gorm:"column:operation_id"`
- Status constvar.OperationStatus `json:"status" gorm:"status"`
- BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"base_operation_type"`
- Weight decimal.Decimal `gorm:"type:decimal(20,3);comment:閲嶉噺" json:"weight"` //閲嶉噺
+ OperationId int `json:"operationId" gorm:"column:operation_id;comment:搴撳瓨鎿嶄綔璁板綍"`
+ Status constvar.OperationStatus `json:"status" gorm:";comment:鎿嶄綔鐘舵��(3灏辩华銆�4瀹屾垚銆�5鍙栨秷)"` // 鎿嶄綔鐘舵��
+ BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"base_operation_type;comment:鍩虹浣滀笟绫诲瀷"` // 鍩虹浣滀笟绫诲瀷
+ Weight decimal.Decimal `gorm:"type:decimal(20,3);comment:閲嶉噺" json:"weight"` //閲嶉噺
}
)
--
Gitblit v1.8.0