kevin/ops2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
kevin
2026-04-30 19:50:31 +08:00
parent 612643e568
commit 2b3ee849f1
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.workbuddy/memory/2026-04-30.md
+7
View File
@@ -0,0 +1,7 @@
# 2026-04-30 工作记录
## 修复编译错误：TabCustomer 无 PrimaryPhone 字段
- **问题**: `apiWarehouse.go:1177` 中 `c.PrimaryPhone undefined`
- **原因**: `TabCustomer` 结构体没有 `PrimaryPhone` 字段，电话存储在独立的 `TabCustomerPhone` 表（`is_primary=true` 标记主号码）
- **修复**: 改为从 `TabCustomerPhone` 表查询主号码，拼接格式 `+{Prefix} {Phone}`，文件：`routers/apiWarehouse.go`
backend/my_work/routers/apiWarehouse.go
+21 -11
View File
@@ -800,13 +800,13 @@ func ApiWarehouse(r *gin.RouterGroup) {
} }
type FromUpdate struct { type FromUpdate struct {
ID uint `json:"id"` ID uint `json:"id"`
Name string `json:"name"` Name string `json:"name"`
SerialNumber string `json:"serial_number"` SerialNumber string `json:"serial_number"`
Remark string `json:"remark"` Remark string `json:"remark"`
Quantity int `json:"quantity"` Quantity int `json:"quantity"`
Photos []string `json:"photos"` Photos []string `json:"photos"`
CustomerIDs []uint `json:"customer_ids"` CustomerIDs []uint `json:"customer_ids"`
} }
var from FromUpdate var from FromUpdate
if err := decodeJSON(data, &from); err != nil || from.ID == 0 || from.Name == "" { if err := decodeJSON(data, &from); err != nil || from.ID == 0 || from.Name == "" {
@@ -1064,9 +1064,9 @@ func ApiWarehouse(r *gin.RouterGroup) {
itemsWithBreadcrumb := make([]ItemWithBreadcrumb, len(items)) itemsWithBreadcrumb := make([]ItemWithBreadcrumb, len(items))
for i, item := range items { for i, item := range items {
itemsWithBreadcrumb[i] = ItemWithBreadcrumb{ itemsWithBreadcrumb[i] = ItemWithBreadcrumb{
TabWarehouseItem: item, TabWarehouseItem: item,
WorkOrderCount: workOrderCounts[item.ID], WorkOrderCount: workOrderCounts[item.ID],
Customers: itemCustomers[item.ID], Customers: itemCustomers[item.ID],
} }
if item.ContainerID != nil { if item.ContainerID != nil {
itemsWithBreadcrumb[i].ContainerBreadcrumb = buildContainerBreadcrumb(*item.ContainerID, containerMap) itemsWithBreadcrumb[i].ContainerBreadcrumb = buildContainerBreadcrumb(*item.ContainerID, containerMap)
@@ -1169,12 +1169,22 @@ func ApiWarehouse(r *gin.RouterGroup) {
for _, b := range customerBinds { for _, b := range customerBinds {
var c TabCustomer var c TabCustomer
if models.DB.Where("id = ?", b.CustomerID).First(&c).Error == nil { if models.DB.Where("id = ?", b.CustomerID).First(&c).Error == nil {
// 查询主电话号码
var primaryPhone TabCustomerPhone
primaryPhoneStr := ""
if models.DB.Where("customer_id = ? AND is_primary = ?", c.ID, true).First(&primaryPhone).Error == nil {
if primaryPhone.Prefix != "" {
primaryPhoneStr = "+" + primaryPhone.Prefix + " " + primaryPhone.Phone
} else {
primaryPhoneStr = primaryPhone.Phone
}
}
customers = append(customers, CustomerInfo{ customers = append(customers, CustomerInfo{
ID: c.ID, ID: c.ID,
FirstName: c.FirstName, FirstName: c.FirstName,
LastName: c.LastName, LastName: c.LastName,
Title: c.Title, Title: c.Title,
PrimaryPhone: c.PrimaryPhone, PrimaryPhone: primaryPhoneStr,
}) })
} }
} }