minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修复采购需求提报先选分类然后分页没效果的缺陷；

Browse Source
This commit is contained in:
chenlin 2024-08-12 11:29:23 +08:00
parent c7ab2b1957
commit c7216aa035
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/admin/models/purchase.go
View File

@ -1873,7 +1873,6 @@ func getErpPurchaseDemandAll(req *GetErpPurchaseDemandReq, c *gin.Context) (*Get
qs := orm.Eloquent.Debug().Table("erp_commodity") qs := orm.Eloquent.Debug().Table("erp_commodity")
if req.ErpCategoryId != 0 { if req.ErpCategoryId != 0 {
page = 0
categoryInfo, err := GetErpCategory(req.ErpCategoryId) categoryInfo, err := GetErpCategory(req.ErpCategoryId)
if err != nil { if err != nil {
return nil, err return nil, err
@ -1881,15 +1880,12 @@ func getErpPurchaseDemandAll(req *GetErpPurchaseDemandReq, c *gin.Context) (*Get
qs = qs.Where("serial_number like ?", categoryInfo.Number+"%") qs = qs.Where("serial_number like ?", categoryInfo.Number+"%")
} }
if req.ErpCommoditySerialNumber != "" { if req.ErpCommoditySerialNumber != "" {
page = 0
qs = qs.Where("serial_number=?", req.ErpCommoditySerialNumber) qs = qs.Where("serial_number=?", req.ErpCommoditySerialNumber)
} }
if req.ErpCommodityName != "" { if req.ErpCommodityName != "" {
page = 0
qs = qs.Where("name=?", req.ErpCommodityName) qs = qs.Where("name=?", req.ErpCommodityName)
} }
if req.ErpSupplierId != 0 { if req.ErpSupplierId != 0 {
page = 0
qs = qs.Where("erp_supplier_id=?", req.ErpSupplierId) qs = qs.Where("erp_supplier_id=?", req.ErpSupplierId)
} }
@ -2051,6 +2047,9 @@ func getErpPurchaseDemandAll(req *GetErpPurchaseDemandReq, c *gin.Context) (*Get
} else { } else {
// 计算分页 // 计算分页
startIndex := page * req.PageSize startIndex := page * req.PageSize
if startIndex > len(commodities) {
startIndex = 0
}
endIndex := (page + 1) * req.PageSize endIndex := (page + 1) * req.PageSize
if endIndex > len(commodities) { if endIndex > len(commodities) {
endIndex = len(commodities) endIndex = len(commodities)
@ -2202,11 +2201,9 @@ func getErpPurchaseDemandHide(req *GetErpPurchaseDemandReq, c *gin.Context) (*Ge
} }
} }
if req.ErpCommodityName != "" { if req.ErpCommodityName != "" {
page = 0
demandQs = demandQs.Where("erp_commodity_name = ?", req.ErpCommodityName) demandQs = demandQs.Where("erp_commodity_name = ?", req.ErpCommodityName)
} }
if req.ErpSupplierId != 0 { if req.ErpSupplierId != 0 {
page = 0
demandQs = demandQs.Where("erp_supplier_id=?", req.ErpSupplierId) demandQs = demandQs.Where("erp_supplier_id=?", req.ErpSupplierId)
} }
err = demandQs.Find(&demand).Error err = demandQs.Find(&demand).Error
@ -2348,6 +2345,9 @@ func getErpPurchaseDemandHide(req *GetErpPurchaseDemandReq, c *gin.Context) (*Ge
} else { } else {
// 计算分页 // 计算分页
startIndex := page * req.PageSize startIndex := page * req.PageSize
if startIndex > len(matchedCommodities) {
startIndex = 0
}
endIndex := (page + 1) * req.PageSize endIndex := (page + 1) * req.PageSize
if endIndex > len(matchedCommodities) { if endIndex > len(matchedCommodities) {
endIndex = len(matchedCommodities) endIndex = len(matchedCommodities)