From e5df488268e29b272932e6cc1d2b1e7034590ba0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 12 六月 2024 11:40:45 +0800
Subject: [PATCH] weedfs包放到项目里

---
 response/report_forms_response.go |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/response/report_forms_response.go b/response/report_forms_response.go
index 8bf283c..5d4f159 100644
--- a/response/report_forms_response.go
+++ b/response/report_forms_response.go
@@ -2,6 +2,8 @@
 
 import (
 	"github.com/shopspring/decimal"
+	"time"
+	"wms/constvar"
 )
 
 type InventoryForms struct {
@@ -18,19 +20,27 @@
 }
 
 type InventoryHistory struct {
-	Number        string          `json:"number"`        //鍗曞彿
-	Date          string          `json:"date"`          //鏃ユ湡
-	ProductName   string          `json:"productName"`   //浜у搧鍚嶇О
-	FromLocation  string          `json:"fromLocation"`  //婧愪綅缃�
-	ToLocation    string          `json:"toLocation"`    //鐩爣浣嶇疆
-	Amount        decimal.Decimal `json:"amount"`        //鏁伴噺
-	Unit          string          `json:"unit"`          //鍗曚綅
-	ContactedName string          `json:"contactedName"` //瀹屾垚鑰�
-	Status        string          `json:"status"`        //鐘舵��
+	Number            string                     `json:"number"`            //鍗曞彿
+	Date              time.Time                  `json:"date"`              //鏃ユ湡
+	ProductName       string                     `json:"productName"`       //浜у搧鍚嶇О
+	FromLocation      string                     `json:"fromLocation"`      //婧愪綅缃�
+	ToLocation        string                     `json:"toLocation"`        //鐩爣浣嶇疆
+	Amount            decimal.Decimal            `json:"amount"`            //鏁伴噺
+	Unit              string                     `json:"unit"`              //鍗曚綅
+	ContactedName     string                     `json:"contactedName"`     //瀹屾垚鑰�
+	Status            string                     `json:"status"`            //鐘舵��
+	BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` //鍩虹浣滀笟绫诲瀷
+	Weight            decimal.Decimal            `json:"weight"`            //閲嶉噺
+	ProductId         string                     `json:"productId"`
+	FromLocationId    int                        `json:"fromLocationId"`
+	ToLocationId      int                        `json:"toLocationId"`
+	OperationId       int                        `json:"operationId"`
+	OperationTypeName string                     `json:"operationTypeName"` //浣滀笟绫诲瀷鍚嶇О
 }
 
 type LocationForms struct {
 	ProduceId       string          `json:"produceId"`       //浜у搧id
+	LocationId      int             `json:"locationId"`      //浣嶇疆id
 	LocationName    string          `json:"locationName"`    //浣嶇疆鍚嶇О
 	ProductName     string          `json:"productName"`     //浜у搧鍚嶇О
 	ProductTypeName string          `json:"productTypeName"` //浜у搧绫诲埆

--
Gitblit v1.8.0