部署

erp/shipment/sale.go

@@ -16,8 +16,8 @@ type SaleItem struct {
 }
 
 // All @TITLE 获取销售合同
-func (c *sale) All(ctx context.Context, shipmentId int64) (reply []SaleItem, err error) {
-	xClient, err := client.GetClient(c)
+func (s *sale) All(ctx context.Context, shipmentId int64) (reply []SaleItem, err error) {
+	xClient, err := client.GetClient(s)
 	if err != nil {
 		return
 	}
@@ -31,8 +31,8 @@ type ArgsSaleAdd struct {
 }
 
 // Add @TITLE 添加销售合同
-func (c *sale) Add(ctx context.Context, args ArgsSaleAdd) (err error) {
-	xClient, err := client.GetClient(c)
+func (s *sale) Add(ctx context.Context, args ArgsSaleAdd) (err error) {
+	xClient, err := client.GetClient(s)
 	if err != nil {
 		return
 	}
@@ -46,8 +46,8 @@ type ArgsSaleDelete struct {
 }
 
 // Delete @TITLE 删除销售合同
-func (c *sale) Delete(ctx context.Context, args ArgsSaleDelete) (err error) {
-	xClient, err := client.GetClient(c)
+func (s *sale) Delete(ctx context.Context, args ArgsSaleDelete) (err error) {
+	xClient, err := client.GetClient(s)
 	if err != nil {
 		return
 	}

erp/shipment/saleProduct.go

@@ -0,0 +1,91 @@
+package shipment
+
+import (
+	"context"
+	"git.kumo.work/shama/service/client"
+	"github.com/shopspring/decimal"
+	"time"
+)
+
+type saleProduct struct {
+}
+
+type SaleProductItem struct {
+	Id                    int64           `json:"id"`
+	PiSerial              string          `json:"piSerial"`
+	Sort                  int64           `json:"sort"`
+	Po                    string          `json:"po"`
+	Serial                string          `json:"serial"`
+	CustomSerial          string          `json:"customSerial"`
+	PackageDescription    string          `json:"packageDescription"`
+	PackageEngDescription string          `json:"packageEngDescription"`
+	EngName               string          `json:"engName"`
+	Name                  string          `json:"name"`
+	CustomsName           string          `json:"customsName"`
+	CustomsSerial         string          `json:"customsSerial"`
+	CustomsMeasureUnit    string          `json:"customsMeasureUnit"`
+	CustomsInvoiceUnit    string          `json:"customsInvoiceUnit"`
+	CustomsDetail         string          `json:"customsDetail"`
+	BlEngName             string          `json:"blEngName"`
+	BoxCount              int64           `json:"boxCount"`
+	InnerNum              int64           `json:"innerNum"`
+	InnerBoxCount         *int64          `json:"innerBoxCount"`
+	BoxNumUnit            string          `json:"boxNumUnit"`
+	OuterNum              int64           `json:"outerNum"`
+	ShipmentCount         int64           `json:"shipmentCount"`
+	ShipmentCountUnit     string          `json:"shipmentCountUnit"`
+	Length                decimal.Decimal `json:"length"`
+	Width                 decimal.Decimal `json:"width"`
+	Height                decimal.Decimal `json:"height"`
+	Volume                decimal.Decimal `json:"volume"`
+	TotalVolume           decimal.Decimal `json:"totalVolume"`
+	NetGrossVolume        int64           `json:"netGrossVolume"`
+	GrossWeight           decimal.Decimal `json:"grossWeight"`
+	TotalGrossWeight      decimal.Decimal `json:"totalGrossWeight"`
+	NetWeight             decimal.Decimal `json:"netWeight"`
+	TotalNetWeight        decimal.Decimal `json:"totalNetWeight"`
+	SalePrice             decimal.Decimal `json:"salePrice"`
+	CurrencyRate          decimal.Decimal `json:"currencyRate"`
+	Brand                 string          `json:"brand"`
+	DomesticSupply        string          `json:"domesticSupply"`
+	EpmNo                 string          `json:"epmNo"`
+	HsSerial              int64           `json:"hsSerial"`
+	TaxExemption          string          `json:"taxExemption"`
+	ItemNumber            string          `json:"itemNumber"`
+	Texture               string          `json:"texture"`
+	Remark1               string          `json:"remark1"`
+	Remark2               string          `json:"remark2"`
+	Remark3               string          `json:"remark3"`
+	Remark4               string          `json:"remark4"`
+	Remark5               string          `json:"remark5"`
+	Remark6               string          `json:"remark6"`
+	ContainerNumber       string          `json:"containerNumber"`
+	SealNumber            string          `json:"sealNumber"`
+	CreatedAt             *time.Time      `json:"createdAt"`
+	UpdatedAt             *time.Time      `json:"updatedAt"`
+}
+
+// All @TITLE 获取商品
+func (s *saleProduct) All(ctx context.Context, shipmentId int64) (reply []SaleProductItem, err error) {
+	xClient, err := client.GetClient(s)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "All", shipmentId, &reply)
+	return
+}
+
+type ArgsSaleProductDelete struct {
+	ShipmentId             int64   // 订舱单id
+	ShipmentSaleProductIds []int64 // 出运参评id
+}
+
+// Delete @TITLE 删除出运产品
+func (s *saleProduct) Delete(ctx context.Context, args ArgsSaleProductDelete) (err error) {
+	xClient, err := client.GetClient(s)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Delete", args, &reply)
+}

erp/shipment/shipment.go

@@ -1,6 +1,7 @@
 package shipment
 
 type Shipment struct {
-	Sale sale
-	Cost cost
+	Sale        sale
+	Cost        cost
+	SaleProduct saleProduct
 }