 caoqianming
|
230b71f0aa
|
feat: 反向操作时忽略明细校验
|
2025-11-13 10:59:32 +08:00 |
|
caoqianming
|
1d74171988
|
fix: material增加count__gt等查询条件
|
2025-11-13 10:54:46 +08:00 |
|
caoqianming
|
7a10da7e2b
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-13 10:31:17 +08:00 |
|
caoqianming
|
164f3f16bb
|
feat: 拦截new_batch的错误
|
2025-11-13 10:31:16 +08:00 |
 TianyangZhang
|
2799e85605
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-12 11:13:12 +08:00 |
|
TianyangZhang
|
097adb063e
|
feat: fix 修改 srm 的 views
|
2025-11-12 11:13:11 +08:00 |
|
caoqianming
|
8943443e24
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-12 10:58:38 +08:00 |
|
caoqianming
|
1b88386193
|
feat: base wfservice创建出工单时处理人为提交人
|
2025-11-12 10:58:37 +08:00 |
|
TianyangZhang
|
eca63e993d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-12 10:57:05 +08:00 |
|
TianyangZhang
|
d16801c365
|
feat：srm fix serializer
|
2025-11-12 10:56:37 +08:00 |
|
caoqianming
|
5109d6aa22
|
feat: base handle_ticket 完善transition校验
|
2025-11-11 15:42:59 +08:00 |
|
caoqianming
|
2300d5bfad
|
feat: DatasetRecord添加filter
|
2025-11-11 10:53:49 +08:00 |
|
caoqianming
|
55292558d1
|
feat: handover添加selectfield
|
2025-11-11 10:52:54 +08:00 |
|
caoqianming
|
aa62b04fcf
|
feat: 交接记录返回material_changed_fname
|
2025-11-11 10:00:03 +08:00 |
|
caoqianming
|
acf09d0056
|
feat: 改版交接必须为合批操作
|
2025-11-11 09:35:43 +08:00 |
|
caoqianming
|
e001de9bb6
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-11 08:19:20 +08:00 |
|
caoqianming
|
3ccf7a87b0
|
feat: base 创建数据时检验不包含id2
|
2025-11-11 08:19:20 +08:00 |
|
TianyangZhang
|
1ecc6a9f67
|
feat: fix srm serializer
|
2025-11-10 17:00:01 +08:00 |
|
TianyangZhang
|
afd6e60cbb
|
feat: srm-service 去掉 platform belong_dept
|
2025-11-10 16:04:07 +08:00 |
|
TianyangZhang
|
6e5db774b7
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-10 15:41:38 +08:00 |
|
TianyangZhang
|
87ffde0945
|
feat: add new model platform '平台审批'
|
2025-11-10 15:41:37 +08:00 |
|
caoqianming
|
9acb5eb98a
|
feat: base 创建数据时检验不包含id
|
2025-11-10 15:01:28 +08:00 |
|
caoqianming
|
2d81424009
|
fix: mioitem create时校验是否混批的bug
|
2025-11-10 14:43:12 +08:00 |
|
caoqianming
|
32b39ee423
|
feat: 添加供应商审核
|
2025-11-10 14:03:21 +08:00 |
|
caoqianming
|
5d85abfad1
|
feat: base 开始编写ticketMixin可自动挂载
|
2025-11-09 23:40:17 +08:00 |
|
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 |