feat(erp): 添加预计船期搜索条件

- 在报关单搜索条件中添加预计船期起止时间字段- 在结汇单搜索条件中添加预计船期起止时间字段- 在商检单搜索条件中添加预计船期起止时间字段- 调整时间包导入位置以符合代码规范

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"`

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"`

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"`