diff --git a/erp/sale.go b/erp/sale.go index de09c43..fc3c925 100644 --- a/erp/sale.go +++ b/erp/sale.go @@ -23,6 +23,7 @@ type SaleSearch struct { PurchaseStatus []int64 // 采购状态 ShipmentStatus []int64 // 出舱状态 CreatedStaffIds []int64 // 业务员 + BanFlag int64 // 禁用标记 1=禁用,2=可用 } type ReplySaleList struct { List []SaleItem `json:"list"` diff --git a/erp/sale/benefit.go b/erp/sale/benefit.go index 2c8529a..0623b0f 100644 --- a/erp/sale/benefit.go +++ b/erp/sale/benefit.go @@ -105,6 +105,6 @@ func (b *benefit) Edit(ctx context.Context, args ArgsBenefitEdit) (err error) { return } reply := 0 - err = xClient.Call(ctx, "Info", args, &reply) + err = xClient.Call(ctx, "Edit", args, &reply) return } diff --git a/erp/shipment/saleProduct.go b/erp/shipment/saleProduct.go index 5be00c7..c57100e 100644 --- a/erp/shipment/saleProduct.go +++ b/erp/shipment/saleProduct.go @@ -80,6 +80,70 @@ func (s *saleProduct) All(ctx context.Context, search ArgsSaleProductSearch) (re return } +type ArgsSaleProductAdd struct { + ShipmentId int64 // 出舱单id + Products []SaleProductAdd // 产品信息 +} +type SaleProductAdd struct { + SaleProductId int64 // 销售商品id + ShipmentCount int64 // 出运数量 + NetGrossVolume int64 // 净毛体计算类型 1=内盒 2=外箱 + EpmNo string // EPM NO + TaxExemption string // 免征税 + ItemNumber string // 项号 + Remark1 string // 备注1 + Remark2 string // 备注2 + Remark3 string // 备注3 + Remark4 string // 备注4 + Remark5 string // 备注5 + Remark6 string // 备注6 + ContainerNumber string // 箱号 + SealNumber string // 封号 +} + +// Add @TITLE 添加 +func (s *saleProduct) Add(ctx context.Context, args ArgsSaleProductAdd) (err error) { + xClient, err := client.GetClient(s) + if err != nil { + return + } + reply := 0 + return xClient.Call(ctx, "Add", args, &reply) +} + +type ArgsSaleProductEdit struct { + ShipmentSaleProductId int64 + Product SaleProductEdit +} +type SaleProductEdit struct { + SaleProductId int64 // 销售商品id + ShipmentCount int64 // 出运数量 + NetGrossVolume int64 // 净毛体计算类型 1=内盒 2=外箱 + EpmNo string // EPM NO + TaxExemption string // 免征税 + ItemNumber string // 项号 + Remark1 string // 备注1 + Remark2 string // 备注2 + Remark3 string // 备注3 + Remark4 string // 备注4 + Remark5 string // 备注5 + Remark6 string // 备注6 + ContainerNumber string // 箱号 + SealNumber string // 封号 + Sort int64 // 排序 + BlEngName string // 提单英文名 +} + +// Edit @TITLE 编辑 +func (s *saleProduct) Edit(ctx context.Context, args ArgsSaleProductEdit) (err error) { + xClient, err := client.GetClient(s) + if err != nil { + return + } + reply := 0 + return xClient.Call(ctx, "Edit", args, &reply) +} + type ArgsSaleProductDelete struct { ShipmentId int64 // 订舱单id ShipmentSaleProductIds []int64 // 出运参评id