From 6203a1f61eb9bdcd7bacae6bdb1ee64cf977151e Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 28 九月 2023 11:27:21 +0800
Subject: [PATCH] 1.库存盘点列表增加status状态

---
 models/location_product_amount.go      |   24 +++++++++++++-----------
 controllers/location_product_amount.go |    3 ++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 053979e..b95d1c2 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -51,7 +51,8 @@
 					material.unit,
 					wms_location_product_amount.create_date,
 					wms_operation_details.amount as adjust_amount,
-					wms_operation.id as operation_id`).
+					wms_operation.id as operation_id,
+					wms_operation.status`).
 		InnerJoins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
 		InnerJoins("inner join material on material.id=wms_location_product.product_id").
 		InnerJoins("inner join wms_location on wms_location.id=wms_location_product.location_id").
diff --git a/models/location_product_amount.go b/models/location_product_amount.go
index 7ed5dea..ec242ff 100644
--- a/models/location_product_amount.go
+++ b/models/location_product_amount.go
@@ -4,6 +4,7 @@
 	"fmt"
 	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
+	"wms/constvar"
 	"wms/pkg/mysqlx"
 )
 
@@ -29,17 +30,18 @@
 
 	LocationProductAmountWithOperation struct {
 		//LocationProductAmount LocationProductAmount `json:"locationProductAmount"`
-		LocationProductAmountId int             `json:"locationProductAmount" gorm:"location_product_amount_id"`
-		LocationId              int             `json:"locationId" gorm:"column:location_id"`
-		LocationName            string          `json:"locationName" gorm:"column:location_name"`
-		ProductId               string          `json:"productId" gorm:"column:product_id"`
-		ProductName             string          `json:"productName" gorm:"column:product_name"`
-		Amount                  decimal.Decimal `json:"amount" gorm:"column:amount"`
-		Unit                    string          `json:"unit" gorm:"column:unit"`
-		CreateDate              string          `json:"createDate" gorm:"column:create_date"`
-		AdjustAmount            decimal.Decimal `json:"adjustAmount" gorm:"column:adjust_amount"`
-		DifferenceAmount        decimal.Decimal `json:"differenceAmount" gorm:"-"`
-		OperationId             int             `json:"operationId" gorm:"column:operation_id"`
+		LocationProductAmountId int                      `json:"locationProductAmount" gorm:"location_product_amount_id"`
+		LocationId              int                      `json:"locationId" gorm:"column:location_id"`
+		LocationName            string                   `json:"locationName" gorm:"column:location_name"`
+		ProductId               string                   `json:"productId" gorm:"column:product_id"`
+		ProductName             string                   `json:"productName" gorm:"column:product_name"`
+		Amount                  decimal.Decimal          `json:"amount" gorm:"column:amount"`
+		Unit                    string                   `json:"unit" gorm:"column:unit"`
+		CreateDate              string                   `json:"createDate" gorm:"column:create_date"`
+		AdjustAmount            decimal.Decimal          `json:"adjustAmount" gorm:"column:adjust_amount"`
+		DifferenceAmount        decimal.Decimal          `json:"differenceAmount" gorm:"-"`
+		OperationId             int                      `json:"operationId" gorm:"column:operation_id"`
+		Status                  constvar.OperationStatus `json:"status" gorm:"status"`
 	}
 )
 

--
Gitblit v1.8.0