696e90893b
UPDATE 漏列： - code_rules 的 SET 补上 category_id。此前改分类提示"保存成功"但不落库， 是唯一用户可达的活缺陷（同页的分类下拉没有 disabled，且规则只能改不能删， 没有"删了重建"这条退路） - code_rules 有 uk_code_rules_org_category，补列后改到已占用的分类会撞唯一键， 新建与更新统一翻成中文的 ErrDuplicateCodeRule - 分类/单位/仓库/库位/伙伴的编码定为不可变：分类编码是编码规则前缀的来源 （init.sql 的种子数据直接取 material_categories.code），伙伴编码是对外业务 编号，改掉会让历史数据脱节且查不回来。service 的 Update* 不再要求编码非空 ——原先是"必须传、传了却被丢弃"；新建侧的必填校验保留 - 顺带补齐两处同款漏网：organization.go 的 code 与 partner.go 的 partner_code （前者 service 本就不校验编码，自洽，无需改） 记录不存在时的静默成功： - DSN 开启 clientFoundRows，让 RowsAffected 返回"匹配"行数而非"实际改变"行数。 否则"编辑时一个字段都没改"和"记录不存在"都返回 0，无法区分，直接加检查会把 正常保存误判成记录不存在（真 MySQL 8.0 实测） - 新增 repository.execExpectingRow，7 个 Update* 影响 0 行时返回 ErrRecordNotFound； 伙伴走事务内的 SELECT ... FOR UPDATE，只需翻译 sql.ErrNoRows - 既有 4 处 RowsAffected 用法逐处核对过，均不受该 flag 影响 测试：补 6 个 Update* 的存在性检查、编码必填约束的两端、唯一键翻译、DSN 拼接； 全部做过变异验证（抽掉实现后对应测试确实变红）。
76 lines
3.0 KiB
Go
76 lines
3.0 KiB
Go
package repository
|
|
|
|
import (
|
|
"database/sql"
|
|
|
|
"github.com/wmms/wmms/internal/model"
|
|
"github.com/wmms/wmms/pkg/database"
|
|
)
|
|
|
|
type WarehouseRepository struct{}
|
|
|
|
func NewWarehouseRepository() *WarehouseRepository { return &WarehouseRepository{} }
|
|
|
|
func (r *WarehouseRepository) List(organizationID int64) ([]model.Warehouse, error) {
|
|
rows, err := database.DB.Query(`SELECT w.id, w.organization_id, w.code, w.name, w.status,
|
|
l.id, l.code, l.name, l.status
|
|
FROM warehouses w
|
|
LEFT JOIN warehouse_locations l ON l.warehouse_id = w.id
|
|
WHERE w.organization_id = ? ORDER BY w.code, l.code`, organizationID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close()
|
|
items := make([]model.Warehouse, 0)
|
|
index := make(map[int64]int)
|
|
for rows.Next() {
|
|
var warehouse model.Warehouse
|
|
var locationID sql.NullInt64
|
|
var locationCode, locationName, locationStatus sql.NullString
|
|
if err := rows.Scan(&warehouse.ID, &warehouse.OrganizationID, &warehouse.Code, &warehouse.Name, &warehouse.Status, &locationID, &locationCode, &locationName, &locationStatus); err != nil {
|
|
return nil, err
|
|
}
|
|
position, exists := index[warehouse.ID]
|
|
if !exists {
|
|
warehouse.Locations = []model.WarehouseLocation{}
|
|
items = append(items, warehouse)
|
|
position = len(items) - 1
|
|
index[warehouse.ID] = position
|
|
}
|
|
if locationID.Valid {
|
|
items[position].Locations = append(items[position].Locations, model.WarehouseLocation{ID: locationID.Int64, WarehouseID: warehouse.ID, Code: locationCode.String, Name: locationName.String, Status: locationStatus.String})
|
|
}
|
|
}
|
|
return items, rows.Err()
|
|
}
|
|
|
|
func (r *WarehouseRepository) Create(item *model.Warehouse) error {
|
|
result, err := database.DB.Exec(`INSERT INTO warehouses (organization_id, code, name, status) VALUES (?, ?, ?, ?)`, item.OrganizationID, item.Code, item.Name, item.Status)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
item.ID, err = result.LastInsertId()
|
|
return err
|
|
}
|
|
|
|
func (r *WarehouseRepository) Update(item *model.Warehouse) error {
|
|
return execExpectingRow(`UPDATE warehouses SET name = ?, status = ? WHERE id = ? AND organization_id = ?`, item.Name, item.Status, item.ID, item.OrganizationID)
|
|
}
|
|
|
|
func (r *WarehouseRepository) CreateLocation(item *model.WarehouseLocation, organizationID int64) error {
|
|
result, err := database.DB.Exec(`INSERT INTO warehouse_locations (warehouse_id, code, name, status)
|
|
SELECT id, ?, ?, ? FROM warehouses WHERE id = ? AND organization_id = ?`, item.Code, item.Name, item.Status, item.WarehouseID, organizationID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
item.ID, err = result.LastInsertId()
|
|
return err
|
|
}
|
|
|
|
func (r *WarehouseRepository) UpdateLocation(item *model.WarehouseLocation, organizationID int64) error {
|
|
// JOIN 形式的 UPDATE 同样受 clientFoundRows 影响，影响 0 行也代表库位不存在
|
|
// 或不属于该组织（已实测）。
|
|
return execExpectingRow(`UPDATE warehouse_locations l JOIN warehouses w ON w.id = l.warehouse_id
|
|
SET l.name = ?, l.status = ? WHERE l.id = ? AND w.organization_id = ?`, item.Name, item.Status, item.ID, organizationID)
|
|
}
|