refactor(wms): 合并库存表为统一inventory,重构业务逻辑
1. 合并inventory_batch与serial_number为统一inventory表,用manage_mode区分结构件批次/精密件SN 2. 移除冗余的material_type字段与相关逻辑 3. 重构库存查询、检验、入库出库等业务逻辑适配新表结构 4. 调整前端路由与菜单,拆分基础数据为区域维护和物料档案 5. 优化入库校验逻辑,避免空单问题 6. 调整Vite构建配置,关闭自动清空输出目录 7. 为各模块添加详细中文注释,统一业务术语 8. 生成并更新Ent自动代码文件
This commit is contained in:
@@ -6,9 +6,8 @@ import (
|
||||
"bj_power_wms/ent"
|
||||
"bj_power_wms/ent/inbounddetail"
|
||||
"bj_power_wms/ent/inboundorder"
|
||||
"bj_power_wms/ent/inventorybatch"
|
||||
"bj_power_wms/ent/inventory"
|
||||
"bj_power_wms/ent/material"
|
||||
"bj_power_wms/ent/serialnumber"
|
||||
"bj_power_wms/internal/svc"
|
||||
|
||||
"github.com/google/uuid"
|
||||
@@ -18,6 +17,8 @@ import (
|
||||
// createInboundHandler 入库
|
||||
// 结构件: { inboundType, materialCode, batchNo, quantity, zoneCode, operator }
|
||||
// 精密件: { inboundType, materialCode, snList: [sn...], zoneCode, operator }
|
||||
//
|
||||
// 事务保证:入库单 + 库存行(inventory) + 入库明细 三者要么全成功,要么全回滚,杜绝半成品状态。
|
||||
func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
@@ -56,8 +57,20 @@ func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
|
||||
inboundNo := "IB" + uuid.NewString()[:12]
|
||||
|
||||
// 入库单
|
||||
ib, err := ctx.EntClient.InboundOrder.Create().
|
||||
// 开启事务:入库单 + 库存行 + 明细 原子提交
|
||||
tx, err := ctx.EntClient.Tx(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, "开启事务失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
committed := false
|
||||
defer func() {
|
||||
if !committed {
|
||||
_ = tx.Rollback()
|
||||
}
|
||||
}()
|
||||
|
||||
ib, err := tx.InboundOrder.Create().
|
||||
SetInboundNo(inboundNo).
|
||||
SetNillableInboundType(strPtr(req.InboundType)).
|
||||
SetMaterialCode(req.MaterialCode).
|
||||
@@ -93,35 +106,45 @@ func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
|
||||
// 同批次追加(多批到货追加)
|
||||
existing, err := ctx.EntClient.InventoryBatch.Query().
|
||||
Where(inventorybatch.BatchNoEQ(batchNo)).
|
||||
Only(ctx0())
|
||||
if err == nil {
|
||||
ctx.EntClient.InventoryBatch.UpdateOneID(existing.ID).
|
||||
SetQuantity(existing.Quantity + qty).
|
||||
existing, e := tx.Inventory.Query().
|
||||
Where(inventory.ManageModeEQ(1), inventory.BatchNoEQ(batchNo)).Only(ctx0())
|
||||
if e == nil {
|
||||
if _, err = tx.Inventory.UpdateOneID(existing.ID).
|
||||
AddQuantity(qty).
|
||||
SetNillableSupplier(strPtr(req.Supplier)).
|
||||
ExecX(ctx0())
|
||||
Save(ctx0()); err != nil {
|
||||
fail(w, http.StatusInternalServerError, "追加批次失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
} else {
|
||||
ctx.EntClient.InventoryBatch.Create().
|
||||
SetBatchNo(batchNo).
|
||||
if _, err = tx.Inventory.Create().
|
||||
SetManageMode(1).
|
||||
SetMaterialCode(req.MaterialCode).
|
||||
SetNillableMaterialName(strPtr(m.Name)).
|
||||
SetQuantity(qty).
|
||||
SetLockedQty(0).
|
||||
SetBatchNo(batchNo).
|
||||
SetQuantity(qty).SetLockedQty(0).
|
||||
SetNillableProductionDate(strPtr(req.ProductionDate)).
|
||||
SetNillableSupplier(strPtr(req.Supplier)).
|
||||
SetQualityStatus("未检").
|
||||
SetNillableZoneCode(strPtr(req.ZoneCode)).
|
||||
SaveX(ctx0())
|
||||
SetStatus("在库").
|
||||
SetInboundNo(inboundNo).
|
||||
Save(ctx0()); err != nil {
|
||||
fail(w, http.StatusInternalServerError, "创建库存行失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// 明细
|
||||
ctx.EntClient.InboundDetail.Create().
|
||||
if _, err = tx.InboundDetail.Create().
|
||||
SetInboundNo(inboundNo).
|
||||
SetBatchNo(batchNo).
|
||||
SetMaterialCode(req.MaterialCode).
|
||||
SetQuantity(qty).
|
||||
SaveX(ctx0())
|
||||
Save(ctx0()); err != nil {
|
||||
fail(w, http.StatusInternalServerError, "创建入库明细失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
totalQty = qty
|
||||
}
|
||||
|
||||
@@ -133,33 +156,52 @@ func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
for _, sn := range req.SnList {
|
||||
// 查重
|
||||
exists, _ := ctx.EntClient.SerialNumber.Query().
|
||||
Where(serialnumber.SnCodeEQ(sn)).
|
||||
exists, _ := tx.Inventory.Query().
|
||||
Where(inventory.ManageModeEQ(2), inventory.SnCodeEQ(sn)).
|
||||
Exist(ctx0())
|
||||
if exists {
|
||||
fail(w, http.StatusConflict, "SN 已存在: "+sn)
|
||||
return
|
||||
}
|
||||
ctx.EntClient.SerialNumber.Create().
|
||||
SetSnCode(sn).
|
||||
if _, err = tx.Inventory.Create().
|
||||
SetManageMode(2).
|
||||
SetMaterialCode(req.MaterialCode).
|
||||
SetStatus("在库").
|
||||
SetNillableCurrentZone(strPtr(req.ZoneCode)).
|
||||
SetNillableMaterialName(strPtr(m.Name)).
|
||||
SetSnCode(sn).
|
||||
SetQuantity(1).SetLockedQty(0).
|
||||
SetQualityStatus("未检").
|
||||
SaveX(ctx0())
|
||||
ctx.EntClient.InboundDetail.Create().
|
||||
SetNillableZoneCode(strPtr(req.ZoneCode)).
|
||||
SetStatus("在库").
|
||||
SetInboundNo(inboundNo).
|
||||
Save(ctx0()); err != nil {
|
||||
fail(w, http.StatusInternalServerError, "创建 SN 库存行失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
if _, err = tx.InboundDetail.Create().
|
||||
SetInboundNo(inboundNo).
|
||||
SetSnCode(sn).
|
||||
SetMaterialCode(req.MaterialCode).
|
||||
SetQuantity(1).
|
||||
SaveX(ctx0())
|
||||
Save(ctx0()); err != nil {
|
||||
fail(w, http.StatusInternalServerError, "创建入库明细失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
}
|
||||
totalQty = len(req.SnList)
|
||||
}
|
||||
|
||||
// 更新入库单数量
|
||||
ctx.EntClient.InboundOrder.UpdateOneID(ib.ID).
|
||||
SetQuantity(totalQty).ExecX(ctx0())
|
||||
if _, err = tx.InboundOrder.UpdateOneID(ib.ID).
|
||||
SetQuantity(totalQty).Save(ctx0()); err != nil {
|
||||
fail(w, http.StatusInternalServerError, "更新入库单数量失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
if err = tx.Commit(); err != nil {
|
||||
fail(w, http.StatusInternalServerError, "提交事务失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
committed = true
|
||||
|
||||
logx.Infof("inbound: no=%s material=%s qty=%d by=%s", inboundNo, req.MaterialCode, totalQty, req.Operator)
|
||||
ok(w, map[string]any{
|
||||
|
||||
Reference in New Issue
Block a user