diff --git a/erp/accounting.go b/erp/accounting.go index 085e525..652fb33 100644 --- a/erp/accounting.go +++ b/erp/accounting.go @@ -24,6 +24,7 @@ type AccountingSearch struct { CreatedAtStart *time.Time // 创建开始时间 CreatedAtEnd *time.Time // 创建结束时间 CreatedStaffIds []int64 // 创建人 + AccountingIds []int64 // 做账id } type ReplyAccountingList struct { diff --git a/erp/logisticsCompany.go b/erp/logisticsCompany.go index f1396ff..04befe5 100644 --- a/erp/logisticsCompany.go +++ b/erp/logisticsCompany.go @@ -28,6 +28,7 @@ type ReplyLogisticsCompanyList struct { type LogisticsCompanyItem struct { Id int64 `json:"id"` + Serial string `json:"serial"` Name string `json:"name"` // 公司名称 NameEn string `json:"nameEn"` // 公司名称英文 ShortName string `json:"shortName"` // 公司简称 @@ -94,6 +95,7 @@ func (l *logisticsCompany) Add(ctx context.Context, args ArgsLogisticsCompanyAdd type ReplyLogisticsCompanyInfo struct { Id int64 `json:"id"` + Serial string `json:"serial"` Name string `json:"name"` // 公司名称 NameEn string `json:"nameEn"` // 公司名称英文 ShortName string `json:"shortName"` // 公司简称 diff --git a/erp/purchase.go b/erp/purchase.go index c844345..6225899 100644 --- a/erp/purchase.go +++ b/erp/purchase.go @@ -22,6 +22,7 @@ type PurchaseSearch struct { CustomShortName string // 客户简称 CreatedStaffIds []int64 // 创建人筛选 FactoryName string // 采购工厂 + PurchaseIds []int64 // 采购id } type ReplyPurchaseList struct { List []PurchaseItem `json:"list"` diff --git a/erp/sale.go b/erp/sale.go index 6812807..133d44d 100644 --- a/erp/sale.go +++ b/erp/sale.go @@ -23,6 +23,7 @@ type SaleSearch struct { PurchaseStatus []int64 // 采购状态 ShipmentStatus []int64 // 出舱状态 CreatedStaffIds []int64 // 业务员 + SaleIds []int64 // 销售id BanFlag int64 // 禁用标记 1=禁用,2=可用 } type ReplySaleList struct { diff --git a/erp/shipment.go b/erp/shipment.go index ec0d0dd..986c07a 100644 --- a/erp/shipment.go +++ b/erp/shipment.go @@ -23,6 +23,7 @@ type ShipmentSearch struct { StaffIds []int64 // 业务员筛选 WorkflowStatus []int64 // 审核状态 IsAudit int64 // 审核状态 是否审核 1=是 2=否 + ShipmentIds []int64 // 出舱id } type ReplyShipmentList struct { List []ShipmentItem `json:"list"` diff --git a/erp/shipment/customs.go b/erp/shipment/customs.go index 8e5c0f7..bbbc47f 100644 --- a/erp/shipment/customs.go +++ b/erp/shipment/customs.go @@ -21,6 +21,7 @@ type CustomsSearch struct { CustomIds []int64 // 客户筛选 StaffIds []int64 // 业务员筛选 IsCancel int64 // 是否有效 + CustomsIds []int64 // 报关id } type ReplyCustomsList struct { List []CustomsItem `json:"list"` diff --git a/erp/shipment/exchangeSettlement.go b/erp/shipment/exchangeSettlement.go index b6187c2..fcdc8d8 100644 --- a/erp/shipment/exchangeSettlement.go +++ b/erp/shipment/exchangeSettlement.go @@ -15,11 +15,12 @@ type ArgsExchangeSettlementList struct { Search ExchangeSettlementSearch } type ExchangeSettlementSearch struct { - ExchangeSettlementNo string // 结汇单号 - InvoiceSerial string // 出运发票号 - CustomIds []int64 // 客户筛选 - StaffIds []int64 // 业务员筛选 - IsCancel int64 // 是否有效 + ExchangeSettlementNo string // 结汇单号 + InvoiceSerial string // 出运发票号 + CustomIds []int64 // 客户筛选 + StaffIds []int64 // 业务员筛选 + IsCancel int64 // 是否有效 + ExchangeSettlementIds []int64 // 结汇id } type ReplyExchangeSettlementList struct { List []ExchangeSettlementItem `json:"list"` diff --git a/erp/shipment/serial.go b/erp/shipment/serial.go index 25a565e..d4657e5 100644 --- a/erp/shipment/serial.go +++ b/erp/shipment/serial.go @@ -21,6 +21,7 @@ type SerialSearch struct { CustomIds []int64 // 客户筛选 StaffIds []int64 // 业务员筛选 IsCancel int64 // 是否有效 + SerialIds []int64 // 商检id } type ReplySerialList struct { List []SerialItem `json:"list"` diff --git a/erp/workflow.go b/erp/workflow.go index b5b4edc..4c1a22b 100644 --- a/erp/workflow.go +++ b/erp/workflow.go @@ -37,6 +37,7 @@ type WorkflowItem struct { CreatedStaffId int64 `json:"createdStaffId"` // 创建人 CreatedAt *time.Time `json:"createdAt"` // 创建时间 UpdatedAt *time.Time `json:"updatedAt"` // 更新时间 + Data string `json:"data"` } // List @TITLE 审核列表