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:
@@ -5,7 +5,7 @@ import (
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"bj_power_wms/ent/inventorybatch"
|
||||
"bj_power_wms/ent/inventory"
|
||||
"bj_power_wms/ent/material"
|
||||
"bj_power_wms/internal/svc"
|
||||
|
||||
@@ -84,30 +84,32 @@ func excelInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
} else if m.ManageMode == 2 {
|
||||
res.Error = "精密件请使用 SN 扫码入库,不支持 Excel 导入"
|
||||
} else {
|
||||
if batchNo == "" {
|
||||
batchNo = genBatchNo(code)
|
||||
}
|
||||
// 同批次追加或新建
|
||||
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).
|
||||
SetNillableSupplier(strPtr(supplier)).
|
||||
ExecX(ctx0())
|
||||
} else {
|
||||
ctx.EntClient.InventoryBatch.Create().
|
||||
SetBatchNo(batchNo).
|
||||
SetMaterialCode(code).
|
||||
SetNillableMaterialName(strPtr(m.Name)).
|
||||
SetQuantity(qty).
|
||||
SetLockedQty(0).
|
||||
SetNillableProductionDate(strPtr(prodDate)).
|
||||
SetNillableSupplier(strPtr(supplier)).
|
||||
SetQualityStatus("未检").
|
||||
SetNillableZoneCode(strPtr(zone)).
|
||||
SaveX(ctx0())
|
||||
}
|
||||
if batchNo == "" {
|
||||
batchNo = genBatchNo(code)
|
||||
}
|
||||
// 同批次追加或新建
|
||||
existing, err := ctx.EntClient.Inventory.Query().
|
||||
Where(inventory.ManageModeEQ(1), inventory.BatchNoEQ(batchNo)).Only(ctx0())
|
||||
if err == nil {
|
||||
ctx.EntClient.Inventory.UpdateOneID(existing.ID).
|
||||
AddQuantity(qty).
|
||||
SetNillableSupplier(strPtr(supplier)).
|
||||
ExecX(ctx0())
|
||||
} else {
|
||||
ctx.EntClient.Inventory.Create().
|
||||
SetManageMode(1).
|
||||
SetBatchNo(batchNo).
|
||||
SetMaterialCode(code).
|
||||
SetNillableMaterialName(strPtr(m.Name)).
|
||||
SetQuantity(qty).
|
||||
SetLockedQty(0).
|
||||
SetNillableProductionDate(strPtr(prodDate)).
|
||||
SetNillableSupplier(strPtr(supplier)).
|
||||
SetQualityStatus("未检").
|
||||
SetNillableZoneCode(strPtr(zone)).
|
||||
SetStatus("在库").
|
||||
SaveX(ctx0())
|
||||
}
|
||||
inboundNo := "IB" + nowStr() + fmt.Sprintf("%03d", i)
|
||||
ctx.EntClient.InboundOrder.Create().
|
||||
SetInboundNo(inboundNo).
|
||||
|
||||
Reference in New Issue
Block a user