feat: 完成客户第12条需求+多系统改造
1. 新增预警表添加工单号字段,支持按工单号检索预警 2. 添加工单过滤在制品/绩效报表/预警中心查询 3. 补全WMS台账字段口径与权限配置 4. 修复备料单与数量不符处理流程 5. 新增配送进度/库位联动/自动出库功能 6. 修复AGV配送状态更新逻辑 7. 优化退料与库存管理细节
This commit is contained in:
@@ -509,7 +509,9 @@ func finalizeWorkloadRow(r *WorkloadRow) {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) Workload(ctx context.Context, operator, stationNo, from, to string,
|
||||
// Workload 绩效统计(按人/按工位/明细三视图,各自真分页)。
|
||||
// orderNo 非空时按工单号模糊过滤(客户第12条「记录查看加一项看工单号查询」)。
|
||||
func (s *Service) Workload(ctx context.Context, operator, stationNo, orderNo, from, to string,
|
||||
opPage, opSize, stPage, stSize, detPage, detSize int) (map[string]any, error) {
|
||||
q := s.ctx.EntClient.WorkpieceProcess.Query()
|
||||
if operator != "" {
|
||||
@@ -518,6 +520,9 @@ func (s *Service) Workload(ctx context.Context, operator, stationNo, from, to st
|
||||
if stationNo != "" {
|
||||
q = q.Where(workpieceprocess.StationNo(stationNo))
|
||||
}
|
||||
if orderNo != "" {
|
||||
q = q.Where(workpieceprocess.OrderNoContainsFold(orderNo))
|
||||
}
|
||||
if from != "" {
|
||||
if f, err := time.Parse("2006-01-02", from); err == nil {
|
||||
q = q.Where(workpieceprocess.CreatedAtGTE(f))
|
||||
|
||||
Reference in New Issue
Block a user