chore: 批量完成项目多模块迭代优化

1. 废弃半成品库存表并统一库存主表
2. 修复列表排序与搜索大小写不敏感问题
3. 新增用户最近登录时间、工单BOM名称字段
4. 完善角色管理、工位选择器功能
5. 增加拧紧数据补录、成品自动回流WMS能力
6. 统一导出时间范围校验规则
7. 丰富物料/备料单筛选条件
8. 调整菜单与权限命名适配产品型号业务
This commit is contained in:
SunYF
2026-09-08 11:44:04 +08:00
parent 06689970e2
commit e852c7cd37
96 changed files with 4528 additions and 542 deletions
+35 -2
View File
@@ -18,6 +18,8 @@ type Inventory struct {
ID int `json:"id,omitempty"`
// 管理粒度 1=结构件(批次) 2=精密件(SN)
ManageMode int `json:"manageMode,omitempty"`
// 品类 1=原材料 2=半成品 3=成品
Category int `json:"category,omitempty"`
// 物料编码(关联 materials 表)
MaterialCode string `json:"materialCode,omitempty"`
// 物料名称(冗余,便于直接展示)
@@ -42,6 +44,10 @@ type Inventory struct {
Supplier string `json:"supplier,omitempty"`
// 关联入库单号
InboundNo string `json:"inboundNo,omitempty"`
// 关联工单号(半成品/成品回流)
OrderNo string `json:"orderNo,omitempty"`
// 已完成工序(半成品用,如 135)
CompletedProcess string `json:"completedProcess,omitempty"`
// 备注
Remark string `json:"remark,omitempty"`
// CreatedAt holds the value of the "created_at" field.
@@ -56,9 +62,9 @@ func (*Inventory) scanValues(columns []string) ([]any, error) {
values := make([]any, len(columns))
for i := range columns {
switch columns[i] {
case inventory.FieldID, inventory.FieldManageMode, inventory.FieldQuantity, inventory.FieldLockedQty, inventory.FieldCreatedAt, inventory.FieldUpdatedAt:
case inventory.FieldID, inventory.FieldManageMode, inventory.FieldCategory, inventory.FieldQuantity, inventory.FieldLockedQty, inventory.FieldCreatedAt, inventory.FieldUpdatedAt:
values[i] = new(sql.NullInt64)
case inventory.FieldMaterialCode, inventory.FieldMaterialName, inventory.FieldBatchNo, inventory.FieldSnCode, inventory.FieldQualityStatus, inventory.FieldZoneCode, inventory.FieldStatus, inventory.FieldProductionDate, inventory.FieldSupplier, inventory.FieldInboundNo, inventory.FieldRemark:
case inventory.FieldMaterialCode, inventory.FieldMaterialName, inventory.FieldBatchNo, inventory.FieldSnCode, inventory.FieldQualityStatus, inventory.FieldZoneCode, inventory.FieldStatus, inventory.FieldProductionDate, inventory.FieldSupplier, inventory.FieldInboundNo, inventory.FieldOrderNo, inventory.FieldCompletedProcess, inventory.FieldRemark:
values[i] = new(sql.NullString)
default:
values[i] = new(sql.UnknownType)
@@ -87,6 +93,12 @@ func (_m *Inventory) assignValues(columns []string, values []any) error {
} else if value.Valid {
_m.ManageMode = int(value.Int64)
}
case inventory.FieldCategory:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field category", values[i])
} else if value.Valid {
_m.Category = int(value.Int64)
}
case inventory.FieldMaterialCode:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field material_code", values[i])
@@ -159,6 +171,18 @@ func (_m *Inventory) assignValues(columns []string, values []any) error {
} else if value.Valid {
_m.InboundNo = value.String
}
case inventory.FieldOrderNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field order_no", values[i])
} else if value.Valid {
_m.OrderNo = value.String
}
case inventory.FieldCompletedProcess:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field completed_process", values[i])
} else if value.Valid {
_m.CompletedProcess = value.String
}
case inventory.FieldRemark:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field remark", values[i])
@@ -216,6 +240,9 @@ func (_m *Inventory) String() string {
builder.WriteString("manage_mode=")
builder.WriteString(fmt.Sprintf("%v", _m.ManageMode))
builder.WriteString(", ")
builder.WriteString("category=")
builder.WriteString(fmt.Sprintf("%v", _m.Category))
builder.WriteString(", ")
builder.WriteString("material_code=")
builder.WriteString(_m.MaterialCode)
builder.WriteString(", ")
@@ -252,6 +279,12 @@ func (_m *Inventory) String() string {
builder.WriteString("inbound_no=")
builder.WriteString(_m.InboundNo)
builder.WriteString(", ")
builder.WriteString("order_no=")
builder.WriteString(_m.OrderNo)
builder.WriteString(", ")
builder.WriteString("completed_process=")
builder.WriteString(_m.CompletedProcess)
builder.WriteString(", ")
builder.WriteString("remark=")
builder.WriteString(_m.Remark)
builder.WriteString(", ")