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,10 +5,10 @@ import (
|
||||
"time"
|
||||
|
||||
"bj_power_wms/ent/inboundorder"
|
||||
"bj_power_wms/ent/inventory"
|
||||
"bj_power_wms/ent/ordermaterialledger"
|
||||
"bj_power_wms/ent/outboundorder"
|
||||
"bj_power_wms/ent/semifinished"
|
||||
"bj_power_wms/ent/serialnumber"
|
||||
"bj_power_wms/internal/svc"
|
||||
)
|
||||
|
||||
@@ -68,8 +68,8 @@ func ledgerSyncHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
// internalDisplayHandler 库存总览(55寸大屏免登录用)
|
||||
func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
// 批次库存总量(按质量状态)
|
||||
batches, _ := ctx.EntClient.InventoryBatch.Query().All(ctx0())
|
||||
// 批次库存(结构件)总量(按质量状态)
|
||||
batches, _ := ctx.EntClient.Inventory.Query().Where(inventory.ManageModeEQ(1)).All(ctx0())
|
||||
totalQty := 0
|
||||
lockedQty := 0
|
||||
type zoneRow struct {
|
||||
@@ -81,10 +81,14 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
for _, b := range batches {
|
||||
totalQty += b.Quantity
|
||||
lockedQty += b.LockedQty
|
||||
zones[b.ZoneCode+"/"+b.QualityStatus] += b.Quantity
|
||||
zc := b.ZoneCode
|
||||
if zc == "" {
|
||||
zc = "未分区"
|
||||
}
|
||||
zones[zc+"/"+b.QualityStatus] += b.Quantity
|
||||
}
|
||||
snInStock, _ := ctx.EntClient.SerialNumber.Query().Where(serialnumber.StatusIn("在库", "锁定")).Count(ctx0())
|
||||
snOut, _ := ctx.EntClient.SerialNumber.Query().Where(serialnumber.StatusEQ("出库")).Count(ctx0())
|
||||
snInStock, _ := ctx.EntClient.Inventory.Query().Where(inventory.ManageModeEQ(2), inventory.StatusIn("在库", "锁定")).Count(ctx0())
|
||||
snOut, _ := ctx.EntClient.Inventory.Query().Where(inventory.ManageModeEQ(2), inventory.StatusEQ("出库")).Count(ctx0())
|
||||
semiInStock, _ := ctx.EntClient.SemiFinished.Query().Where(semifinished.StatusEQ("在库")).Count(ctx0())
|
||||
pkgCount, _ := ctx.EntClient.PackageBox.Query().Count(ctx0())
|
||||
|
||||
|
||||
Reference in New Issue
Block a user