问题修复

erp/constant.go

@@ -51,3 +51,9 @@ const (
 	ExportTypeExchangeSettlement = "exchangeSettlement" // 结汇导出
 	ExportTypeAccounting         = "accounting"         // 做账导出
 )
+
+type BanFlag = int64 // 出舱状态
+const (
+	BanFlagDisabled BanFlag = 1 // 禁用
+	BanFlagEnabled  BanFlag = 2 // 可用
+)

erp/custom.go

@@ -25,6 +25,7 @@ type CustomSearch struct {
 	DepartmentIds   []int64 // 所属部门
 	BanFlag         int64   // 禁用标记 1=禁用 2=启用
 	StaffIds        []int64 // 业务员
+	CreatedStaffIds []int64 // 业务员
 }
 type ReplyCustomList struct {
 	List  []CustomItem `json:"list"`

erp/shipment.go

@@ -29,6 +29,7 @@ type ShipmentSearch struct {
 	InvoiceDateEnd    *time.Time // 发票日期
 	ContractDateStart *time.Time // 合同日期
 	ContractDateEnd   *time.Time // 合同日期
+	BanFlag           int64      // 是否有效
 }
 type ReplyShipmentList struct {
 	List  []ShipmentItem `json:"list"`
@@ -229,3 +230,14 @@ func (s *shipment) Customs(ctx context.Context, shipmentId int64) (reply bean2.R
 	err = xClient.Call(ctx, "Customs", shipmentId, &reply)
 	return
 }
+
+// Cancel @TITLE 作废
+func (s *shipment) Cancel(ctx context.Context, shipmentId int64) (err error) {
+	xClient, err := client.GetClient(s)
+	if err != nil {
+		return
+	}
+	reply := 0
+	err = xClient.Call(ctx, "Cancel", shipmentId, &reply)
+	return
+}

erp/shipment/bean.go

@@ -75,4 +75,5 @@ type ReplyShipmentInfo struct {
 	SaleCurrencyName             string           `json:"saleCurrencyName"`
 	SaleCurrencySymbol           string           `json:"saleCurrencySymbol"`
 	SaleCurrencyRate             decimal.Decimal  `json:"saleCurrencyRate"`
+	BanFlag                      int64            `json:"banFlag"`
 }

erp/shipment/customs.go

@@ -20,7 +20,7 @@ type CustomsSearch struct {
 	InvoiceSerial string  // 出运发票号
 	CustomIds     []int64 // 客户筛选
 	StaffIds      []int64 // 业务员筛选
-	IsCancel      int64   // 是否有效
+	BanFlag       int64   // 是否有效
 	CustomsIds    []int64 // 报关id
 }
 type ReplyCustomsList struct {
@@ -40,7 +40,7 @@ type CustomsItem struct {
 	EstSailingDate  *time.Time `json:"estSailingDate"`
 	ShipPort        string     `json:"shipPort"`
 	DischargePort   string     `json:"dischargePort"`
-	IsCancel        int64      `json:"isCancel"`
+	BanFlag         int64      `json:"banFlag"`
 	CreatedStaffId  int64      `json:"createdStaffId"`
 	CreatedAt       *time.Time `json:"createdAt"`
 	UpdatedAt       *time.Time `json:"updatedAt"`
@@ -60,7 +60,7 @@ type ReplyCustomsInfo struct {
 	ReplyShipmentInfo
 	CustomsNo  string `json:"customsNo"`
 	ShipmentId int64  `json:"shipmentId"`
-	IsCancel   int64  `json:"isCancel"`
+	BanFlag    int64  `json:"banFlag"`
 }
 
 // Info @TITLE 详情

erp/shipment/exchangeSettlement.go

@@ -19,7 +19,7 @@ type ExchangeSettlementSearch struct {
 	InvoiceSerial         string  // 出运发票号
 	CustomIds             []int64 // 客户筛选
 	StaffIds              []int64 // 业务员筛选
-	IsCancel              int64   // 是否有效
+	BanFlag               int64   // 是否有效
 	ExchangeSettlementIds []int64 // 结汇id
 }
 type ReplyExchangeSettlementList struct {
@@ -39,7 +39,7 @@ type ExchangeSettlementItem struct {
 	EstSailingDate       *time.Time `json:"estSailingDate"`
 	ShipPort             string     `json:"shipPort"`
 	DischargePort        string     `json:"dischargePort"`
-	IsCancel             int64      `json:"isCancel"`
+	BanFlag              int64      `json:"banFlag"`
 	CreatedStaffId       int64      `json:"createdStaffId"`
 	CreatedAt            *time.Time `json:"createdAt"`
 	UpdatedAt            *time.Time `json:"updatedAt"`
@@ -80,7 +80,7 @@ type ReplyExchangeSettlementInfo struct {
 	Info                 string     `json:"info"`
 	CustomsInvoiceDate   *time.Time `json:"customsInvoiceDate"`
 	VesselNameVoyage     string     `json:"vesselNameVoyage"`
-	IsCancel             int64      `json:"isCancel"`
+	BanFlag              int64      `json:"banFlag"`
 	RecBankAddress       string     `json:"recBankAddress"`
 }
 

erp/shipment/serial.go

@@ -20,7 +20,7 @@ type SerialSearch struct {
 	InvoiceSerial string  // 出运发票号
 	CustomIds     []int64 // 客户筛选
 	StaffIds      []int64 // 业务员筛选
-	IsCancel      int64   // 是否有效
+	BanFlag       int64   // 是否有效
 	SerialIds     []int64 // 商检id
 }
 type ReplySerialList struct {
@@ -40,7 +40,7 @@ type SerialItem struct {
 	EstSailingDate  *time.Time `json:"estSailingDate"`
 	ShipPort        string     `json:"shipPort"`
 	DischargePort   string     `json:"dischargePort"`
-	IsCancel        int64      `json:"isCancel"`
+	BanFlag         int64      `json:"banFlag"`
 	CreatedStaffId  int64      `json:"createdStaffId"`
 	CreatedAt       *time.Time `json:"createdAt"`
 	UpdatedAt       *time.Time `json:"updatedAt"`
@@ -60,7 +60,7 @@ type ReplySerialInfo struct {
 	ReplyShipmentInfo
 	SerialNo   string `json:"serialNo"`
 	ShipmentId int64  `json:"shipmentId"`
-	IsCancel   int64  `json:"isCancel"`
+	BanFlag    int64  `json:"banFlag"`
 }
 
 // Info @TITLE 详情