Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

Mono Color

• af09d35177 feat: 反向操作时忽略明细校验2 caoqianming 2025-11-13 11:01:50 +0800
• 230b71f0aa feat: 反向操作时忽略明细校验 caoqianming 2025-11-13 10:59:32 +0800
• 1d74171988 fix: material增加count__gt等查询条件 caoqianming 2025-11-13 10:54:46 +0800
• 7a10da7e2b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-11-13 10:31:17 +0800
• 164f3f16bb feat: 拦截new_batch的错误 caoqianming 2025-11-13 10:31:16 +0800
• 2799e85605 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-11-12 11:13:12 +0800
• 097adb063e feat: fix 修改 srm 的 views TianyangZhang 2025-11-12 11:13:11 +0800
• 8943443e24 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-11-12 10:58:38 +0800
• 1b88386193 feat: base wfservice创建出工单时处理人为提交人 caoqianming 2025-11-12 10:58:37 +0800
• eca63e993d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-11-12 10:57:05 +0800
• d16801c365 feat：srm fix serializer TianyangZhang 2025-11-12 10:56:37 +0800
• 5109d6aa22 feat: base handle_ticket 完善transition校验 caoqianming 2025-11-11 15:42:59 +0800
• 2300d5bfad feat: DatasetRecord添加filter caoqianming 2025-11-11 10:53:49 +0800
• 55292558d1 feat: handover添加selectfield caoqianming 2025-11-11 10:52:54 +0800
• aa62b04fcf feat: 交接记录返回material_changed_fname caoqianming 2025-11-11 10:00:03 +0800
• acf09d0056 feat: 改版交接必须为合批操作 caoqianming 2025-11-11 09:35:43 +0800
• e001de9bb6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-11-11 08:19:20 +0800
• 3ccf7a87b0 feat: base 创建数据时检验不包含id2 caoqianming 2025-11-11 08:19:20 +0800
• 1ecc6a9f67 feat: fix srm serializer TianyangZhang 2025-11-10 17:00:01 +0800
• afd6e60cbb feat: srm-service 去掉 platform belong_dept TianyangZhang 2025-11-10 16:04:07 +0800
• 6e5db774b7 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-11-10 15:41:38 +0800
• 87ffde0945 feat: add new model platform '平台审批' TianyangZhang 2025-11-10 15:41:37 +0800
• 9acb5eb98a feat: base 创建数据时检验不包含id caoqianming 2025-11-10 15:01:28 +0800
• 2d81424009 fix: mioitem create时校验是否混批的bug caoqianming 2025-11-10 14:43:12 +0800
• 32b39ee423 feat: 添加供应商审核 caoqianming 2025-11-10 14:03:21 +0800
• 5d85abfad1 feat: base 开始编写ticketMixin可自动挂载 caoqianming 2025-11-09 23:40:17 +0800
• 5b4a8445ea feat: ResignationSerializer返回employee_id_number caoqianming 2025-11-09 23:24:49 +0800
• 3cc9b0b117 feat: base 添加EuModelViewSet caoqianming 2025-11-09 23:05:35 +0800
• 9408dbd6e5 feat: 离职申请支持删除 caoqianming 2025-11-09 23:05:10 +0800
• f62bc532de feat: Resignationserializer返回employee_name caoqianming 2025-11-09 22:41:11 +0800
• 0710696aa4 feat: base handle_ticket 默认参数 caoqianming 2025-11-09 20:11:32 +0800
• 058141151e feat: 优化bind_resignation caoqianming 2025-11-09 14:27:54 +0800
• 5e05582d91 fix: base handle_ticket处理ticket_title caoqianming 2025-11-09 12:27:30 +0800
• 01305eeb08 feat: base 优化wf create caoqianming 2025-11-09 01:19:58 +0800
• 030f3c62de feat: ResignationViewSet添加RetrieveModelMixin caoqianming 2025-11-08 22:38:45 +0800
• 0c97939165 fix: bind_resignation bug caoqianming 2025-11-08 22:32:32 +0800
• 4b377e115c feat: bind_resignation bug caoqianming 2025-11-08 22:15:32 +0800
• 590357468d feat: 返回TicketSimpleSerializer caoqianming 2025-11-07 16:44:46 +0800
• 66d523b711 fix: clean_data关于material的处理 caoqianming 2025-11-07 11:05:06 +0800
• 803fd65b2b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-11-07 10:46:33 +0800
• 5d099b9f3c release: 3.0.2025110710 caoqianming 2025-11-07 10:46:29 +0800
• 3ca7a2b539 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-11-07 09:23:34 +0800
• 37de4c1bfd feat: ofm-publicity 修改model 字段 TianyangZhang 2025-11-07 09:23:32 +0800
• 7dd15c57da feat: material count字段完全由计算可得 caoqianming 2025-11-06 23:59:51 +0800
• 8bfc630919 feat: 移除material count字段 caoqianming 2025-11-06 23:40:19 +0800
• 2da918dbdf feat: revert_and_del时触发物料统计 caoqianming 2025-11-06 22:48:07 +0800
• 62af92075d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-11-06 10:50:32 +0800
• e38120841c feat: ofm-serializer borrow_file 修改 TianyangZhang 2025-11-06 10:50:31 +0800
• 6e579f509e Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-11-06 09:48:36 +0800
• 6e8fdddac0 feat: 添加离职记录表 caoqianming 2025-11-06 09:48:36 +0800
• 455f253801 feat: ofm-models vehicle 修改model 字段类型 TianyangZhang 2025-11-05 17:16:46 +0800
• 1a26e7493a feat:ofm-service 修改service vehicle TianyangZhang 2025-11-05 17:05:32 +0800
• 2d4460fa62 feat: ofm-seal fix TianyangZhang 2025-11-05 16:54:39 +0800
• 1c71659890 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-11-05 16:42:52 +0800
• e0897d6933 feat: ofm-service 修改bind_seal TianyangZhang 2025-11-05 16:42:51 +0800
• b9d72f9619 fix: ftestprocess 在create和update时保持一致 caoqianming 2025-11-05 14:24:02 +0800
• b6a2a6a8d7 feat: srm -add models 平台审批表 TianyangZhang 2025-11-04 15:09:26 +0800
• c5110d3361 feat: srm 修改接口信息 TianyangZhang 2025-11-04 11:17:08 +0800
• adf9b95038 feat: srm 增加论文台账接口 TianyangZhang 2025-11-04 10:44:20 +0800
• b9f9527ff2 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-11-03 15:52:29 +0800
• 3e1f1d80eb feat: srm 修改serializer TianyangZhang 2025-11-03 15:52:28 +0800
• 4bfc0d6f20 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-11-03 14:17:23 +0800
• dd0d01c6b4 feat: 优化gen_number_with_rule的m_model的校验 caoqianming 2025-11-03 14:17:22 +0800
• 830b0392c5 feat: srm 修改 views TianyangZhang 2025-11-03 14:08:58 +0800
• 303cd94e35 feat: srm 修改models TianyangZhang 2025-11-03 13:55:41 +0800
• 9f301af038 feat: srm -views 修改patentrecord 的 搜索字段 TianyangZhang 2025-11-03 09:46:46 +0800
• e9a7d49757 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-11-03 09:43:17 +0800
• 5ea6145390 add: srm 创建新的模块 srm 科研管理 TianyangZhang 2025-11-03 09:43:16 +0800
• caf00a107a Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-31 11:09:23 +0800
• 0c25ee75f3 fix: wpr change_or_new wpr_from 配置 caoqianming 2025-10-31 11:09:22 +0800
• 80ead2f426 feat: ofm-models 修改model 字段 TianyangZhang 2025-10-30 13:56:01 +0800
• 9a4f78433f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-10-30 13:49:26 +0800
• 7951b98e99 feat: ofm-views 修改视图集名称 TianyangZhang 2025-10-30 13:49:25 +0800
• abcff8ae2d feat: check_wpr_number 优化 caoqianming 2025-10-29 20:27:38 +0800
• 91486f82ba add ：增加论文申密的 创建部门 TianyangZhang 2025-10-29 14:52:55 +0800
• dcc9fee8f3 fix: ofm- papersecret 修改论文申密的model 名字 TianyangZhang 2025-10-29 14:28:14 +0800
• 30bf4f5515 add: ofm 增加新的model 论文申密 TianyangZhang 2025-10-29 11:16:15 +0800
• 95037d2f49 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-10-28 16:56:27 +0800
• bbc1210685 feat: fix enm-models 修改 enm 字段 TianyangZhang 2025-10-28 16:56:26 +0800
• fa2edf7298 fix: wpr_bxerp 数据统计在mlogbw存在才继续 caoqianming 2025-10-28 16:55:36 +0800
• dda876092e feat: 编号生成后在提交时进行校验 caoqianming 2025-10-28 16:22:02 +0800
• 4e817d9954 fix: gen_number_with_rule bug caoqianming 2025-10-27 19:56:14 +0800
• bc0200669b feat: gen_number_with_rule 添加校验 caoqianming 2025-10-27 16:33:23 +0800
• 1ea8a30d14 feat: base clean_timescaledb_job_his 优化2 caoqianming 2025-10-24 16:33:38 +0800
• be8411245b feat: base execute_raw_sql 增加timeout参数可传none不限时 caoqianming 2025-10-24 16:33:13 +0800
• ab0a5c17fe feat: base clean_timescaledb_job_his 优化 caoqianming 2025-10-24 16:10:49 +0800
• b1fe8831cc feat: base execute_raw_sql 增加timeout参数 caoqianming 2025-10-24 16:10:37 +0800
• d4744d2602 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-24 16:00:03 +0800
• fbf36b98d8 feat: base clean_timescaledb_job_his caoqianming 2025-10-24 16:00:02 +0800
• 62f4a79ad0 feat : ofm-models 修改字段 TianyangZhang 2025-10-24 13:46:59 +0800
• 5e58eb4baf Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-10-24 13:45:49 +0800
• 0cdf6c68a1 feat: ofm-models 修改字段 TianyangZhang 2025-10-24 13:45:48 +0800
• 95d6dfbf6a feat: 执行数据库备份时排除指定超表 caoqianming 2025-10-24 10:46:58 +0800
• e4ce5271eb Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-24 09:45:30 +0800
• 92aa602cbe feat: backup_database 使用 sudo -u postgres caoqianming 2025-10-24 09:45:29 +0800
• 2ae7dc2635 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-22 16:10:28 +0800
• 7cd95bd1b5 feat: ofm-models 修改专利patent 字段 zty 2025-10-22 16:10:22 +0800
• 97026d86c6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-22 15:57:08 +0800
• 54999cce73 fix: mlogbw defect 分配 bug caoqianming 2025-10-22 15:57:08 +0800
• 303252e7a5 feat: ofm-models 修改专利model patentInfo 字段 zty 2025-10-22 10:12:04 +0800