From 079d8b82db47c8f5b55cb7ed333a10574abc5c8d Mon Sep 17 00:00:00 2001
From: kanade <kanade@kumo.work>
Date: Wed, 28 May 2025 15:42:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(shipment):=20=E6=B7=BB=E5=8A=A0=E9=A2=84?=
 =?UTF-8?q?=E8=AE=A1=E8=88=B9=E6=9C=9F=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ShipmentSearch 结构体中添加 EstSailingDateStart 和 EstSailingDateEnd 字段
- 用于筛选预计船期在指定范围内的出舱记录
---
 erp/shipment.go | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/erp/shipment.go b/erp/shipment.go
index f5df013..9a58b8a 100644
--- a/erp/shipment.go
+++ b/erp/shipment.go
@@ -18,19 +18,21 @@ type ArgsShipmentList struct {
 	Search ShipmentSearch
 }
 type ShipmentSearch struct {
-	InvoiceSerial     string     // 出运发票号
-	CustomIds         []int64    // 客户筛选
-	StaffIds          []int64    // 业务员筛选
-	CreatedStaffIds   []int64    // 业务员筛选
-	WorkflowStatus    []int64    // 审核状态
-	IsAudit           int64      // 审核状态 是否审核 1=是 2=否
-	ShipmentIds       []int64    // 出舱id
-	InvoiceDateStart  *time.Time // 发票日期
-	InvoiceDateEnd    *time.Time // 发票日期
-	ContractDateStart *time.Time // 合同日期
-	ContractDateEnd   *time.Time // 合同日期
-	BanFlag           int64      // 是否有效
-	ShipmentNo        string     // shipmentNo
+	InvoiceSerial       string     // 出运发票号
+	CustomIds           []int64    // 客户筛选
+	StaffIds            []int64    // 业务员筛选
+	CreatedStaffIds     []int64    // 业务员筛选
+	WorkflowStatus      []int64    // 审核状态
+	IsAudit             int64      // 审核状态 是否审核 1=是 2=否
+	ShipmentIds         []int64    // 出舱id
+	InvoiceDateStart    *time.Time // 发票日期
+	InvoiceDateEnd      *time.Time // 发票日期
+	ContractDateStart   *time.Time // 合同日期
+	ContractDateEnd     *time.Time // 合同日期
+	EstSailingDateStart *time.Time // 预计船期
+	EstSailingDateEnd   *time.Time // 预计船期
+	BanFlag             int64      // 是否有效
+	ShipmentNo          string     // shipmentNo
 }
 type ReplyShipmentList struct {
 	List  []ShipmentItem `json:"list"`