From ea0cff094c11ffe6c16daf5faf4b4e02aa234412 Mon Sep 17 00:00:00 2001
From: dsmzx <dsmzx@123.com>
Date: 星期二, 25 六月 2024 13:53:36 +0800
Subject: [PATCH] 出库/入库 打印 fileTemplateAttachment中添加仓库id和const中添加两个模板属性
---
request/operation.go | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/request/operation.go b/request/operation.go
index df57d21..bc4942e 100644
--- a/request/operation.go
+++ b/request/operation.go
@@ -18,7 +18,7 @@
Details []*OperationDetails `json:"details"`
ContacterID int `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"` //鑱旂郴浜篒D-闈炲繀濉�
ContacterName string `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"` //鑱旂郴浜哄鍚�-闈炲繀濉�
- CompanyID int `json:"companyID" gorm:"type:int;comment:鍏徃ID"` //鍏徃ID-瀹㈡埛
+ CompanyID string `json:"companyID"` //鍏徃ID-瀹㈡埛
CompanyName string `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О"` //鍏徃鍚嶇О-瀹㈡埛鍚嶇О
Comment string `json:"comment" gorm:"type:text;comment:澶囨敞"` //澶囨敞
LogisticCompanyId string `json:"logisticCompanyId" gorm:"type:varchar(191);comment:鐗╂祦鍏徃id"`
@@ -51,6 +51,10 @@
TotalNetWeight decimal.Decimal `json:"totalNetWeight" gorm:"type:decimal(20,3);comment:鎬诲噣閲�"` //鎬诲噣閲�
AuxiliaryAmount decimal.Decimal `json:"auxiliaryAmount" gorm:"type:decimal(20,3);comment:杈呭姪鏁伴噺"` //杈呭姪鏁伴噺
AuxiliaryUnit string `json:"auxiliaryUnit" gorm:"type:varchar(191);comment:杈呭姪鍗曚綅"` //杈呭姪鍗曚綅
+ Remark string `gorm:"type:varchar(1024);comment:澶囨敞" json:"remark"`
+
+ Cost decimal.Decimal `json:"cost"` //鎴愭湰鍗曚环
+ SalePrice decimal.Decimal `json:"salePrice"` //閿�鍞崟浠�
}
type OperationList struct {
@@ -73,7 +77,7 @@
Details []*OperationDetails `json:"details"`
ContacterID int `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"` //鑱旂郴浜篒D-闈炲繀濉�
ContacterName string `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"` //鑱旂郴浜哄鍚�-闈炲繀濉�
- CompanyID int `json:"companyID" gorm:"type:int;comment:鍏徃ID"` //鍏徃ID-瀹㈡埛
+ CompanyID string `json:"companyID"` //鍏徃ID-瀹㈡埛
CompanyName string `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О"` //鍏徃鍚嶇О-瀹㈡埛鍚嶇О
Comment string `json:"comment" gorm:"type:text;comment:澶囨敞"` //澶囨敞
BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` //鍩虹浣滀笟绫诲瀷
@@ -102,5 +106,8 @@
type OperationCondition struct {
PageInfo
- Condition string `json:"condition"`
+ Condition string `json:"condition"`
+ Keyword string `json:"keyword" form:"keyword"` //鍏抽敭瀛楁悳绱�
+ WarehouseId int `json:"warehouseId" form:"warehouseId"` //浠撳簱ID
+ LocationId int `json:"locationId" form:"locationId"` //浣嶇疆ID
}
--
Gitblit v1.8.0