Commit Graph

3992 Commits

Author SHA1 Message Date
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
caoqianming 803fd65b2b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-11-07 10:46:33 +08:00
caoqianming 5d099b9f3c release: 3.0.2025110710 2025-11-07 10:46:29 +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