feat&refactor: 完成多模块功能迭代与配置优化
本次提交覆盖多个业务模块的功能完善与体验优化:
1. **鉴权与配置调整**:
- 统一JWT滑动续签逻辑,简化Token存储,移除RefreshToken相关冗余代码
- 调整多项目配置文件中JWT过期时间为3600秒,统一会话闲置窗口
- 工位配置放开1~12限制,改为仅校验大于0
2. **术语统一替换**:全链路将"精密件"替换为"电气件",修正物料管理描述
3. **功能新增**:
- 新增工位类型、工艺路线与产线点位台账模块
- 添加工艺PDF预览面板、工位终端代理转发接口
- 新增操作日志按操作人列表筛选、工位登出日志记录
- 新增PLC移料指令与产线点位状态管理
4. **业务流程优化**:
- 调整BOM物料删除校验逻辑,优化工单备料计算
- 补充物料图号、检测单号等追溯字段
- 完善工艺流程图与工位绑定关系说明
- 优化前端页面文案与交互细节
5. **代码规范与维护**:
- 新增通用工具函数与前端静态资源
- 整理路由权限与中间件逻辑
- 修复部分接口与配置的不兼容问题
This commit is contained in:
@@ -15,8 +15,6 @@ const (
|
||||
FieldID = "id"
|
||||
// FieldFlowId holds the string denoting the flowid field in the database.
|
||||
FieldFlowId = "flow_id"
|
||||
// FieldProcessCode holds the string denoting the processcode field in the database.
|
||||
FieldProcessCode = "process_code"
|
||||
// FieldSeq holds the string denoting the seq field in the database.
|
||||
FieldSeq = "seq"
|
||||
// FieldName holds the string denoting the name field in the database.
|
||||
@@ -25,6 +23,8 @@ const (
|
||||
FieldCollectType = "collect_type"
|
||||
// FieldIsTorque holds the string denoting the istorque field in the database.
|
||||
FieldIsTorque = "is_torque"
|
||||
// FieldNeedCheck holds the string denoting the needcheck field in the database.
|
||||
FieldNeedCheck = "need_check"
|
||||
// FieldRemark holds the string denoting the remark field in the database.
|
||||
FieldRemark = "remark"
|
||||
// FieldCreatedAt holds the string denoting the createdat field in the database.
|
||||
@@ -37,11 +37,11 @@ const (
|
||||
var Columns = []string{
|
||||
FieldID,
|
||||
FieldFlowId,
|
||||
FieldProcessCode,
|
||||
FieldSeq,
|
||||
FieldName,
|
||||
FieldCollectType,
|
||||
FieldIsTorque,
|
||||
FieldNeedCheck,
|
||||
FieldRemark,
|
||||
FieldCreatedAt,
|
||||
}
|
||||
@@ -67,6 +67,8 @@ var (
|
||||
CollectTypeValidator func(string) error
|
||||
// DefaultIsTorque holds the default value on creation for the "isTorque" field.
|
||||
DefaultIsTorque bool
|
||||
// DefaultNeedCheck holds the default value on creation for the "needCheck" field.
|
||||
DefaultNeedCheck bool
|
||||
// DefaultRemark holds the default value on creation for the "remark" field.
|
||||
DefaultRemark string
|
||||
// RemarkValidator is a validator for the "remark" field. It is called by the builders before save.
|
||||
@@ -90,11 +92,6 @@ func ByFlowId(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldFlowId, opts...).ToFunc()
|
||||
}
|
||||
|
||||
// ByProcessCode orders the results by the processCode field.
|
||||
func ByProcessCode(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldProcessCode, opts...).ToFunc()
|
||||
}
|
||||
|
||||
// BySeq orders the results by the seq field.
|
||||
func BySeq(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldSeq, opts...).ToFunc()
|
||||
@@ -115,6 +112,11 @@ func ByIsTorque(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldIsTorque, opts...).ToFunc()
|
||||
}
|
||||
|
||||
// ByNeedCheck orders the results by the needCheck field.
|
||||
func ByNeedCheck(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldNeedCheck, opts...).ToFunc()
|
||||
}
|
||||
|
||||
// ByRemark orders the results by the remark field.
|
||||
func ByRemark(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldRemark, opts...).ToFunc()
|
||||
|
||||
@@ -59,11 +59,6 @@ func FlowId(v int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldEQ(FieldFlowId, v))
|
||||
}
|
||||
|
||||
// ProcessCode applies equality check predicate on the "processCode" field. It's identical to ProcessCodeEQ.
|
||||
func ProcessCode(v int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldEQ(FieldProcessCode, v))
|
||||
}
|
||||
|
||||
// Seq applies equality check predicate on the "seq" field. It's identical to SeqEQ.
|
||||
func Seq(v int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldEQ(FieldSeq, v))
|
||||
@@ -84,6 +79,11 @@ func IsTorque(v bool) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldEQ(FieldIsTorque, v))
|
||||
}
|
||||
|
||||
// NeedCheck applies equality check predicate on the "needCheck" field. It's identical to NeedCheckEQ.
|
||||
func NeedCheck(v bool) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldEQ(FieldNeedCheck, v))
|
||||
}
|
||||
|
||||
// Remark applies equality check predicate on the "remark" field. It's identical to RemarkEQ.
|
||||
func Remark(v string) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldEQ(FieldRemark, v))
|
||||
@@ -144,46 +144,6 @@ func FlowIdNotNil() predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldNotNull(FieldFlowId))
|
||||
}
|
||||
|
||||
// ProcessCodeEQ applies the EQ predicate on the "processCode" field.
|
||||
func ProcessCodeEQ(v int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldEQ(FieldProcessCode, v))
|
||||
}
|
||||
|
||||
// ProcessCodeNEQ applies the NEQ predicate on the "processCode" field.
|
||||
func ProcessCodeNEQ(v int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldNEQ(FieldProcessCode, v))
|
||||
}
|
||||
|
||||
// ProcessCodeIn applies the In predicate on the "processCode" field.
|
||||
func ProcessCodeIn(vs ...int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldIn(FieldProcessCode, vs...))
|
||||
}
|
||||
|
||||
// ProcessCodeNotIn applies the NotIn predicate on the "processCode" field.
|
||||
func ProcessCodeNotIn(vs ...int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldNotIn(FieldProcessCode, vs...))
|
||||
}
|
||||
|
||||
// ProcessCodeGT applies the GT predicate on the "processCode" field.
|
||||
func ProcessCodeGT(v int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldGT(FieldProcessCode, v))
|
||||
}
|
||||
|
||||
// ProcessCodeGTE applies the GTE predicate on the "processCode" field.
|
||||
func ProcessCodeGTE(v int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldGTE(FieldProcessCode, v))
|
||||
}
|
||||
|
||||
// ProcessCodeLT applies the LT predicate on the "processCode" field.
|
||||
func ProcessCodeLT(v int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldLT(FieldProcessCode, v))
|
||||
}
|
||||
|
||||
// ProcessCodeLTE applies the LTE predicate on the "processCode" field.
|
||||
func ProcessCodeLTE(v int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldLTE(FieldProcessCode, v))
|
||||
}
|
||||
|
||||
// SeqEQ applies the EQ predicate on the "seq" field.
|
||||
func SeqEQ(v int) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldEQ(FieldSeq, v))
|
||||
@@ -364,6 +324,16 @@ func IsTorqueNEQ(v bool) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldNEQ(FieldIsTorque, v))
|
||||
}
|
||||
|
||||
// NeedCheckEQ applies the EQ predicate on the "needCheck" field.
|
||||
func NeedCheckEQ(v bool) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldEQ(FieldNeedCheck, v))
|
||||
}
|
||||
|
||||
// NeedCheckNEQ applies the NEQ predicate on the "needCheck" field.
|
||||
func NeedCheckNEQ(v bool) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldNEQ(FieldNeedCheck, v))
|
||||
}
|
||||
|
||||
// RemarkEQ applies the EQ predicate on the "remark" field.
|
||||
func RemarkEQ(v string) predicate.ProcessStep {
|
||||
return predicate.ProcessStep(sql.FieldEQ(FieldRemark, v))
|
||||
|
||||
Reference in New Issue
Block a user