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

3.1.2026031316

3.1.2026033008

Mono Color

• afa3b8b9ad Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2026-01-04 14:41:37 +0800
• 3d6fcfac8a feat: 批次统计数据支持返回source_near caoqianming 2026-01-04 14:41:36 +0800
• db910f0804 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2026-01-04 14:16:43 +0800
• 7dc7a78695 feat:光芯OA 审批系统新增报价单审核 TianyangZhang 2026-01-04 14:16:41 +0800
• 952cdb1bc7 feat: get_batch_dag还是只返回直接前后级别 caoqianming 2026-01-04 13:55:09 +0800
• 9ed78f8d32 feat: mlogbbpatch修改批次号 caoqianming 2026-01-04 11:10:54 +0800
• 52ebac68a0 feat: 出入库记录返回子表部分信息 caoqianming 2026-01-04 10:10:26 +0800
• 81770e89fa feat: 统一撤回和撤销的表述2 caoqianming 2025-12-30 14:34:34 +0800
• 6ac7c020bd feat: 统一撤回和撤销的表述 caoqianming 2025-12-30 14:32:29 +0800
• e385a558e9 feat: 车间库存检验支持撤回 caoqianming 2025-12-30 14:28:20 +0800
• c37e71d60f feat: wpr添加material_name查询条件 caoqianming 2025-12-30 10:07:41 +0800
• c3c7675ac5 feat: 优化mlog_submit 返工后产品放在本工段下2 caoqianming 2025-12-29 15:54:14 +0800
• 29f4e2f76a feat: 优化mlog_submit 返工后产品放在本工段下 caoqianming 2025-12-29 15:09:45 +0800
• ec13b8b166 fix: 正常交接支持new_wm且支持不合格品 caoqianming 2025-12-29 14:41:06 +0800
• c56f908b42 feat: mlogbin qct 可依据fix选择 caoqianming 2025-12-26 17:00:00 +0800
• a8ae8ee32a feat: base dept filter支持parent isnull查询 caoqianming 2025-12-26 14:52:54 +0800
• 3f183583c8 release: 3.0.2025122514 3.0.2025122514 caoqianming 2025-12-25 15:00:24 +0800
• 09a7c64b3c feat: mlogbw patch权限 caoqianming 2025-12-25 14:29:22 +0800
• aa07c041fb feat: 固定资产入库流程apply caoqianming 2025-12-25 14:27:28 +0800
• 29f4edccb8 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-12-25 14:25:41 +0800
• ca67a1479f feat: resignation ticket存入employee_name caoqianming 2025-12-25 14:25:40 +0800
• 90cb2ed7f7 feat:新增人员交接单及其修改 人员交接时候反存校验 TianyangZhang 2025-12-25 09:43:58 +0800
• 79e957bd83 feat: asm assetlogcreate caoqianming 2025-12-24 16:30:36 +0800
• 00f2918d17 feat: base 提交时可变动工单title caoqianming 2025-12-24 15:42:46 +0800
• f84ceaa95e feat: 车间库存支持传入count_all caoqianming 2025-12-24 11:09:12 +0800
• da1f587036 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-12-23 10:25:19 +0800
• 55c94a83ce feat: wmaterial search时去除material__number caoqianming 2025-12-23 10:25:18 +0800
• aad329061b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-12-22 14:27:58 +0800
• 16a04b43f0 feat: base ticketmixin 修改 ”perform_update“ bug TianyangZhang 2025-12-22 14:27:57 +0800
• 4536c136bb feat: wmaterial添加mlog_date_start筛选条件2 caoqianming 2025-12-22 14:26:05 +0800
• 7400202209 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-12-22 14:22:02 +0800
• d7c3e92f9e feat: wmaterial添加mlog_date_start筛选条件 caoqianming 2025-12-22 14:22:01 +0800
• a408b2db92 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-12-22 13:41:40 +0800
• b250b9b078 feat: 新增hrm --人员交接表 TianyangZhang 2025-12-22 13:41:38 +0800
• 725f7d1764 fix: repair swaggger显示问题 caoqianming 2025-12-19 14:13:32 +0800
• 75c7f26448 feat: base userfilter获取归属于该部门及以下部门的人2 caoqianming 2025-12-19 14:13:10 +0800
• dec8650af1 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-12-19 14:02:51 +0800
• a81e851588 feat: asm初步接口 caoqianming 2025-12-19 14:02:16 +0800
• 4996b0e4a3 feat: base userfilter获取归属于该部门及以下部门的人 caoqianming 2025-12-19 13:59:39 +0800
• 79c8115445 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-12-19 13:30:54 +0800
• 21424a61bd fix: 修改 ofm - vehicle 中的出发里程 TianyangZhang 2025-12-19 13:30:53 +0800
• b5fc176cf2 feat: 玻纤添加mioitemw检验导入表 caoqianming 2025-12-19 09:13:49 +0800
• ba521b1107 feat: 修改mioitemw test的导入逻辑 caoqianming 2025-12-19 08:53:33 +0800
• 81d2cbce8c feat: 光子六车间批次生产合格率修改2 caoqianming 2025-12-18 14:52:58 +0800
• 45f9f27cbe feat: 光子六车间批次生产合格率修改 caoqianming 2025-12-18 10:13:51 +0800
• c440707612 feat: 取消handover_submit无用校验 caoqianming 2025-12-17 16:06:10 +0800
• 5dfb903c4a fix: handoverserializer 关于new_wm的处理4 caoqianming 2025-12-17 15:59:14 +0800
• 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