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 |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/models/operation.go b/models/operation.go
index 954306a..9caeb40 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -51,15 +51,20 @@
 		ToLocation         Location `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆
 		SalesDetailsNumber string   `gorm:"type:varchar(191);comment:閿�鍞槑缁嗙紪鐮�" json:"salesDetailsNumber"`
 
-		ManagerId    string    `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"`
-		Manager      string    `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"`
-		AccountantId string    `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"`
-		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"`
-		CheckedAt    time.Time `json:"checkedAt" gorm:"type:datetime;comment:楠岃瘉鑰呴獙璇佹搷浣滄椂闂�"`
+		ManagerId    string `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"`
+		Manager      string `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"`
+		AccountantId string `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"`
+		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 {
@@ -215,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