caoqianming
4acd80718d
fix: avoid duplicate rows in complex reverse queries
...
Add an optional distinct flag to complex query payload and deduplicate by primary key before annotate/order flow, so reverse-join filtering does not return repeated records.
Made-with: Cursor
2026-03-13 16:35:12 +08:00
caoqianming
c99e74eee8
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
2026-03-06 11:05:03 +08:00
caoqianming
8b22084c0a
feat: qctmat create update 校验唯一
2026-03-06 11:05:03 +08:00
TianyangZhang
0c66931154
feat:gx-hrm-employee 人员导入功能
2026-03-04 15:39:46 +08:00
TianyangZhang
c3605ff1db
feat: hrm-views 修改employee 人员导入
2026-03-04 13:56:00 +08:00
TianyangZhang
743c724d79
feat:hrm-employee 增加人员导入功能
2026-03-03 14:45:53 +08:00
caoqianming
bf5cfbe7e6
feat: fmlog返回route_material_in
2026-02-10 10:27:43 +08:00
caoqianming
80a3dbd72b
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
2026-02-04 15:45:13 +08:00
caoqianming
cffea3e1ea
feat: 加工前不良当合格品处理
2026-02-04 15:45:12 +08:00
TianyangZhang
4690a78ac6
feat: hrm - 修改 人员调岗后更新部门和岗位
2026-01-29 10:43:52 +08:00
TianyangZhang
beef2b3e54
feat:人员调岗申请 修改
2026-01-28 09:57:13 +08:00
TianyangZhang
987a53005c
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
2026-01-26 11:00:21 +08:00
TianyangZhang
c9089eeb27
feat: hrm-新增人员岗位调动
2026-01-26 11:00:19 +08:00
caoqianming
d29fcce935
fix: base user_exist完善
2026-01-23 16:18:17 +08:00
caoqianming
a534bde086
feat: wmaterial根据current_merged查询3
2026-01-22 16:12:35 +08:00
caoqianming
63002f27c8
feat: wmaterial根据current_merged查询2
2026-01-22 16:00:59 +08:00
caoqianming
4bbae8b7df
feat: wmaterial根据current_merged查询
2026-01-21 11:09:53 +08:00
caoqianming
dc26c7cc46
feat: handoverb添加oinfo_json字段
2026-01-16 15:29:58 +08:00
caoqianming
0d80e182cd
feat: base user增加has_perm筛选条件
2026-01-16 14:48:08 +08:00
caoqianming
2759114ede
feat: base 升级后同步数据库
2026-01-16 14:42:42 +08:00
caoqianming
80f832aa85
feat: 光子添加工段数据统计
2026-01-16 14:01:13 +08:00
caoqianming
70e49eb27e
fix: batchst支持返回source_near修复
2026-01-16 14:00:52 +08:00
caoqianming
e99b2ecbbc
fix: base complexquerymixin支持add_info_for_list
2026-01-16 14:00:11 +08:00
caoqianming
146e842642
feat: with_source_near筛选体现在swagger里
2026-01-15 16:47:15 +08:00
caoqianming
47b1887c4b
feat: base 调整asgi导入以保证正常启动
2026-01-15 09:13:09 +08:00
caoqianming
1ffbe0cc44
feat: wpr 返回wpr_from_
2026-01-13 15:02:52 +08:00
caoqianming
3e173f7a72
feat: base cquery支持add_info_for_list
2026-01-13 14:57:13 +08:00
caoqianming
fce66da1d9
feat: wpr 添加筛选条件wpr_from
2026-01-13 14:15:16 +08:00
caoqianming
feb8bd6770
feat: wpr_bxerp优化
2026-01-13 10:29:41 +08:00
caoqianming
43f5f11ca8
feat: 未有ftest的也触发单个统计
2026-01-13 09:05:19 +08:00
caoqianming
d5ea72a021
feat: 交接记录子项需保证工段/车间一致2
2026-01-12 15:44:48 +08:00
caoqianming
143d9cb719
fix: base locked_get_or_create优化
2026-01-12 15:30:55 +08:00
caoqianming
cf6633592a
feat: 交接记录子项需保证工段/车间一致
2026-01-12 13:44:08 +08:00
caoqianming
b39b0e7923
fix: mlog并发优化的bug
2026-01-12 13:27:29 +08:00
caoqianming
70563a6c02
feat: mlog 并发优化
2026-01-12 11:16:04 +08:00
caoqianming
def22f6b18
feat: handover可以查看仅交接到车间的记录
2026-01-12 10:28:51 +08:00
caoqianming
f9eee5a523
feat: handover_revert 并发优化
2026-01-12 10:21:15 +08:00
caoqianming
2ecaeadff7
feat: handover_submit 并发优化2
2026-01-09 16:59:53 +08:00
caoqianming
6eee0e1e53
feat: handover_submit 并发优化
2026-01-09 16:54:24 +08:00
caoqianming
3417515e72
feat: base 添加locked_get_or_create
2026-01-09 16:53:57 +08:00
caoqianming
43abcbaa48
feat: 查询-n批次从正则改用like以优化性能
2026-01-09 15:55:56 +08:00
caoqianming
e2a92b6faa
feat: 固定依赖包
2026-01-08 10:40:00 +08:00
caoqianming
02e3265133
feat: 升级依赖包
2026-01-08 09:59:39 +08:00
caoqianming
65cdeb0e7c
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
2026-01-07 16:26:42 +08:00
caoqianming
238d1dd074
release: 3.0.2026010716
2026-01-07 16:26:42 +08:00
TianyangZhang
f7a78431c5
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
2026-01-07 16:03:19 +08:00
TianyangZhang
5b60318bfb
feat: gx-人员请假申请与审批
2026-01-07 16:03:18 +08:00
caoqianming
0127e2a149
feat: get_shift需要报错
2026-01-07 14:19:43 +08:00
caoqianming
f5b1b13a63
feat: 添加rem模块
2026-01-06 14:19:37 +08:00
caoqianming
f7b09ab1df
fix: wpr list annotate明确number指向
2026-01-06 09:22:38 +08:00
caoqianming
TianyangZhang