From 18ddec2d24989f9a245f929ac3c7f3d343548e54 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 15:39:25 +0800
Subject: [PATCH] 采购单修改
---
model/purchase/purchase_products.go | 2 +-
docs/swagger.yaml | 2 +-
docs/docs.go | 2 +-
service/purchase/purchase.go | 8 ++++----
docs/swagger.json | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 089c556..c9eadef 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -3567,7 +3567,7 @@
},
"productId": {
"description": "浜у搧id",
- "type": "string"
+ "type": "integer"
},
"purchaseId": {
"description": "閲囪喘id",
diff --git a/docs/swagger.json b/docs/swagger.json
index 2223c6e..19e9f74 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -3558,7 +3558,7 @@
},
"productId": {
"description": "浜у搧id",
- "type": "string"
+ "type": "integer"
},
"purchaseId": {
"description": "閲囪喘id",
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 2d47c09..c4902a0 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -496,7 +496,7 @@
type: number
productId:
description: 浜у搧id
- type: string
+ type: integer
purchaseId:
description: 閲囪喘id
type: integer
diff --git a/model/purchase/purchase_products.go b/model/purchase/purchase_products.go
index 93a0c0d..6b3bfb0 100644
--- a/model/purchase/purchase_products.go
+++ b/model/purchase/purchase_products.go
@@ -9,7 +9,7 @@
type PurchaseProducts struct {
global.GVA_MODEL
PurchaseId int `json:"purchaseId" form:"purchaseType" gorm:"type:int(11);not null;default 0;comment:閲囪喘绫诲瀷id"` // 閲囪喘id
- ProductId int `json:"productId" form:"productId" gorm:"type:varchar(255);not null;default '';comment:浜у搧id"` // 浜у搧id
+ ProductId int `json:"productId" form:"productId" gorm:"type:int;not null;default 0;comment:浜у搧id"` // 浜у搧id
Product test.SupplierMaterial `json:"-" gorm:"foreignKey:ProductId"`
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:閲囪喘鍗曚环"` // 閲囪喘鍗曚环
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index b8654f4..4809c9b 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -131,10 +131,10 @@
var purchaseList = make([]*purchase.Purchase, 0)
if info.Keyword != "" {
db.Distinct("srm_purchase.id").Joins("left join srm_purchase_products on srm_purchase_products.purchase_id = srm_purchase.id").
- Joins("left join material on material.id = srm_purchase_products.product_id").
+ Joins("left join srm_supplier_material on srm_supplier_material.supplier_id = srm_purchase.id").
Joins("left join srm_supplier on srm_supplier.Id = srm_purchase.supplier_id").
Where("srm_purchase.name like ?", "%"+info.Keyword+"%").
- Or("material.name like ?", "%"+info.Keyword+"%").
+ Or("srm_supplier_material.name like ?", "%"+info.Keyword+"%").
Or("srm_supplier.name like ?", "%"+info.Keyword+"%")
err = db.Limit(limit).Offset(offset).Find(&ids).Error
if err != nil {
@@ -148,9 +148,9 @@
}
if len(ids) != 0 {
db = global.GVA_DB.Model(&purchase.Purchase{})
- err = db.Where("id in (?)", ids).Find(&purchaseList).Error
+ err = db.Where("id in (?)", ids).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
} else {
- err = db.Limit(limit).Offset(offset).Find(&purchaseList).Error
+ err = db.Limit(limit).Offset(offset).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
}
return purchaseList, total, err
--
Gitblit v1.8.0