From b0113676f423ca930bc3dd93ac9d9ea292458dfa Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 23 十一月 2023 11:28:56 +0800
Subject: [PATCH] 1.修改MoveHistory字段类型 2.完成MoveHistory插入数据 3.operation增加审批时间、收货人、收货地址、联系电话字段,并修改相应接口以及打印

---
 models/move_history.go |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/move_history.go b/models/move_history.go
index f47383f..c6b4268 100644
--- a/models/move_history.go
+++ b/models/move_history.go
@@ -2,7 +2,7 @@
 
 import (
 	"fmt"
-	"google.golang.org/genproto/googleapis/type/decimal"
+	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
 	"wms/constvar"
 	"wms/pkg/mysqlx"
@@ -22,7 +22,7 @@
 		ProductName       string                     `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"`     //浜у搧鍚嶇О
 		Amount            decimal.Decimal            `json:"amount" gorm:"type:decimal(20,2);not null;comment:鏁伴噺"`           //鏁伴噺
 		Unit              string                     `json:"unit" gorm:"type:char(10);not null;comment:鍗曚綅"`                  //鍗曚綅
-		Weight            string                     `json:"weight" gorm:"type:decimal(20,2);not null;comment:閲嶉噺"`           //閲嶉噺
+		Weight            decimal.Decimal            `json:"weight" gorm:"type:decimal(20,2);not null;comment:閲嶉噺"`           //閲嶉噺
 		FromLocationId    int                        `json:"fromLocationId"   gorm:"type:int;not null;comment:婧愪綅缃甶d"`        //婧愪綅缃甶d
 		FromLocation      string                     `json:"fromLocation"     gorm:"type:varchar(255);not null;comment:婧愪綅缃�"` //婧愪綅缃�
 		ToLocationId      int                        `json:"toLocationId"  gorm:"type:int;not null;comment:鐩爣浣嶇疆id"`          //鐩爣浣嶇疆id

--
Gitblit v1.8.0