From 8bdedaf5a208617ec0c00eb3544fae127339e7a2 Mon Sep 17 00:00:00 2001 From: chenlin Date: Tue, 29 Apr 2025 15:08:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=88=B6=E5=8D=95=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9B=202.=E5=BA=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E6=98=8E=E7=BB=86totalAllotAmount=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/inventory_report.go | 2 +- app/admin/models/purchase.go | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/admin/models/inventory_report.go b/app/admin/models/inventory_report.go index 121a229..29eda56 100644 --- a/app/admin/models/inventory_report.go +++ b/app/admin/models/inventory_report.go @@ -1313,7 +1313,7 @@ func (m *InventoryReportAllotDetailReq) ReportAllotDetailList(c *gin.Context) (* // Calculate the sum of allot_amount var totalAllotAmount float64 - err = countQuery.Select("SUM(erp_inventory_allot_commodity.amount) as total_allot_amount"). + err = countQuery.Select("COALESCE(SUM(erp_inventory_allot_commodity.amount), 0) as total_allot_amount"). Pluck("total_allot_amount", &totalAllotAmount).Error if err != nil { logger.Error("Failed to calculate TotalAllotAmount", logger.Field("err", err)) diff --git a/app/admin/models/purchase.go b/app/admin/models/purchase.go index 3770c43..2bba2ee 100644 --- a/app/admin/models/purchase.go +++ b/app/admin/models/purchase.go @@ -167,6 +167,8 @@ type ErpPurchaseOrderListReq struct { PurchaseType string `json:"purchase_type"` // 采购类型：procure-采购 reject-退货 StoreId uint32 `json:"store_id"` // 门店id ErpSupplierId uint32 `json:"erp_supplier_id"` // 供应商id + MakeTimeStart string `json:"make_time_start"` // 制单开始时间 + MakeTimeEnd string `json:"make_time_end"` // 制单结束时间 AuditTimeStart string `json:"audit_time_start"` // 审核开始时间 AuditTimeEnd string `json:"audit_time_end"` // 审核结束时间 AuditFlag string `json:"audit_flag"` // 审核标记（默认展示所有）：ON-订单只展示已审核的采购入库订单，含待入库/已终止/已完成/入库中 @@ -638,6 +640,21 @@ func (m *ErpPurchaseOrderListReq) List(c *gin.Context) (*ErpPurchaseOrderListRes //parse = parse.AddDate(0, 0, 1) qs = qs.Where("audit_time < ?", parse) } + if m.MakeTimeStart != "" { + parse, err := time.Parse(QueryTimeFormat, m.MakeTimeStart) + if err != nil { + logger.Errorf("err:", err) + } + qs = qs.Where("maker_time > ?", parse) + } + if m.MakeTimeEnd != "" { + parse, err := time.Parse(QueryTimeFormat, m.MakeTimeEnd) + if err != nil { + logger.Errorf("err:", err) + } + //parse = parse.AddDate(0, 0, 1) + qs = qs.Where("maker_time < ?", parse) + } if m.HandlerId != 0 { qs = qs.Where("handler_id=?", m.HandlerId) }