From f3b1ba6c5d2f8f479b41e4e36093322d383b4e9c Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 20 九月 2023 19:32:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 models/operation_details.go |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/models/operation_details.go b/models/operation_details.go
index 6792f45..7901215 100644
--- a/models/operation_details.go
+++ b/models/operation_details.go
@@ -12,12 +12,12 @@
 	OperationDetails struct {
 		WmsModel
 
-		Id             int             `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
-		OperationId    int             `json:"OperationId" gorm:"type:int;not null;comment:鎿嶄綔璁板綍id"`          //鎿嶄綔id
-		ProductId      int             `json:"productId" gorm:"type:int;not null;comment:浜у搧id"`              //浜у搧id
-		ProductName    string          `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"`   //浜у搧鍚嶇О
-		Quantity       decimal.Decimal `json:"quantity" gorm:"type:decimal(20,2);not null;comment:鏁伴噺"`       //鏁伴噺
-		FinishQuantity decimal.Decimal `json:"finishQuantity" gorm:"type:decimal(20,2);not null;comment:鏁伴噺"` //瀹屾垚鏁伴噺
+		Id          int             `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+		OperationId int             `json:"OperationId" gorm:"type:int;not null;comment:鎿嶄綔璁板綍id"`        //鎿嶄綔id
+		ProductId   string          `json:"productId" gorm:"type:varchar(191);not null;comment:浜у搧id"`   //浜у搧id
+		ProductName string          `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
+		Quantity    decimal.Decimal `json:"quantity" gorm:"type:decimal(20,2);not null;comment:鏁伴噺"`     //鏁伴噺
+		Unit        string          `json:"unit" gorm:"type:varchar(31);comment:鍗曚綅"`
 	}
 
 	OperationDetailsSearch struct {

--
Gitblit v1.8.0