 caoqianming
|
5b4a8445ea
|
feat: ResignationSerializer返回employee_id_number
|
2025-11-09 23:24:49 +08:00 |
|
caoqianming
|
3cc9b0b117
|
feat: base 添加EuModelViewSet
|
2025-11-09 23:05:35 +08:00 |
|
caoqianming
|
9408dbd6e5
|
feat: 离职申请支持删除
|
2025-11-09 23:05:10 +08:00 |
|
caoqianming
|
f62bc532de
|
feat: Resignationserializer返回employee_name
|
2025-11-09 22:41:11 +08:00 |
|
caoqianming
|
0710696aa4
|
feat: base handle_ticket 默认参数
|
2025-11-09 20:11:32 +08:00 |
|
caoqianming
|
058141151e
|
feat: 优化bind_resignation
|
2025-11-09 14:27:54 +08:00 |
|
caoqianming
|
5e05582d91
|
fix: base handle_ticket处理ticket_title
|
2025-11-09 12:27:30 +08:00 |
|
caoqianming
|
01305eeb08
|
feat: base 优化wf create
|
2025-11-09 01:19:58 +08:00 |
|
caoqianming
|
030f3c62de
|
feat: ResignationViewSet添加RetrieveModelMixin
|
2025-11-08 22:38:45 +08:00 |
|
caoqianming
|
0c97939165
|
fix: bind_resignation bug
|
2025-11-08 22:32:32 +08:00 |
|
caoqianming
|
4b377e115c
|
feat: bind_resignation bug
|
2025-11-08 22:15:32 +08:00 |
|
caoqianming
|
590357468d
|
feat: 返回TicketSimpleSerializer
|
2025-11-07 16:44:46 +08:00 |
|
caoqianming
|
66d523b711
|
fix: clean_data关于material的处理
|
2025-11-07 11:05:06 +08:00 |
 TianyangZhang
|
3ca7a2b539
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-07 09:23:34 +08:00 |
|
TianyangZhang
|
37de4c1bfd
|
feat: ofm-publicity 修改model 字段
|
2025-11-07 09:23:32 +08:00 |
|
caoqianming
|
7dd15c57da
|
feat: material count字段完全由计算可得
|
2025-11-06 23:59:51 +08:00 |
|
caoqianming
|
8bfc630919
|
feat: 移除material count字段
|
2025-11-06 23:40:19 +08:00 |
|
caoqianming
|
2da918dbdf
|
feat: revert_and_del时触发物料统计
|
2025-11-06 22:48:07 +08:00 |
|
TianyangZhang
|
62af92075d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-06 10:50:32 +08:00 |
|
TianyangZhang
|
e38120841c
|
feat: ofm-serializer borrow_file 修改
|
2025-11-06 10:50:31 +08:00 |
|
caoqianming
|
6e579f509e
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-06 09:48:36 +08:00 |
|
caoqianming
|
6e8fdddac0
|
feat: 添加离职记录表
|
2025-11-06 09:48:36 +08:00 |
|
TianyangZhang
|
455f253801
|
feat: ofm-models vehicle 修改model 字段类型
|
2025-11-05 17:16:46 +08:00 |
|
TianyangZhang
|
1a26e7493a
|
feat:ofm-service 修改service vehicle
|
2025-11-05 17:05:32 +08:00 |
|
TianyangZhang
|
2d4460fa62
|
feat: ofm-seal fix
|
2025-11-05 16:54:39 +08:00 |
|
TianyangZhang
|
1c71659890
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-05 16:42:52 +08:00 |
|
TianyangZhang
|
e0897d6933
|
feat: ofm-service 修改bind_seal
|
2025-11-05 16:42:51 +08:00 |
|
caoqianming
|
b9d72f9619
|
fix: ftestprocess 在create和update时保持一致
|
2025-11-05 14:24:02 +08:00 |
|
TianyangZhang
|
b6a2a6a8d7
|
feat: srm -add models 平台审批表
|
2025-11-04 15:09:26 +08:00 |
|
TianyangZhang
|
c5110d3361
|
feat: srm 修改接口信息
|
2025-11-04 11:17:08 +08:00 |
|
TianyangZhang
|
adf9b95038
|
feat: srm 增加论文台账接口
|
2025-11-04 10:44:20 +08:00 |
|
TianyangZhang
|
b9f9527ff2
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-03 15:52:29 +08:00 |
|
TianyangZhang
|
3e1f1d80eb
|
feat: srm 修改serializer
|
2025-11-03 15:52:28 +08:00 |
|
caoqianming
|
4bfc0d6f20
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-03 14:17:23 +08:00 |
|
caoqianming
|
dd0d01c6b4
|
feat: 优化gen_number_with_rule的m_model的校验
|
2025-11-03 14:17:22 +08:00 |
|
TianyangZhang
|
830b0392c5
|
feat: srm 修改 views
|
2025-11-03 14:08:58 +08:00 |
|
TianyangZhang
|
303cd94e35
|
feat: srm 修改models
|
2025-11-03 13:55:41 +08:00 |
|
TianyangZhang
|
9f301af038
|
feat: srm -views 修改patentrecord 的 搜索字段
|
2025-11-03 09:46:46 +08:00 |
|
TianyangZhang
|
e9a7d49757
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-03 09:43:17 +08:00 |
|
TianyangZhang
|
5ea6145390
|
add: srm 创建新的模块 srm 科研管理
|
2025-11-03 09:43:16 +08:00 |
|
caoqianming
|
caf00a107a
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-31 11:09:23 +08:00 |
|
caoqianming
|
0c25ee75f3
|
fix: wpr change_or_new wpr_from 配置
|
2025-10-31 11:09:22 +08:00 |
|
TianyangZhang
|
80ead2f426
|
feat: ofm-models 修改model 字段
|
2025-10-30 13:56:01 +08:00 |
|
TianyangZhang
|
9a4f78433f
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-30 13:49:26 +08:00 |
|
TianyangZhang
|
7951b98e99
|
feat: ofm-views 修改视图集名称
|
2025-10-30 13:49:25 +08:00 |
|
caoqianming
|
abcff8ae2d
|
feat: check_wpr_number 优化
|
2025-10-29 20:27:38 +08:00 |
|
TianyangZhang
|
91486f82ba
|
add ：增加论文申密的 创建部门
|
2025-10-29 14:52:55 +08:00 |
|
TianyangZhang
|
dcc9fee8f3
|
fix: ofm- papersecret 修改论文申密的model 名字
|
2025-10-29 14:28:14 +08:00 |
|
TianyangZhang
|
30bf4f5515
|
add: ofm 增加新的model 论文申密
|
2025-10-29 11:16:15 +08:00 |
|
TianyangZhang
|
95037d2f49
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-28 16:56:27 +08:00 |
|
TianyangZhang
|
bbc1210685
|
feat: fix enm-models 修改 enm 字段
|
2025-10-28 16:56:26 +08:00 |
|
caoqianming
|
fa2edf7298
|
fix: wpr_bxerp 数据统计在mlogbw存在才继续
|
2025-10-28 16:55:36 +08:00 |
|
caoqianming
|
dda876092e
|
feat: 编号生成后在提交时进行校验
|
2025-10-28 16:22:02 +08:00 |
|
caoqianming
|
4e817d9954
|
fix: gen_number_with_rule bug
|
2025-10-27 19:56:14 +08:00 |
|
caoqianming
|
bc0200669b
|
feat: gen_number_with_rule 添加校验
|
2025-10-27 16:33:23 +08:00 |
|
caoqianming
|
1ea8a30d14
|
feat: base clean_timescaledb_job_his 优化2
|
2025-10-24 16:33:38 +08:00 |
|
caoqianming
|
be8411245b
|
feat: base execute_raw_sql 增加timeout参数可传none不限时
|
2025-10-24 16:33:13 +08:00 |
|
caoqianming
|
ab0a5c17fe
|
feat: base clean_timescaledb_job_his 优化
|
2025-10-24 16:10:49 +08:00 |
|
caoqianming
|
b1fe8831cc
|
feat: base execute_raw_sql 增加timeout参数
|
2025-10-24 16:10:37 +08:00 |
|
caoqianming
|
d4744d2602
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-24 16:00:03 +08:00 |
|
caoqianming
|
fbf36b98d8
|
feat: base clean_timescaledb_job_his
|
2025-10-24 16:00:02 +08:00 |
|
TianyangZhang
|
62f4a79ad0
|
feat : ofm-models 修改字段
|
2025-10-24 13:46:59 +08:00 |
|
TianyangZhang
|
5e58eb4baf
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-24 13:45:49 +08:00 |
|
TianyangZhang
|
0cdf6c68a1
|
feat: ofm-models 修改字段
|
2025-10-24 13:45:48 +08:00 |
|
caoqianming
|
95d6dfbf6a
|
feat: 执行数据库备份时排除指定超表
|
2025-10-24 10:46:58 +08:00 |
|
caoqianming
|
e4ce5271eb
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-24 09:45:30 +08:00 |
|
caoqianming
|
92aa602cbe
|
feat: backup_database 使用 sudo -u postgres
|
2025-10-24 09:45:29 +08:00 |
|
zty
|
2ae7dc2635
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-22 16:10:28 +08:00 |
|
zty
|
7cd95bd1b5
|
feat: ofm-models 修改专利patent 字段
|
2025-10-22 16:10:22 +08:00 |
|
caoqianming
|
97026d86c6
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-22 15:57:08 +08:00 |
|
caoqianming
|
54999cce73
|
fix: mlogbw defect 分配 bug
|
2025-10-22 15:57:08 +08:00 |
|
zty
|
303252e7a5
|
feat: ofm-models 修改专利model patentInfo 字段
|
2025-10-22 10:12:04 +08:00 |
|
zty
|
388e225108
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-21 14:10:44 +08:00 |
|
zty
|
25ee92602b
|
add : ofm-create-model-patent 新建专利申请 curd
|
2025-10-21 14:10:43 +08:00 |
|
caoqianming
|
241df0beca
|
feat: mio 添加查询条件
|
2025-10-20 16:33:46 +08:00 |
|
caoqianming
|
5ea7980a1b
|
feat: mloguser添加字段
|
2025-10-20 10:09:38 +08:00 |
|
caoqianming
|
a3416cfc0d
|
feat: 修改mroombooking表约束
|
2025-10-17 14:51:13 +08:00 |
|
caoqianming
|
2ca47b8949
|
feat: base 获取流转时排序按attribute_type倒序
|
2025-10-17 12:32:18 +08:00 |
|
caoqianming
|
10792d090c
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-16 16:30:15 +08:00 |
|
caoqianming
|
bfc8454ac7
|
feat: base workflow添加view_path2字段
|
2025-10-16 16:30:14 +08:00 |
|
zty
|
02b14ec2c6
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-16 11:18:26 +08:00 |
|
zty
|
acb4c802e4
|
feat: ofm-services 修改绑定反存的接口
|
2025-10-16 11:18:25 +08:00 |
|
caoqianming
|
260c9893eb
|
feat: base 获取流转时排序按attribute_type2
|
2025-10-16 10:55:33 +08:00 |
|
caoqianming
|
666a9c169c
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-16 10:05:13 +08:00 |
|
caoqianming
|
b869521221
|
feat: base 获取流转时排序按attribute_type
|
2025-10-16 10:05:12 +08:00 |
|
zty
|
99d8144bdf
|
feat: ofm-views 修改文件列表排序
|
2025-10-15 15:09:09 +08:00 |
|
zty
|
8a87ba356e
|
feat: ofm-BorrowRecord - 档案借阅反存ticket-data
|
2025-10-15 14:10:33 +08:00 |
|
zty
|
830bf18132
|
feat: ofm-service-vehicle 用车管理反存 实际归还里程树
|
2025-10-14 16:08:16 +08:00 |
|
zty
|
b52e90a11f
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-14 14:58:11 +08:00 |
|
zty
|
ee67e6896a
|
feat: ofm-service 反向存储ticket_data 到 Lendingseal
|
2025-10-14 14:58:11 +08:00 |
|
caoqianming
|
54f8b82c98
|
feat: mio增加筛选条件inout_date
|
2025-10-14 14:18:27 +08:00 |
|
caoqianming
|
6125139fbf
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-14 13:46:53 +08:00 |
|
caoqianming
|
2169bbea68
|
feat: do_out和do_in在处理into_wm不应直接忽略
|
2025-10-14 13:46:53 +08:00 |
|
zty
|
6dfab46b4d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-14 10:21:52 +08:00 |
|
zty
|
477976f86c
|
feat: ofm-views 修改时间倒叙
|
2025-10-14 10:21:50 +08:00 |
|
caoqianming
|
c37ff77eda
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-13 15:45:04 +08:00 |
|
caoqianming
|
1aa7d51769
|
feat: material添加create_time的排序条件
|
2025-10-13 15:45:04 +08:00 |
|
zty
|
e06cc8c38e
|
fix : ofm-models-publicity 修改记录编号自动生成
|
2025-10-13 14:26:40 +08:00 |
|
zty
|
b93024ca44
|
fix : ofm-models-publicity 修改记录编号自动生成
|
2025-10-13 14:18:03 +08:00 |
|
zty
|
7d87c79dd1
|
feat: ofm-service-pulicity 反存ticket_data 到 obj
|
2025-10-13 14:04:40 +08:00 |
|
zty
|
9f030ece6d
|
feat: ofm-service-pulicity 反存ticket_data 到 obj
|
2025-10-13 13:50:04 +08:00 |
|
zty
|
67f9cbb700
|
feat: ofm--Alter field publicity_opinion on publicity
|
2025-10-13 09:01:44 +08:00 |
|
zty
|
8fe2b8ca48
|
feat: ofm-models 修改字段属性
|
2025-10-11 14:28:09 +08:00 |
|
zty
|
7732ddc88e
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-11 11:32:06 +08:00 |
|
zty
|
6713693c6c
|
feat: ofm-models -pulicity 修改字段属性
|
2025-10-11 11:32:05 +08:00 |
|
caoqianming
|
20604ef7cb
|
fix: work_start_time 对光子的兼容
|
2025-10-11 10:28:07 +08:00 |
|
caoqianming
|
eb2deb02c2
|
fix: work_start_time 可不填2
|
2025-10-11 10:22:19 +08:00 |
|
caoqianming
|
f5f6c136d9
|
fix: work_start_time 可不填
|
2025-10-11 10:21:22 +08:00 |
|
caoqianming
|
8eee09678a
|
fix: handle_date和shift可传
|
2025-10-11 10:16:13 +08:00 |
|
caoqianming
|
efd40d1d32
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-11 10:11:19 +08:00 |
|
caoqianming
|
3ab9682b07
|
fix: work_start_time 可不填
|
2025-10-11 10:11:18 +08:00 |
|
zty
|
1983f7b121
|
feat: 修改 ofm-moedels - pulicity字段为空值
|
2025-10-11 09:23:33 +08:00 |
|
zty
|
cec6837d00
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-10 16:32:21 +08:00 |
|
zty
|
e214c6115a
|
feat: ofm-models 增加字段
|
2025-10-10 16:32:20 +08:00 |
|
caoqianming
|
727d190610
|
feat: Ptest val_xj可为空
|
2025-10-10 11:12:59 +08:00 |
|
caoqianming
|
a6e0fb4f0d
|
feat: quick调用serializer时传入request
|
2025-10-09 14:44:26 +08:00 |
|
caoqianming
|
9cf900d2ef
|
doc: 添加一些注释
|
2025-10-09 11:17:14 +08:00 |
|
caoqianming
|
69e8e7b025
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-30 11:05:25 +08:00 |
|
caoqianming
|
647603f986
|
fix: p_create_after 自动创建mlogbw时关于exclude语句导致的查询错误
|
2025-09-30 11:05:24 +08:00 |
|
zty
|
d21c1dc55d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-30 09:58:56 +08:00 |
|
zty
|
7f206bd0a7
|
feat: ofm-修改model
|
2025-09-30 09:58:53 +08:00 |
|
caoqianming
|
bd763be83a
|
feat: Mroombooking添加字段
|
2025-09-29 15:53:34 +08:00 |
|
caoqianming
|
fe499ffac5
|
feat: base add_info_for_item 可复用list逻辑
|
2025-09-29 15:52:54 +08:00 |
|
caoqianming
|
0c1e93bf0b
|
feat: 添加wpr查询参数
|
2025-09-29 14:50:02 +08:00 |
|
caoqianming
|
5d3c4137fe
|
feat: base cquery支持annotate
|
2025-09-29 14:44:08 +08:00 |
|
caoqianming
|
dbaf121685
|
feat: mroombooking 返回slots
|
2025-09-29 11:09:09 +08:00 |
|
caoqianming
|
bf8b886a2d
|
feat: handover revert撤回时做校验2
|
2025-09-28 16:34:30 +08:00 |
|
caoqianming
|
7b8ec7f9d6
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-28 16:33:40 +08:00 |
|
caoqianming
|
7620122c2d
|
feat: handover revert撤回时做校验
|
2025-09-28 16:33:39 +08:00 |
|
zty
|
de99f85259
|
feat: ofm-models 修改车辆表的字段信息
|
2025-09-28 14:16:39 +08:00 |
|
zty
|
e7c121de15
|
feat:iofm-serializer 增加ticket_
|
2025-09-28 11:07:08 +08:00 |
|
caoqianming
|
bdd686f50b
|
feat: 会议室预定修改
|
2025-09-28 10:24:29 +08:00 |
|
caoqianming
|
54140ba742
|
fix: mroombooking 创建时未create_by
|
2025-09-26 16:26:04 +08:00 |
|
caoqianming
|
c186b7d296
|
feat: p_create_after 优化
|
2025-09-26 15:14:03 +08:00 |
|
caoqianming
|
3a03cd76ff
|
feat: p_create_after 优化
|
2025-09-26 14:58:03 +08:00 |
|
caoqianming
|
f9c9a592e3
|
fix: mlogbinserializer
|
2025-09-26 14:30:51 +08:00 |
|
caoqianming
|
419b52f9be
|
feat: p_create_after 可报当前产品都不可使用
|
2025-09-26 14:19:11 +08:00 |
|
caoqianming
|
fb71f0697a
|
feat: mlog quick增加wprs_in传参
|
2025-09-26 14:07:14 +08:00 |
|
caoqianming
|
34e217e468
|
feat: mlog quick跳过创建mlogbw2
|
2025-09-26 10:46:04 +08:00 |
|
caoqianming
|
f34356057d
|
feat: mlog quick跳过创建mlogbw
|
2025-09-26 10:33:25 +08:00 |
|
caoqianming
|
b35015b58d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-26 09:11:00 +08:00 |
|
caoqianming
|
c434c76605
|
feat: 车间领料时完善提示添加物料名
|
2025-09-26 09:10:59 +08:00 |
|
zty
|
9909596cdb
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-25 15:42:45 +08:00 |
|
zty
|
6f4a1c4c88
|
feat: ofm-修改会议室信息
|
2025-09-25 15:42:24 +08:00 |
|
caoqianming
|
2445ae53f1
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-25 09:11:00 +08:00 |
|
caoqianming
|
0fc57a454f
|
feat: 改版需提供新批次号
|
2025-09-25 09:11:00 +08:00 |
|
zty
|
d26e066769
|
feat: ofm 修改publicity 的model
|
2025-09-24 14:08:51 +08:00 |
|
zty
|
f347fa0d23
|
feat: 修改ofm-services.py
|
2025-09-24 14:04:06 +08:00 |
|
zty
|
362a5ef725
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-24 13:59:57 +08:00 |
|
zty
|
ad98280458
|
add : ofm-新增宣传报道保密模块
|
2025-09-24 13:59:55 +08:00 |