From 07ccb07d876821f6f034bf6c44400622c970c66d Mon Sep 17 00:00:00 2001 From: kanade Date: Fri, 24 Oct 2025 13:28:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(erp):=20=E6=B7=BB=E5=8A=A0=E9=A2=84?= =?UTF-8?q?=E8=AE=A1=E8=88=B9=E6=9C=9F=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在报关单搜索条件中添加预计船期起止时间字段- 在结汇单搜索条件中添加预计船期起止时间字段- 在商检单搜索条件中添加预计船期起止时间字段- 调整时间包导入位置以符合代码规范 --- erp/shipment/customs.go | 17 ++++++++++------- erp/shipment/exchangeSettlement.go | 17 ++++++++++------- erp/shipment/serial.go | 17 ++++++++++------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/erp/shipment/customs.go b/erp/shipment/customs.go index 2138499..6bd47a0 100644 --- a/erp/shipment/customs.go +++ b/erp/shipment/customs.go @@ -2,10 +2,11 @@ package shipment import ( "context" + "time" + "git.kumo.work/shama/service/client" bean2 "git.kumo.work/shama/service/erp/bean" "git.kumo.work/shama/service/lib/bean" - "time" ) type customs struct { @@ -16,12 +17,14 @@ type ArgsCustomsList struct { Search CustomsSearch } type CustomsSearch struct { - CustomsNo string // 报关单号 - InvoiceSerial string // 出运发票号 - CustomIds []int64 // 客户筛选 - StaffIds []int64 // 业务员筛选 - BanFlag int64 // 是否有效 - CustomsIds []int64 // 报关id + CustomsNo string // 报关单号 + InvoiceSerial string // 出运发票号 + CustomIds []int64 // 客户筛选 + StaffIds []int64 // 业务员筛选 + BanFlag int64 // 是否有效 + CustomsIds []int64 // 报关id + EstSailingDateStart *time.Time // 预计船期 + EstSailingDateEnd *time.Time // 预计船期 } type ReplyCustomsList struct { List []CustomsItem `json:"list"` diff --git a/erp/shipment/exchangeSettlement.go b/erp/shipment/exchangeSettlement.go index edfebbb..2e53439 100644 --- a/erp/shipment/exchangeSettlement.go +++ b/erp/shipment/exchangeSettlement.go @@ -2,10 +2,11 @@ package shipment import ( "context" + "time" + "git.kumo.work/shama/service/client" bean2 "git.kumo.work/shama/service/erp/bean" "git.kumo.work/shama/service/lib/bean" - "time" ) type exchangeSettlement struct { @@ -16,12 +17,14 @@ type ArgsExchangeSettlementList struct { Search ExchangeSettlementSearch } type ExchangeSettlementSearch struct { - ExchangeSettlementNo string // 结汇单号 - InvoiceSerial string // 出运发票号 - CustomIds []int64 // 客户筛选 - StaffIds []int64 // 业务员筛选 - BanFlag int64 // 是否有效 - ExchangeSettlementIds []int64 // 结汇id + ExchangeSettlementNo string // 结汇单号 + InvoiceSerial string // 出运发票号 + CustomIds []int64 // 客户筛选 + StaffIds []int64 // 业务员筛选 + BanFlag int64 // 是否有效 + ExchangeSettlementIds []int64 // 结汇id + EstSailingDateStart *time.Time // 预计船期 + EstSailingDateEnd *time.Time // 预计船期 } type ReplyExchangeSettlementList struct { List []ExchangeSettlementItem `json:"list"` diff --git a/erp/shipment/serial.go b/erp/shipment/serial.go index ac48a84..19136ad 100644 --- a/erp/shipment/serial.go +++ b/erp/shipment/serial.go @@ -2,10 +2,11 @@ package shipment import ( "context" + "time" + "git.kumo.work/shama/service/client" bean2 "git.kumo.work/shama/service/erp/bean" "git.kumo.work/shama/service/lib/bean" - "time" ) type serial struct { @@ -16,12 +17,14 @@ type ArgsSerialList struct { Search SerialSearch } type SerialSearch struct { - SerialNo string // 商检单号 - InvoiceSerial string // 出运发票号 - CustomIds []int64 // 客户筛选 - StaffIds []int64 // 业务员筛选 - BanFlag int64 // 是否有效 - SerialIds []int64 // 商检id + SerialNo string // 商检单号 + InvoiceSerial string // 出运发票号 + CustomIds []int64 // 客户筛选 + StaffIds []int64 // 业务员筛选 + BanFlag int64 // 是否有效 + SerialIds []int64 // 商检id + EstSailingDateStart *time.Time // 预计船期 + EstSailingDateEnd *time.Time // 预计船期 } type ReplySerialList struct { List []SerialItem `json:"list"`