部署

erp/shipment.go

@@ -3,6 +3,7 @@ package erp
 import (
 	"context"
 	"git.kumo.work/shama/service/client"
+	bean2 "git.kumo.work/shama/service/erp/bean"
 	shipment2 "git.kumo.work/shama/service/erp/shipment"
 	"git.kumo.work/shama/service/lib/bean"
 	"github.com/shopspring/decimal"
@@ -17,13 +18,11 @@ type ArgsShipmentList struct {
 	Search ShipmentSearch
 }
 type ShipmentSearch struct {
-	InvoiceSerial        string  // 出运发票号
-	CustomIds            []int64 // 客户筛选
-	StaffIds             []int64 // 业务员筛选
-	WorkflowStatus       []int64 // 审核状态
-	IsSerial             int64   // 是否商检
-	IsCustoms            int64   // 是否报关
-	IsExchangeSettlement int64   // 是否结汇
+	InvoiceSerial  string  // 出运发票号
+	CustomIds      []int64 // 客户筛选
+	StaffIds       []int64 // 业务员筛选
+	WorkflowStatus []int64 // 审核状态
+	IsAudit        int64   // 审核状态 是否审核 1=是 2=否
 }
 type ReplyShipmentList struct {
 	List  []ShipmentItem `json:"list"`
@@ -215,30 +214,8 @@ func (s *shipment) Edit(ctx context.Context, args ArgsShipmentEdit) (err error)
 	return
 }
 
-type ReplyCustoms struct {
-	CostAmount         decimal.Decimal      `json:"costAmount"`
-	CustomsCostAmount  decimal.Decimal      `json:"customsCostAmount"`
-	SaleTotalAmount    decimal.Decimal      `json:"saleTotalAmount"`
-	CustomsTotalAmount decimal.Decimal      `json:"customsTotalAmount"`
-	Products           []CustomsProductItem `json:"products"`
-}
-
-type CustomsProductItem struct {
-	Index             int             `json:"index"`
-	Serial            string          `json:"serial"`
-	CustomsName       string          `json:"customsName"`
-	ShipmentCount     int64           `json:"shipmentCount"`
-	SalePrice         decimal.Decimal `json:"salePrice"`
-	SaleAmount        decimal.Decimal `json:"saleAmount"`
-	CustomsPrice      decimal.Decimal `json:"customsPrice"`
-	CustomsAmount     decimal.Decimal `json:"customsAmount"`
-	AdjustAmount      decimal.Decimal `json:"adjustAmount"`
-	RealCustomsPrice  decimal.Decimal `json:"realCustomsPrice"`
-	RealCustomsAmount decimal.Decimal `json:"realCustomsAmount"`
-}
-
 // Customs @TITLE 报关信息
-func (s *shipment) Customs(ctx context.Context, shipmentId int64) (reply ReplyCustoms, err error) {
+func (s *shipment) Customs(ctx context.Context, shipmentId int64) (reply bean2.ReplyCustoms, err error) {
 	xClient, err := client.GetClient(s)
 	if err != nil {
 		return