From 1572f45e72cc0fa15c029f9ee2a08474104435e6 Mon Sep 17 00:00:00 2001
From: selfcheer <selfcheer@gmail.com>
Date: 星期五, 19 七月 2024 00:48:43 +0800
Subject: [PATCH] 采购单产品列表去掉过滤重复产品的逻辑
---
model/purchase/response/purchase.go | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/model/purchase/response/purchase.go b/model/purchase/response/purchase.go
index 57a9fa7..ec3a5a8 100644
--- a/model/purchase/response/purchase.go
+++ b/model/purchase/response/purchase.go
@@ -13,7 +13,7 @@
type PurchaseProducts struct {
PurchaseId int `json:"purchaseId" form:"purchaseType" gorm:"type:int(11);not null;default 0;comment:閲囪喘绫诲瀷id"` // 閲囪喘id
- ProductId int `json:"productId" form:"supplierId" gorm:"type:int(11);not null;default 0;comment:渚涘簲鍟唅d"` // 浜у搧id
+ ProductId int `json:"productId" form:"supplierId" gorm:"type:int(11);not null;default 0;comment:浜у搧id"` // 浜у搧id
Amount decimal.Decimal `json:"amount" form:"amount" gorm:"type:decimal(12,2);not null;default 0;comment:閲囪喘鏁伴噺"` // 閲囪喘鏁伴噺
Price decimal.Decimal `json:"price" form:"price" gorm:"type:decimal(12,2);not null;default 0.00;comment:閲囪喘鍗曚环"` // 閲囪喘鍗曚环
Total decimal.Decimal `json:"total" form:"total" gorm:"type:decimal(12,2);not null;default 0.00;comment:閲囪喘鎬讳环"` // 閲囪喘鎬讳环
@@ -51,19 +51,30 @@
}
type OperationInfo struct {
- ProductId string `json:"productId"`
- ProductName string `json:"productName"`
+ ProductInfos []ProductInfo `json:"productInfos"`
+ InWarehouseInfos []InWarehouseInfo `json:"inWarehouseInfos"`
+}
+
+type ProductInfo struct {
+ Number string `json:"number"` //浜у搧缂栫爜
+ Name string `json:"name"` //浜у搧鍚嶇О
Specifications string `json:"specifications"` //瑙勬牸
ModelNumber string `json:"modelNumber"` //鍨嬪彿
Amount decimal.Decimal `json:"amount"` //閲囪喘鏁�
- SendAmount int64 `json:"sendAmount"` //鍙戣揣鏁�
+ SendAmount int64 `json:"sendAmount"` //鏀惰揣鏁�
OverAmount int64 `json:"overAmount"` //鍏ュ簱鏁�
Unit string `json:"unit"` //鍗曚綅
- Price decimal.Decimal `json:"price"` //鍗曚环
+ PurchasePrice decimal.Decimal `json:"purchasePrice"` //鍗曚环
Total decimal.Decimal `json:"total"` //鎬讳环
- Number string `json:"number"` //鍏ュ簱鍗曞彿
- WarehouseName string `json:"warehouseName"` //浠撳簱鍚�
- OverTime string `json:"overTime"` //鍏ュ簱鏃堕棿
- Status int64 `json:"status"`
- Principal string `json:"principal"` //璐熻矗浜�
+}
+
+type InWarehouseInfo struct {
+ Number string `json:"number"` //浜у搧缂栫爜
+ Name string `json:"name"` //浜у搧鍚嶇О
+ OperationNumber string `json:"operationNumber"` //鍏ュ簱鍗曞彿
+ WarehouseName string `json:"warehouseName"` //浠撳簱鍚�
+ OverTime string `json:"overTime"` //鍏ュ簱鏃堕棿
+ Status int64 `json:"status"`
+ Principal string `json:"principal"` //璐熻矗浜�
+ OverAmount int64 `json:"overAmount"` //鍏ュ簱鏁�
}
--
Gitblit v1.8.0