shama/service
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 在报关单搜索条件中添加预计船期起止时间字段- 在结汇单搜索条件中添加预计船期起止时间字段- 在商检单搜索条件中添加预计船期起止时间字段- 调整时间包导入位置以符合代码规范
This commit is contained in:
守护自己的云 2025-10-24 13:28:41 +08:00
parent 18894e383a
commit 07ccb07d87
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erp/shipment/customs.go
View File

@ -2,10 +2,11 @@ package shipment
import ( import (
"context" "context"
"time"
"git.kumo.work/shama/service/client" "git.kumo.work/shama/service/client"
bean2 "git.kumo.work/shama/service/erp/bean" bean2 "git.kumo.work/shama/service/erp/bean"
"git.kumo.work/shama/service/lib/bean" "git.kumo.work/shama/service/lib/bean"
"time"
) )
type customs struct { type customs struct {
@ -16,12 +17,14 @@ type ArgsCustomsList struct {
Search CustomsSearch Search CustomsSearch
} }
type CustomsSearch struct { type CustomsSearch struct {
CustomsNo string // 报关单号 CustomsNo string // 报关单号
InvoiceSerial string // 出运发票号 InvoiceSerial string // 出运发票号
CustomIds []int64 // 客户筛选 CustomIds []int64 // 客户筛选
StaffIds []int64 // 业务员筛选 StaffIds []int64 // 业务员筛选
BanFlag int64 // 是否有效 BanFlag int64 // 是否有效
CustomsIds []int64 // 报关id CustomsIds []int64 // 报关id
EstSailingDateStart *time.Time // 预计船期
EstSailingDateEnd *time.Time // 预计船期
} }
type ReplyCustomsList struct { type ReplyCustomsList struct {
List []CustomsItem `json:"list"` List []CustomsItem `json:"list"`

17
erp/shipment/exchangeSettlement.go
View File

@ -2,10 +2,11 @@ package shipment
import ( import (
"context" "context"
"time"
"git.kumo.work/shama/service/client" "git.kumo.work/shama/service/client"
bean2 "git.kumo.work/shama/service/erp/bean" bean2 "git.kumo.work/shama/service/erp/bean"
"git.kumo.work/shama/service/lib/bean" "git.kumo.work/shama/service/lib/bean"
"time"
) )
type exchangeSettlement struct { type exchangeSettlement struct {
@ -16,12 +17,14 @@ type ArgsExchangeSettlementList struct {
Search ExchangeSettlementSearch Search ExchangeSettlementSearch
} }
type ExchangeSettlementSearch struct { type ExchangeSettlementSearch struct {
ExchangeSettlementNo string // 结汇单号 ExchangeSettlementNo string // 结汇单号
InvoiceSerial string // 出运发票号 InvoiceSerial string // 出运发票号
CustomIds []int64 // 客户筛选 CustomIds []int64 // 客户筛选
StaffIds []int64 // 业务员筛选 StaffIds []int64 // 业务员筛选
BanFlag int64 // 是否有效 BanFlag int64 // 是否有效
ExchangeSettlementIds []int64 // 结汇id ExchangeSettlementIds []int64 // 结汇id
EstSailingDateStart *time.Time // 预计船期
EstSailingDateEnd *time.Time // 预计船期
} }
type ReplyExchangeSettlementList struct { type ReplyExchangeSettlementList struct {
List []ExchangeSettlementItem `json:"list"` List []ExchangeSettlementItem `json:"list"`

17
erp/shipment/serial.go
View File

@ -2,10 +2,11 @@ package shipment
import ( import (
"context" "context"
"time"
"git.kumo.work/shama/service/client" "git.kumo.work/shama/service/client"
bean2 "git.kumo.work/shama/service/erp/bean" bean2 "git.kumo.work/shama/service/erp/bean"
"git.kumo.work/shama/service/lib/bean" "git.kumo.work/shama/service/lib/bean"
"time"
) )
type serial struct { type serial struct {
@ -16,12 +17,14 @@ type ArgsSerialList struct {
Search SerialSearch Search SerialSearch
} }
type SerialSearch struct { type SerialSearch struct {
SerialNo string // 商检单号 SerialNo string // 商检单号
InvoiceSerial string // 出运发票号 InvoiceSerial string // 出运发票号
CustomIds []int64 // 客户筛选 CustomIds []int64 // 客户筛选
StaffIds []int64 // 业务员筛选 StaffIds []int64 // 业务员筛选
BanFlag int64 // 是否有效 BanFlag int64 // 是否有效
SerialIds []int64 // 商检id SerialIds []int64 // 商检id
EstSailingDateStart *time.Time // 预计船期
EstSailingDateEnd *time.Time // 预计船期
} }
type ReplySerialList struct { type ReplySerialList struct {
List []SerialItem `json:"list"` List []SerialItem `json:"list"`