From eae7648dfc2085a849401f9e49de184002f1cece Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 21 九月 2023 17:46:31 +0800
Subject: [PATCH] 1.出入库一部分代码

---
 models/operation.go |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/models/operation.go b/models/operation.go
index 60b8b5a..d1c7545 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -11,21 +11,22 @@
 	// Operation 鎿嶄綔琛�
 	Operation struct {
 		WmsModel
-		Id              int                      `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
-		Number          string                   `json:"number" gorm:"type:varchar(255)"`                                 //鍗曞彿
-		SourceNumber    string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                           //婧愬崟鍙�
-		OperationTypeId int                      `json:"operationTypeId" gorm:"type:int;not null;comment:浣滀笟绫诲瀷id"`         //浣滀笟绫诲瀷id
-		Status          constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:鐘舵��"`                  //鐘舵��
-		FromLocationID  int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:婧愪綅缃甶d"`         //婧愪綅缃甶d
-		FromLocation    Location                 `json:"fromLocation"     gorm:"foreignKey:FromLocationID;references:Id"` //婧愪綅缃�
-		ToLocationID    int                      `json:"toLocationId"    gorm:"type:int;not null;comment:鐩爣浣嶇疆id"`         //鐩爣浣嶇疆id
-		ToLocation      Location                 `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"`    //鐩爣浣嶇疆
-		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-瀹㈡埛"`
-		CompanyName     string                   `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О-瀹㈡埛"`
-		Comment         string                   `json:"comment" gorm:"type:text;comment:澶囨敞"`
+		Id                int                      `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+		Number            string                   `json:"number" gorm:"type:varchar(255)"`                                 //鍗曞彿
+		SourceNumber      string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                           //婧愬崟鍙�
+		OperationTypeId   int                      `json:"operationTypeId" gorm:"type:int;not null;comment:浣滀笟绫诲瀷id"`         //浣滀笟绫诲瀷id
+		OperationTypeName string                   `json:"operationTypeName" gorm:"type:varchar(127);comment:浣滀笟绫诲瀷鍚嶇О"`       //浣滀笟绫诲瀷鍚嶇О
+		Status            constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:鐘舵��"`                  //鐘舵��
+		FromLocationID    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:婧愪綅缃甶d"`         //婧愪綅缃甶d
+		FromLocation      Location                 `json:"fromLocation"     gorm:"foreignKey:FromLocationID;references:Id"` //婧愪綅缃�
+		ToLocationID      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:鐩爣浣嶇疆id"`         //鐩爣浣嶇疆id
+		ToLocation        Location                 `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"`    //鐩爣浣嶇疆
+		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-瀹㈡埛"`
+		CompanyName       string                   `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О-瀹㈡埛"`
+		Comment           string                   `json:"comment" gorm:"type:text;comment:澶囨敞"`
 
 		Details []*OperationDetails `json:"details" gorm:"foreignKey:OperationID;references:Id"`
 
@@ -93,8 +94,8 @@
 func (slf *OperationSearch) build() *gorm.DB {
 	var db = slf.Orm.Model(&Operation{})
 
-	if slf.ID != 0 {
-		db = db.Where("id = ?", slf.ID)
+	if slf.Id != 0 {
+		db = db.Where("id = ?", slf.Id)
 	}
 	if slf.Order != "" {
 		db = db.Order(slf.Order)

--
Gitblit v1.8.0