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

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