Commit Graph

4020 Commits

Author SHA1 Message Date
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
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