 caoqianming
|
8211a33b58
|
feat: material list filter low_inm优化
|
2025-12-01 15:03:49 +08:00 |
|
caoqianming
|
a51494aea9
|
feat: material list 如需获取库存数据需指定传参
|
2025-12-01 15:03:49 +08:00 |
|
caoqianming
|
2fcfae518d
|
feat: 添加部分索引
|
2025-12-01 15:03:49 +08:00 |
 TianyangZhang
|
5be3f6fbe5
|
fix ：修改提交审批报错 RelatedManager' object has no attribute 'belong_dept
|
2025-12-01 10:08:29 +08:00 |
|
TianyangZhang
|
e98027776c
|
feat: srm -model-Papersecret 增加 organization 申请部门字段
|
2025-11-25 16:38:26 +08:00 |
|
TianyangZhang
|
ff1e60fc77
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-25 16:27:28 +08:00 |
|
TianyangZhang
|
9ccfcbec03
|
fix : srm 修改 paperrecord 字段 cor_author 字段类型
|
2025-11-25 16:27:26 +08:00 |
|
TianyangZhang
|
f66e5bd9df
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-25 16:17:56 +08:00 |
|
TianyangZhang
|
004833292d
|
fix：srm 修改论文审批 反存 论文台账 主要修改model 字段类型
|
2025-11-25 16:17:54 +08:00 |
|
caoqianming
|
e07a1fdc4c
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-25 16:17:38 +08:00 |
|
caoqianming
|
8970d5b04e
|
feat: 优化mlogbw list接口速度2
|
2025-11-25 16:17:37 +08:00 |
|
caoqianming
|
57330e6ac6
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-25 15:57:24 +08:00 |
|
caoqianming
|
1074fd35bd
|
feat: 优化mlogbw list接口速度
|
2025-11-25 15:57:24 +08:00 |
|
TianyangZhang
|
d0493eb87b
|
feat: srm-patent修改字段类型
|
2025-11-25 15:56:21 +08:00 |
|
TianyangZhang
|
355be71775
|
fix: srm 修改专利台账
|
2025-11-25 14:56:05 +08:00 |
|
caoqianming
|
95604372a4
|
feat: resignation添加ticketrelate_name
|
2025-11-25 10:52:27 +08:00 |
|
caoqianming
|
ae7863871a
|
feat: base get_object加锁时注意is_deleted过滤采用base_manager
|
2025-11-25 10:46:44 +08:00 |
|
caoqianming
|
3f2db2a4af
|
feat: base wf 调用方法支持静态方法
|
2025-11-25 10:23:09 +08:00 |
|
caoqianming
|
5db4a99611
|
feat: mlogbw关于wpr的校验修改以支持手动新增
|
2025-11-25 10:20:11 +08:00 |
|
caoqianming
|
f70605129c
|
feat: resignatioin提交时调用的方法
|
2025-11-24 15:53:56 +08:00 |
|
caoqianming
|
873e4bd80e
|
feat: ResignationSerializer create bug2
|
2025-11-24 15:34:30 +08:00 |
|
caoqianming
|
2dbd7da2f8
|
feat: ResignationSerializer create bug
|
2025-11-24 15:33:57 +08:00 |
|
caoqianming
|
e9d8402cda
|
feat: base ticketmixin添加ticket_auto_submit_on_create
|
2025-11-24 14:24:45 +08:00 |
|
caoqianming
|
0776ff0054
|
fix: base wfmixin gen_ticket_data保存t_id转为str
|
2025-11-24 13:49:22 +08:00 |
|
caoqianming
|
b939fcbef2
|
feat: resignation添加ticketMixin2
|
2025-11-24 13:35:32 +08:00 |
|
caoqianming
|
dc17c01aaf
|
feat: resignation添加ticketMixin
|
2025-11-24 13:22:57 +08:00 |
|
caoqianming
|
146756d1b8
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-24 13:21:51 +08:00 |
|
caoqianming
|
c6dc424b33
|
feat: base wfmixin 修改时校验
|
2025-11-24 13:21:50 +08:00 |
|
TianyangZhang
|
54196b2a64
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-24 09:18:34 +08:00 |
|
TianyangZhang
|
dcd41792fa
|
fix : 修改ofm -views -vehicle && services
|
2025-11-24 09:18:33 +08:00 |
|
caoqianming
|
a58d95843f
|
feat: base ticketDetail添加create_by_name
|
2025-11-21 16:24:08 +08:00 |
|
caoqianming
|
0817589758
|
feat: 短信发送功能未开启
|
2025-11-21 15:34:56 +08:00 |
|
caoqianming
|
99df0166f8
|
feat: 批次号格式错误的校验2
|
2025-11-21 11:08:02 +08:00 |
|
caoqianming
|
5fa4881614
|
feat: 批次号格式错误的校验
|
2025-11-21 11:01:59 +08:00 |
|
caoqianming
|
5d7c681983
|
feat: mioitemcreate时接收count_send
|
2025-11-21 10:53:36 +08:00 |
|
caoqianming
|
5ed3b7c483
|
feat: mioitemw增加筛选条件
|
2025-11-20 12:27:35 +08:00 |
|
caoqianming
|
706cfd502b
|
feat: wpr_bxerp优化mlogbw的获取
|
2025-11-20 12:00:44 +08:00 |
|
caoqianming
|
29f1a96c3b
|
fix: format_json_with_placeholders 处理decimal
|
2025-11-19 16:53:39 +08:00 |
|
caoqianming
|
cbd458a8a5
|
feat: do_out报错更明确2
|
2025-11-19 16:05:11 +08:00 |
|
caoqianming
|
caf1bba050
|
feat: do_out报错更明确
|
2025-11-19 15:53:38 +08:00 |
|
caoqianming
|
01d93d7814
|
feat: 优化ana batchwork
|
2025-11-19 13:51:32 +08:00 |
|
caoqianming
|
5e81a3d3dc
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-19 10:54:43 +08:00 |
|
caoqianming
|
f8db7adab5
|
feat: 改版交接支持new_wm
|
2025-11-19 10:54:42 +08:00 |
|
TianyangZhang
|
a81d03e3ca
|
feat: ofm-models borrowRecord 增加借阅数量
|
2025-11-19 10:26:12 +08:00 |
|
TianyangZhang
|
3ff6072ae1
|
feat: ofm-models fix bug
|
2025-11-18 15:52:42 +08:00 |
|
TianyangZhang
|
ab7b08b6f2
|
feat : ofm -vehicle fix bug
|
2025-11-18 15:48:33 +08:00 |
|
TianyangZhang
|
f3daa9fe91
|
feat: ofm 修改车辆model 字段
|
2025-11-18 15:40:13 +08:00 |
|
TianyangZhang
|
362497af37
|
feat: ofm-service fix bug
|
2025-11-18 14:39:15 +08:00 |
|
TianyangZhang
|
f290138c40
|
feat：ofm-service 修改 bug
|
2025-11-18 14:32:35 +08:00 |
|
TianyangZhang
|
e2129cc799
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-18 14:14:32 +08:00 |
|
TianyangZhang
|
4157dd7aa6
|
feat: ofm -修改 view 字段
|
2025-11-18 14:14:31 +08:00 |
|
caoqianming
|
0b2b7f2fa2
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-18 11:25:28 +08:00 |
|
caoqianming
|
8267f8dda6
|
fix: base wf工作流分类接口detail错误
|
2025-11-18 11:25:27 +08:00 |
|
TianyangZhang
|
fb87fead4f
|
feat: ofm 修改 ofm 字段 并重新生成迁移文件
|
2025-11-18 11:19:22 +08:00 |
|
caoqianming
|
62d0ce87ea
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-18 09:46:26 +08:00 |
|
caoqianming
|
50c21292a9
|
feat: base workflow添加分类字段
|
2025-11-18 09:46:25 +08:00 |
|
TianyangZhang
|
4ba952d705
|
feat: ofm-views 修改 车辆字段
|
2025-11-17 16:43:02 +08:00 |
|
TianyangZhang
|
c6ec4f6c56
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-17 16:29:26 +08:00 |
|
TianyangZhang
|
e093498d3c
|
feat: ofm-vehicle 修改车辆审批申请 改完按时间段进行选择
|
2025-11-17 16:29:04 +08:00 |
|
caoqianming
|
168d917232
|
feat: mioitem添加count_send字段
|
2025-11-17 14:34:13 +08:00 |
|
caoqianming
|
8b74d0b121
|
fix: do_in 可直接取用wm
|
2025-11-17 13:57:10 +08:00 |
|
caoqianming
|
e7ebdb0e8e
|
feat: 校验改版时选择的改版物料
|
2025-11-17 08:51:55 +08:00 |
|
caoqianming
|
6d030e2c06
|
feat: 导入物料明细支持直接从名称等匹配3
|
2025-11-14 14:53:51 +08:00 |
|
caoqianming
|
c739fcfd79
|
feat: 导入物料明细支持直接从名称等匹配2
|
2025-11-14 14:50:10 +08:00 |
|
caoqianming
|
0141e539e7
|
feat: 导入物料明细支持直接从名称等匹配
|
2025-11-14 14:44:39 +08:00 |
|
caoqianming
|
75305bd1fd
|
feat: 增强新批次号校验
|
2025-11-13 16:48:08 +08:00 |
|
caoqianming
|
7c3e63668e
|
feat: 提供修改编号的接口
|
2025-11-13 16:29:55 +08:00 |
|
caoqianming
|
c21a39b52d
|
feat: supplieraudit采用新工作流挂载方式
|
2025-11-13 14:12:04 +08:00 |
|
caoqianming
|
53db1cdc35
|
feat: base 添加ticketmixin可集成到viewset下以支持工作流
|
2025-11-13 13:46:04 +08:00 |
|
caoqianming
|
6c24017905
|
feat: base 可跳过短信发送
|
2025-11-13 13:41:03 +08:00 |
|
caoqianming
|
509fdb3656
|
fix: material get_queryset忘记return qs
|
2025-11-13 11:24:12 +08:00 |
|
caoqianming
|
af09d35177
|
feat: 反向操作时忽略明细校验2
|
2025-11-13 11:01:50 +08:00 |
|
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 |