From da154e5c758c3b67202390debdc5331a8f68c685 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期六, 29 六月 2024 18:25:22 +0800
Subject: [PATCH] 库存结算时间点添加数据初始化任务

---
 models/operation.go |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/models/operation.go b/models/operation.go
index b8aab80..9caeb40 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -26,7 +26,7 @@
 		OperationDate     string                   `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"`
 		ContacterID       int                      `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"`
 		ContacterName     string                   `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"`
-		CompanyID         int                      `json:"companyID" gorm:"type:int;comment:鍏徃ID-瀹㈡埛"`
+		CompanyID         string                   `json:"companyID" gorm:"type:varchar(255);comment:鍏徃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"`
@@ -57,6 +57,14 @@
 		Accountant   string `json:"accountant" gorm:"type:varchar(255);comment:浼氳鍚嶇О"`
 		CustodianId  string `json:"custodianId" gorm:"type:varchar(255);comment:淇濈鍛榠d"`
 		Custodian    string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"`
+		CreatedBy    string `json:"createBy" gorm:"type:varchar(255);comment:鍒涘缓鑰匲serId"`
+		CheckedBy    string `json:"checkedBy" gorm:"type:varchar(255);comment:楠岃瘉鑰匲serId"`
+		Remark       string `json:"remark"`
+
+		WarehouseId         int      `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"`
+		IsInternalOutput    bool     `json:"isInternalOutput"` //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
+		InventoryDealerType int      `json:"inventoryDealerType" gorm:"type:varchar(255);comment:浼氳鍚嶇О"`
+		InventoryDealer     MiniDict `json:"inventoryDealer" gorm:"foreignKey:InventoryDealerType;"`
 	}
 
 	OperationSearch struct {
@@ -212,7 +220,7 @@
 	}
 
 	if slf.Preload {
-		db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("LogisticCompany").Preload("Location").Preload("ToLocation").Preload("Details.FromLocation").Preload("Details.ToLocation")
+		db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("LogisticCompany").Preload("Location").Preload("ToLocation").Preload("Details.FromLocation").Preload("Details.ToLocation").Preload("InventoryDealer")
 	}
 
 	if slf.Disuse {

--
Gitblit v1.8.0