chore: 批量完成项目多模块迭代优化
1. 废弃半成品库存表并统一库存主表 2. 修复列表排序与搜索大小写不敏感问题 3. 新增用户最近登录时间、工单BOM名称字段 4. 完善角色管理、工位选择器功能 5. 增加拧紧数据补录、成品自动回流WMS能力 6. 统一导出时间范围校验规则 7. 丰富物料/备料单筛选条件 8. 调整菜单与权限命名适配产品型号业务
This commit is contained in:
@@ -92,13 +92,22 @@ func (s *Service) bumpDailyPlanCompleted(ctx context.Context, orderNo string, t
|
||||
}
|
||||
|
||||
// ListScanRecords 查询扫码报工记录
|
||||
func (s *Service) ListScanRecords(ctx context.Context, sn, orderNo string) ([]*ent.ScanRecord, error) {
|
||||
func (s *Service) ListScanRecords(ctx context.Context, sn, orderNo string, page, pageSize int) ([]*ent.ScanRecord, int, error) {
|
||||
q := s.ctx.EntClient.ScanRecord.Query()
|
||||
if sn != "" {
|
||||
q = q.Where(scanrecord.Sn(sn))
|
||||
}
|
||||
if orderNo != "" {
|
||||
q = q.Where(scanrecord.OrderNo(orderNo))
|
||||
q = q.Where(scanrecord.OrderNoEqualFold(orderNo))
|
||||
}
|
||||
return q.Order(ent.Desc(scanrecord.FieldID)).Limit(1000).All(ctx)
|
||||
if sn != "" {
|
||||
q = q.Where(scanrecord.SnEqualFold(sn))
|
||||
}
|
||||
total, err := q.Count(ctx)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
rows, err := q.Order(ent.Desc(scanrecord.FieldID)).
|
||||
Offset((page - 1) * pageSize).Limit(pageSize).All(ctx)
|
||||
return rows, total, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user