shama/service
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(erp):优化销售产品结构并调整采购产品引用

Browse Source 
- 移除 PurchaseProductInfo 结构体定义- 更新 PurchaseProductItem 结构体字段- 在 SaleProductItem 中新增 ShipmentPurchaseProducts 字段
- 修改 PurchaseProducts 字段类型为 sale2.PurchaseProduct
- 引入 sale2 包以支持新的数据结构引用
This commit is contained in:
守护自己的云 2025-09-29 11:40:47 +08:00
parent 0593a556e4
commit 49e1b5050d
2 changed files with 161 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erp/shipment/modify/saleProduct.go
View File

@ -5,6 +5,7 @@ import (
"time" "time"
"git.kumo.work/shama/service/client" "git.kumo.work/shama/service/client"
sale2 "git.kumo.work/shama/service/erp/sale"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
) )
@ -87,29 +88,12 @@ type SaleProductItem struct {
CreatedAt *time.Time `json:"createdAt"` CreatedAt *time.Time `json:"createdAt"`
UpdatedAt *time.Time `json:"updatedAt"` UpdatedAt *time.Time `json:"updatedAt"`
Children []*SaleProductItem `json:"children"` Children []*SaleProductItem `json:"children"`
PurchaseProducts []PurchaseProductItem `json:"purchaseProducts"` ShipmentPurchaseProducts []PurchaseProductItem `json:"shipmentPurchaseProducts"`
PurchaseProducts []sale2.PurchaseProduct `json:"purchaseProducts"`
} }
type PurchaseProductItem struct { type PurchaseProductItem struct {
ShipmentPurchaseProductId int64 `json:"shipmentPurchaseProductId"` ShipmentPurchaseProductId int64 `json:"shipmentPurchaseProductId"`
ShipmentCount int64 `json:"shipmentCount"` ShipmentCount int64 `json:"shipmentCount"`
PurchaseProduct PurchaseProductInfo `json:"purchaseProduct"`
}
type PurchaseProductInfo struct {
Id int64 `json:"id"`
PurchaseId int64 `json:"purchaseId"`
PiSerial string `json:"piSerial"`
PoSerial string `json:"poSerial"`
BatchNo int64 `json:"batchNo"`
FactoryId int64 `json:"factoryId"`
FactoryName string `json:"factoryName"`
DeliveryDate *time.Time `json:"deliveryDate"`
DeliveryDateEnd *time.Time `json:"deliveryDateEnd"`
PurchaseCount int64 `json:"purchaseCount"`
PurchasePrice decimal.Decimal `json:"purchasePrice"`
ShipmentCount int64 `json:"shipmentCount"`
ShippedCount int64 `json:"shippedCount"`
AccountingCount int64 `json:"accountingCount"`
AccountedCount int64 `json:"accountedCount"`
} }
type ArgsSaleProductSearch struct { type ArgsSaleProductSearch struct {
ModifyId int64 // 订舱单修改id ModifyId int64 // 订舱单修改id

22
erp/shipment/saleProduct.go
View File

@ -5,6 +5,7 @@ import (
"time" "time"
"git.kumo.work/shama/service/client" "git.kumo.work/shama/service/client"
sale2 "git.kumo.work/shama/service/erp/sale"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
) )
@ -88,30 +89,13 @@ type SaleProductItem struct {
CreatedAt *time.Time `json:"createdAt"` CreatedAt *time.Time `json:"createdAt"`
UpdatedAt *time.Time `json:"updatedAt"` UpdatedAt *time.Time `json:"updatedAt"`
Children []*SaleProductItem `json:"children"` Children []*SaleProductItem `json:"children"`
PurchaseProducts []PurchaseProductItem `json:"purchaseProducts"` ShipmentPurchaseProducts []PurchaseProductItem `json:"shipmentPurchaseProducts"`
PurchaseProducts []sale2.PurchaseProduct `json:"purchaseProducts"`
} }
type PurchaseProductItem struct { type PurchaseProductItem struct {
ShipmentPurchaseProductId int64 `json:"shipmentPurchaseProductId"` ShipmentPurchaseProductId int64 `json:"shipmentPurchaseProductId"`
ShipmentCount int64 `json:"shipmentCount"` ShipmentCount int64 `json:"shipmentCount"`
PurchaseProduct PurchaseProductInfo `json:"purchaseProduct"`
}
type PurchaseProductInfo struct {
Id int64 `json:"id"`
PurchaseId int64 `json:"purchaseId"`
PiSerial string `json:"piSerial"`
PoSerial string `json:"poSerial"`
BatchNo int64 `json:"batchNo"`
FactoryId int64 `json:"factoryId"`
FactoryName string `json:"factoryName"`
DeliveryDate *time.Time `json:"deliveryDate"`
DeliveryDateEnd *time.Time `json:"deliveryDateEnd"`
PurchaseCount int64 `json:"purchaseCount"`
PurchasePrice decimal.Decimal `json:"purchasePrice"`
ShipmentCount int64 `json:"shipmentCount"`
ShippedCount int64 `json:"shippedCount"`
AccountingCount int64 `json:"accountingCount"`
AccountedCount int64 `json:"accountedCount"`
} }
type ArgsSaleProductSearch struct { type ArgsSaleProductSearch struct {
ShipmentId int64 // 出舱单 ShipmentId int64 // 出舱单