feat(receivable): 在应收结构体中新增收汇客户ID字段

- 在 Receivable 结构体中添加 RecCustomId 字段用于记录收汇客户ID

erp/accounting.go

@@ -252,3 +252,20 @@ func (a *accounting) CancelAudit(ctx context.Context, accountingId int64) (err e
 	err = xClient.Call(ctx, "CancelAudit", accountingId, &reply)
 	return
 }
+
+type ArgsAccountingReject struct {
+	StaffId      int64  // 操作人
+	AccountingId int64  // 做账合同id
+	Reason       string // 驳回原因
+}
+
+// Reject @TITLE 一键驳回
+func (a *accounting) Reject(ctx context.Context, args ArgsAccountingReject) (err error) {
+	xClient, err := client.GetClient(a)
+	if err != nil {
+		return
+	}
+	reply := 0
+	err = xClient.Call(ctx, "Reject", args, &reply)
+	return
+}

erp/constant.go

@@ -149,7 +149,7 @@ const (
 	OrderFieldReceiptReceiptDate        OrderField = "receiptDate"
 	OrderFieldReceiptPayCompany         OrderField = "payCompany"
 	OrderFieldReceiptBankAccount        OrderField = "bankAccount"
-	OrderFieldReceiptIk3cloudUpdatedAt  OrderField = "ik3cloudUpdatedAt"
+	OrderFieldReceiptIk3cloudUpdatedAt  OrderField = "ik3CloudUpdatedAt"
 
 	OrderFieldPayableCreatedAt OrderField = "createdAt"
 	OrderFieldPayableAmount    OrderField = "amount"

erp/expense.go

@@ -247,3 +247,19 @@ func (r *expense) Cancel(ctx context.Context, expenseId int64) (err error) {
 	reply := 0
 	return xClient.Call(ctx, "Cancel", expenseId, &reply)
 }
+
+type ArgsExpenseReject struct {
+	StaffId   int64  // 员工id
+	ExpenseId int64  // 报销单id
+	Reason    string // 驳回原因
+}
+
+// Reject @TITLE 驳回（审核通过且打款状态为待提交时可驳回）
+func (r *expense) Reject(ctx context.Context, args ArgsExpenseReject) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Reject", args, &reply)
+}

erp/factory.go

@@ -66,6 +66,9 @@ type FactoryItem struct {
 	BanFlag         int64      `json:"banFlag"`
 	MaterialQuality string     `json:"materialQuality"`
 	InvoiceType     string     `json:"invoiceType"`
+	Currency        string     `json:"currency"`
+	CurrencyName    string     `json:"currencyName"`
+	CurrencySymbol  string     `json:"currencySymbol"`
 	Status          *int64     `json:"status"`
 	CreatedStaffId  int64      `json:"createdStaffId"`
 	CreatedAt       *time.Time `json:"createdAt"`
@@ -96,6 +99,9 @@ type FactoryAdd struct {
 	Origin          string                // 工厂来源
 	MaterialQuality string                // 材质
 	InvoiceType     string                // 发票
+	Currency        string                // 币种
+	CurrencyName    string                // 币种名称
+	CurrencySymbol  string                // 币种符号
 	BanFlag         int64                 // 禁用标记 1=禁用 2=正常
 	City            string                // 所在城市
 	Address         string                // 工厂地址
@@ -171,6 +177,9 @@ type ReplyFactoryInfo struct {
 	BanFlag         int64      `json:"banFlag"`
 	MaterialQuality string     `json:"materialQuality"`
 	InvoiceType     string     `json:"invoiceType"`
+	Currency        string     `json:"currency"`
+	CurrencyName    string     `json:"currencyName"`
+	CurrencySymbol  string     `json:"currencySymbol"`
 	Status          *int64     `json:"status"`
 	CreatedStaffId  int64      `json:"createdStaffId"`
 	CreatedAt       *time.Time `json:"createdAt"`

erp/paymentRefund.go

@@ -21,6 +21,7 @@ type PaymentRefundSearch struct {
 	PaymentRefundSerial string     // 付款退款单号
 	FactoryId           int64      // 工厂
 	FactoryName         string     // 工厂名称
+	IsConfirm           int64      // 确认状态 1=已确认 2=未确认
 	CreatedAtStart      *time.Time // 创建开始时间
 	CreatedAtEnd        *time.Time // 创建结束时间
 }
@@ -33,6 +34,7 @@ type PaymentRefundItem struct {
 	PaymentRefundSerial  string          `json:"paymentRefundSerial"`
 	FactoryId            int64           `json:"factoryId"`
 	FactoryName          string          `json:"factoryName"`
+	PayCompany           string          `json:"payCompany"`
 	Amount               decimal.Decimal `json:"amount"`
 	Currency             string          `json:"currency"`
 	CurrencyName         string          `json:"currencyName"`
@@ -44,6 +46,7 @@ type PaymentRefundItem struct {
 	PaymentPurposeNumber string          `json:"paymentPurposeNumber"`
 	PaymentPurpose       string          `json:"paymentPurpose"`
 	Remark               string          `json:"remark"`
+	IsConfirm            int64           `json:"isConfirm"`
 	Ik3cloudStatus       int64           `json:"ik3CloudStatus"`
 	Ik3cloudErrMsg       string          `json:"ik3CloudErrMsg"`
 	Ik3cloudUpdatedAt    *time.Time      `json:"ik3CloudUpdatedAt"`
@@ -98,6 +101,25 @@ func (p *paymentRefund) Add(ctx context.Context, args ArgsPaymentRefundAdd) (pay
 	return
 }
 
+type ArgsPaymentRefundGen struct {
+	StaffId              int64  // 员工id
+	ReceiptId            int64  // 收汇单id
+	FactoryId            int64  // 工厂id
+	InvoiceSerial        string // 发票号
+	PaymentPurposeNumber string // 原付款用途编码
+	PaymentPurpose       string // 原付款用途
+}
+
+// Gen @TITLE 生成
+func (p *paymentRefund) Gen(ctx context.Context, args ArgsPaymentRefundGen) (err error) {
+	xClient, err := client.GetClient(p)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Gen", args, &reply)
+}
+
 // Info @TITLE 详情
 func (p *paymentRefund) Info(ctx context.Context, paymentRefundId int64) (reply PaymentRefundItem, err error) {
 	xClient, err := client.GetClient(p)
@@ -123,6 +145,36 @@ func (p *paymentRefund) Edit(ctx context.Context, args ArgsPaymentRefundEdit) (e
 	return xClient.Call(ctx, "Edit", args, &reply)
 }
 
+// Cancel @TITLE 取消付款退款单
+func (p *paymentRefund) Cancel(ctx context.Context, paymentRefundId int64) error {
+	xClient, err := client.GetClient(p)
+	if err != nil {
+		return err
+	}
+	reply := 0
+	return xClient.Call(ctx, "Cancel", paymentRefundId, &reply)
+}
+
+// Confirm @TITLE 确认付款退款单
+func (p *paymentRefund) Confirm(ctx context.Context, paymentRefundId int64) (err error) {
+	xClient, err := client.GetClient(p)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Confirm", paymentRefundId, &reply)
+}
+
+// CancelConfirm @TITLE 取消确认付款退款单
+func (p *paymentRefund) CancelConfirm(ctx context.Context, paymentRefundId int64) (err error) {
+	xClient, err := client.GetClient(p)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "CancelConfirm", paymentRefundId, &reply)
+}
+
 // Ik3cloud @TITLE 金蝶同步
 func (p *paymentRefund) Ik3cloud(ctx context.Context, paymentRefundId int64) (err error) {
 	xClient, err := client.GetClient(p)

erp/product.go

@@ -32,6 +32,7 @@ type ProductSearch struct {
 	CreatedAtStart       *time.Time // 录入开始时间
 	CreatedAtEnd         *time.Time // 录入结束时间
 	ParentIds            []int64    // 上级id
+	FactoryName          string     // 工厂名称
 }
 
 type ProductItem struct {

erp/receivable.go

@@ -20,6 +20,8 @@ type ReceivableSearch struct {
 	ReceivableSerial   string     // 收款单据号
 	CustomId           int64      // 客户id
 	CustomName         string     // 客户名称
+	RecCustomId        int64      // 收汇客户id
+	RecCustomName      string     // 收汇客户名称
 	InvoiceSerial      string     // 出运发票号
 	InvoiceSerialEq    string     // 出运发票号
 	CreatedAtStart     *time.Time // 创建开始时间

erp/request.go

@@ -276,3 +276,19 @@ func (r *request) Cancel(ctx context.Context, requestId int64) (err error) {
 	reply := 0
 	return xClient.Call(ctx, "Cancel", requestId, &reply)
 }
+
+type ArgsRequestReject struct {
+	StaffId   int64  // 员工id
+	RequestId int64  // 付款申请单id
+	Reason    string // 驳回原因
+}
+
+// Reject @TITLE 驳回（审核通过且打款状态为待提交时可驳回）
+func (r *request) Reject(ctx context.Context, args ArgsRequestReject) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Reject", args, &reply)
+}

erp/sale/audit.go

@@ -58,6 +58,7 @@ type ChangeProductItem struct {
 	Id        int64            // 产品id
 	SaleCount *int64           // 销售数量
 	SalePrice *decimal.Decimal // 销售单价
+	BoxAmount *decimal.Decimal // 单箱金额
 }
 
 // Change @TITLE 编辑商品审核

erp/sale/product.go

@@ -54,6 +54,7 @@ type ProductListItem struct {
 	SaleCount          int64            `json:"saleCount"`
 	SaleAmount         decimal.Decimal  `json:"saleAmount"`
 	BoxCount           int64            `json:"boxCount"`
+	BoxAmount          decimal.Decimal  `json:"boxAmount"`
 	QuotePrice         decimal.Decimal  `json:"quotePrice"`
 	QuoteFactorySerial string           `json:"quoteFactorySerial"`
 	QuoteFactoryId     int64            `json:"quoteFactoryId"`
@@ -113,6 +114,7 @@ type ProductItem struct {
 	SaleCount          int64            `json:"saleCount"`
 	SaleAmount         decimal.Decimal  `json:"saleAmount"`
 	BoxCount           int64            `json:"boxCount"`
+	BoxAmount          decimal.Decimal  `json:"boxAmount"`
 	QuotePrice         decimal.Decimal  `json:"quotePrice"`
 	QuoteFactorySerial string           `json:"quoteFactorySerial"`
 	QuoteFactoryId     int64            `json:"quoteFactoryId"`
@@ -177,6 +179,7 @@ type ProductAdd struct {
 	PackageWeight         decimal.Decimal  // 包装重量
 	Sort                  int64            // 排序
 	SaleCount             int64            // 销售数量/合同数量
+	BoxAmount             decimal.Decimal  // 单箱金额(手填)
 	Packages              []ProductPackage // 包装
 	Customs               ProductCustoms   // 海关
 	Quote                 ProductQuote     // 工厂报价
@@ -277,6 +280,7 @@ type ReplyProductInfo struct {
 	PurchasedCount        int64                `json:"purchasedCount"`
 	ShipmentCount         int64                `json:"shipmentCount"`
 	ShippedCount          int64                `json:"shippedCount"`
+	BoxAmount             decimal.Decimal      `json:"boxAmount"`
 	AccountingCount       int64                `json:"accountingCount"`
 	AccountedCount        int64                `json:"accountedCount"`
 	CreatedAt             *time.Time           `json:"createdAt"`
@@ -369,6 +373,7 @@ type ProductEdit struct {
 	Weight                *decimal.Decimal // 重量
 	Texture               string           // 材质
 	SalePrice             decimal.Decimal  // 销售单价
+	BoxAmount             decimal.Decimal  // 单箱金额(手填)
 	BanFlag               int64            // 禁用标记 1=禁用，2=可用
 	Mold                  int64            // 组成类型 1=单件 2=套件
 	MoldCount             int64            // 子组件数量
@@ -405,6 +410,7 @@ type MultiData struct {
 	QuotePrice    decimal.Decimal // 采购单价
 	SalePrice     decimal.Decimal // 销售单价
 	SaleCount     int64           // 销售数量
+	BoxAmount     decimal.Decimal // 单箱金额(手填)
 	Info          string          // 备注
 }
 

erp/shipment/mixed.go

@@ -19,6 +19,7 @@ type ArgsMixedList struct {
 }
 type MixedSearch struct {
 	InvoiceSerial   string  // 出运发票号
+	CreatedStaffId  int64   // 创建人（精确筛选）
 	CreatedStaffIds []int64 // 业务员筛选
 }
 type ReplyMixedList struct {

erp/shipment/mixed/product.go

@@ -38,6 +38,7 @@ type ProductItem struct {
 	FactoryName                 string           `json:"factoryName"`
 	SalePrice                   decimal.Decimal  `json:"salePrice"`
 	SaleAmount                  decimal.Decimal  `json:"saleAmount"`
+	BoxAmount                   decimal.Decimal  `json:"boxAmount"`
 	CustomsPrice                decimal.Decimal  `json:"customsPrice"`
 	CustomsAmount               decimal.Decimal  `json:"customsAmount"`
 	OuterLength                 *decimal.Decimal `json:"outerLength"`

erp/shipment/modify/saleProduct.go

@@ -37,6 +37,7 @@ type SaleProductItem struct {
 	CustomsDetail               string                  `json:"customsDetail"`
 	BlEngName                   string                  `json:"blEngName"`
 	BoxCount                    int64                   `json:"boxCount"`
+	BoxAmount                   decimal.Decimal         `json:"boxAmount"`
 	InnerNum                    int64                   `json:"innerNum"`
 	InnerBoxCount               *int64                  `json:"innerBoxCount"`
 	BoxNumUnit                  string                  `json:"boxNumUnit"`
@@ -152,6 +153,7 @@ type SaleProductAdd struct {
 	CustomsGrossWeight      decimal.Decimal  // 报关毛重
 	TotalCustomsGrossWeight decimal.Decimal  // 报关总毛重
 	SalePrice               decimal.Decimal  // 销售单价
+	BoxAmount               decimal.Decimal  // 单箱金额
 	CustomsPrice            decimal.Decimal  // 报关价格
 	CustomsAmount           decimal.Decimal  // 报关总价
 	CustomsBrand            string           // 品牌
@@ -223,6 +225,7 @@ type SaleProductEdit struct {
 	CustomsGrossWeight       decimal.Decimal  // 报关毛重
 	TotalCustomsGrossWeight  decimal.Decimal  // 报关总毛重
 	SalePrice                decimal.Decimal  // 销售单价
+	BoxAmount                decimal.Decimal  // 单箱金额
 	CustomsPrice             decimal.Decimal  // 报关单价
 	CustomsAmount            decimal.Decimal  // 报关总价
 	CustomsBrand             string           // 品牌

erp/shipment/saleProduct.go

@@ -37,6 +37,7 @@ type SaleProductItem struct {
 	CustomsDetail               string                  `json:"customsDetail"`
 	BlEngName                   string                  `json:"blEngName"`
 	BoxCount                    int64                   `json:"boxCount"`
+	BoxAmount                   decimal.Decimal         `json:"boxAmount"`
 	InnerNum                    int64                   `json:"innerNum"`
 	InnerBoxCount               *int64                  `json:"innerBoxCount"`
 	BoxNumUnit                  string                  `json:"boxNumUnit"`
@@ -153,6 +154,7 @@ type SaleProductAdd struct {
 	CustomsGrossWeight      decimal.Decimal  // 报关毛重
 	TotalCustomsGrossWeight decimal.Decimal  // 报关总毛重
 	SalePrice               decimal.Decimal  // 销售单价
+	BoxAmount               decimal.Decimal  // 单箱金额
 	CustomsPrice            decimal.Decimal  // 报关价格
 	CustomsAmount           decimal.Decimal  // 报关总价
 	CustomsBrand            string           // 品牌
@@ -224,6 +226,7 @@ type SaleProductEdit struct {
 	CustomsGrossWeight       decimal.Decimal  // 报关毛重
 	TotalCustomsGrossWeight  decimal.Decimal  // 报关总毛重
 	SalePrice                decimal.Decimal  // 销售单价
+	BoxAmount                decimal.Decimal  // 单箱金额
 	CustomsBrand             string           // 品牌
 	CustomsPrice             decimal.Decimal  // 报关价格
 	CustomsAmount            decimal.Decimal  // 报关总价

ik3cloud/factory.go

@@ -23,6 +23,7 @@ type ArgsFactorySave struct {
 	Contacts         []FactoryContactItem
 	DepartmentNumber string // 部门编号
 	StaffNumber      string // 员工编号
+	CurrencyNumber   string // 币种编号
 }
 
 type FactoryContactItem struct {

ik3cloud/paymentRefund.go

@@ -30,6 +30,7 @@ type PaymentRefundCostItem struct {
 	Amount           decimal.Decimal // 金额
 	BankAccount      string          // 我方银行账号
 	InvoiceSerial    string          // 发票号
+	DepartmentNumber string          // 部门编码
 }
 
 // Save @TITLE 保存付款退款单