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

3.0.2025110710

3.0.2025122514

3.0.2026010716

Mono Color

• 7fc995c7c9 fix: handoverserializer 关于new_wm的处理3 caoqianming 2025-12-17 15:47:25 +0800
• 07134f32bb fix: handoverserializer 关于new_wm的处理2 caoqianming 2025-12-17 15:34:08 +0800
• 041474411e fix: handoverserializer 关于new_wm的处理 caoqianming 2025-12-17 15:24:38 +0800
• 07b2df1fd0 feat: 合批时校验批次是否已存在 caoqianming 2025-12-17 14:25:40 +0800
• 57459cc7dc Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-12-17 14:11:00 +0800
• ec7b0cd987 fix: handovermerge时new_state未定义 caoqianming 2025-12-17 14:10:59 +0800
• 5711791a1f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-12-17 09:58:31 +0800
• 4b7e648b13 fix: 修改印章申请binging_seal TianyangZhang 2025-12-17 09:58:30 +0800
• 0c5034683c fix: update_mb_item时考虑检验的存在 caoqianming 2025-12-17 09:25:44 +0800
• c35041f72b feat: routepack删除时做一下校验 caoqianming 2025-12-16 16:33:05 +0800
• 71fe281a90 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-12-16 11:23:01 +0800
• 54f4aed729 feat: 维修记录初步完成 caoqianming 2025-12-16 11:23:00 +0800
• d3c5358d2c fix: hrm-用人需求修改标题模板 TianyangZhang 2025-12-16 10:35:13 +0800
• 190f2f047d feat: base ticketmixin传入other_data caoqianming 2025-12-16 09:20:46 +0800
• 3dcb26f14a fix: 先调整asm以启动服务 caoqianming 2025-12-15 16:47:10 +0800
• 01615b4b27 feat: base 模板字段改为textfield caoqianming 2025-12-15 16:45:41 +0800
• be4dfe85ee Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-12-15 15:20:59 +0800
• a9aac76328 feat: 删除asm同步文件 caoqianming 2025-12-15 15:20:58 +0800
• 16a513f331 feat:修改hrm/urls --EMPneed TianyangZhang 2025-12-15 13:52:33 +0800
• de0149dce4 feat: 新增模块固定资产 asm TianyangZhang 2025-12-15 11:18:55 +0800
• 1af6555e26 feat: 添加员工需求表 caoqianming 2025-12-12 16:57:12 +0800
• 320da10e61 feat: route接口增加按product获取总图 caoqianming 2025-12-12 11:00:05 +0800
• 7f34d45160 feat: base wf增加ticket_count接口添加分类 caoqianming 2025-12-12 10:24:34 +0800
• 8c18bbf6ae feat: base wf增加ticket_count接口 caoqianming 2025-12-12 09:34:35 +0800
• 636042e9c3 feat: validate_dag检查检查未到达的物料 caoqianming 2025-12-12 08:54:01 +0800
• e607dfd51b feat: cal_x_task_count默认使用target_quantity2 caoqianming 2025-12-12 08:33:57 +0800
• ddd75d408a feat: 自动生成物料的逻辑优化2 caoqianming 2025-12-11 17:03:35 +0800
• 6584334d00 feat: 自动生成物料的逻辑优化 caoqianming 2025-12-11 16:56:11 +0800
• d36edaffe1 feat: cal_x_task_count默认使用target_quantity caoqianming 2025-12-11 16:49:59 +0800
• 33f6c3982d feat: base wf 捕获expr is None的错误 caoqianming 2025-12-11 13:43:44 +0800
• 984f875a6c fix: do_in bug3 caoqianming 2025-12-11 10:41:53 +0800
• 8ee48f77fc fix: do_in bug caoqianming 2025-12-11 08:40:48 +0800
• 4bea3d973e fix: do_in bug caoqianming 2025-12-10 15:12:24 +0800
• 18c66eee7a feat: validate_dag增加传入参数2 caoqianming 2025-12-09 09:41:53 +0800
• 77c7811476 feat: validate_dag增加传入参数 caoqianming 2025-12-09 08:26:44 +0800
• d104ee90a4 feat: 改版交接支持拆合批2 caoqianming 2025-12-08 15:26:39 +0800
• 09c3bec66a feat: 改版交接支持拆合批 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