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

• 241df0beca feat: mio 添加查询条件 master caoqianming 2025-10-20 16:33:46 +0800
• 5ea7980a1b feat: mloguser添加字段 caoqianming 2025-10-20 10:09:38 +0800
• a3416cfc0d feat: 修改mroombooking表约束 caoqianming 2025-10-17 14:51:13 +0800
• 2ca47b8949 feat: base 获取流转时排序按attribute_type倒序 caoqianming 2025-10-17 12:32:18 +0800
• 10792d090c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-16 16:30:15 +0800
• bfc8454ac7 feat: base workflow添加view_path2字段 caoqianming 2025-10-16 16:30:14 +0800
• 02b14ec2c6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-16 11:18:26 +0800
• acb4c802e4 feat: ofm-services 修改绑定反存的接口 zty 2025-10-16 11:18:25 +0800
• 260c9893eb feat: base 获取流转时排序按attribute_type2 caoqianming 2025-10-16 10:55:33 +0800
• 666a9c169c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-16 10:05:13 +0800
• b869521221 feat: base 获取流转时排序按attribute_type caoqianming 2025-10-16 10:05:12 +0800
• 99d8144bdf feat: ofm-views 修改文件列表排序 zty 2025-10-15 15:09:09 +0800
• 8a87ba356e feat: ofm-BorrowRecord - 档案借阅反存ticket-data zty 2025-10-15 14:10:33 +0800
• 830bf18132 feat: ofm-service-vehicle 用车管理反存 实际归还里程树 zty 2025-10-14 16:08:16 +0800
• b52e90a11f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-14 14:58:11 +0800
• ee67e6896a feat: ofm-service 反向存储ticket_data 到 Lendingseal zty 2025-10-14 14:58:11 +0800
• 54f8b82c98 feat: mio增加筛选条件inout_date caoqianming 2025-10-14 14:18:27 +0800
• 6125139fbf Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-14 13:46:53 +0800
• 2169bbea68 feat: do_out和do_in在处理into_wm不应直接忽略 caoqianming 2025-10-14 13:46:53 +0800
• 6dfab46b4d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-14 10:21:52 +0800
• 477976f86c feat: ofm-views 修改时间倒叙 zty 2025-10-14 10:21:50 +0800
• c37ff77eda Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-13 15:45:04 +0800
• 1aa7d51769 feat: material添加create_time的排序条件 caoqianming 2025-10-13 15:45:04 +0800
• e06cc8c38e fix : ofm-models-publicity 修改记录编号自动生成 zty 2025-10-13 14:26:40 +0800
• b93024ca44 fix : ofm-models-publicity 修改记录编号自动生成 zty 2025-10-13 14:18:03 +0800
• 7d87c79dd1 feat: ofm-service-pulicity 反存ticket_data 到 obj zty 2025-10-13 14:04:40 +0800
• 9f030ece6d feat: ofm-service-pulicity 反存ticket_data 到 obj zty 2025-10-13 13:50:04 +0800
• 67f9cbb700 feat: ofm--Alter field publicity_opinion on publicity zty 2025-10-13 09:01:44 +0800
• 8fe2b8ca48 feat: ofm-models 修改字段属性 zty 2025-10-11 14:28:09 +0800
• 7732ddc88e Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-11 11:32:06 +0800
• 6713693c6c feat: ofm-models -pulicity 修改字段属性 zty 2025-10-11 11:32:05 +0800
• 20604ef7cb fix: work_start_time 对光子的兼容 caoqianming 2025-10-11 10:28:07 +0800
• eb2deb02c2 fix: work_start_time 可不填2 caoqianming 2025-10-11 10:22:19 +0800
• f5f6c136d9 fix: work_start_time 可不填 caoqianming 2025-10-11 10:21:22 +0800
• 8eee09678a fix: handle_date和shift可传 caoqianming 2025-10-11 10:16:13 +0800
• efd40d1d32 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-11 10:11:19 +0800
• 3ab9682b07 fix: work_start_time 可不填 caoqianming 2025-10-11 10:11:18 +0800
• 1983f7b121 feat: 修改 ofm-moedels - pulicity字段为空值 zty 2025-10-11 09:23:33 +0800
• cec6837d00 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-10 16:32:21 +0800
• e214c6115a feat: ofm-models 增加字段 zty 2025-10-10 16:32:20 +0800
• 6fb415a9f0 release: 2.8.2025101011 2.8.2025101011 caoqianming 2025-10-10 11:38:43 +0800
• 727d190610 feat: Ptest val_xj可为空 caoqianming 2025-10-10 11:12:59 +0800
• a6e0fb4f0d feat: quick调用serializer时传入request caoqianming 2025-10-09 14:44:26 +0800
• 9cf900d2ef doc: 添加一些注释 caoqianming 2025-10-09 11:17:14 +0800
• 69e8e7b025 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-30 11:05:25 +0800
• 647603f986 fix: p_create_after 自动创建mlogbw时关于exclude语句导致的查询错误 caoqianming 2025-09-30 11:05:24 +0800
• d21c1dc55d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-30 09:58:56 +0800
• 7f206bd0a7 feat: ofm-修改model zty 2025-09-30 09:58:53 +0800
• bd763be83a feat: Mroombooking添加字段 caoqianming 2025-09-29 15:53:34 +0800
• fe499ffac5 feat: base add_info_for_item 可复用list逻辑 caoqianming 2025-09-29 15:52:54 +0800
• 0c1e93bf0b feat: 添加wpr查询参数 caoqianming 2025-09-29 14:50:02 +0800
• 5d3c4137fe feat: base cquery支持annotate caoqianming 2025-09-29 14:44:08 +0800
• dbaf121685 feat: mroombooking 返回slots caoqianming 2025-09-29 11:09:09 +0800
• fe524e389c release: 2.8.2025092816 2.8.2025092816 caoqianming 2025-09-28 16:51:44 +0800
• bf8b886a2d feat: handover revert撤回时做校验2 caoqianming 2025-09-28 16:34:30 +0800
• 7b8ec7f9d6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-28 16:33:40 +0800
• 7620122c2d feat: handover revert撤回时做校验 caoqianming 2025-09-28 16:33:39 +0800
• de99f85259 feat: ofm-models 修改车辆表的字段信息 zty 2025-09-28 14:16:39 +0800
• e7c121de15 feat:iofm-serializer 增加ticket_ zty 2025-09-28 11:07:08 +0800
• bdd686f50b feat: 会议室预定修改 caoqianming 2025-09-28 10:24:29 +0800
• 54140ba742 fix: mroombooking 创建时未create_by caoqianming 2025-09-26 16:26:04 +0800
• c186b7d296 feat: p_create_after 优化 caoqianming 2025-09-26 15:14:03 +0800
• 3a03cd76ff feat: p_create_after 优化 caoqianming 2025-09-26 14:58:03 +0800
• f9c9a592e3 fix: mlogbinserializer caoqianming 2025-09-26 14:30:51 +0800
• 419b52f9be feat: p_create_after 可报当前产品都不可使用 caoqianming 2025-09-26 14:19:11 +0800
• fb71f0697a feat: mlog quick增加wprs_in传参 caoqianming 2025-09-26 14:07:14 +0800
• 34e217e468 feat: mlog quick跳过创建mlogbw2 caoqianming 2025-09-26 10:46:04 +0800
• f34356057d feat: mlog quick跳过创建mlogbw caoqianming 2025-09-26 10:33:25 +0800
• b35015b58d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-26 09:11:00 +0800
• c434c76605 feat: 车间领料时完善提示添加物料名 caoqianming 2025-09-26 09:10:59 +0800
• 9909596cdb Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-25 15:42:45 +0800
• 6f4a1c4c88 feat: ofm-修改会议室信息 zty 2025-09-25 15:42:24 +0800
• 2445ae53f1 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-25 09:11:00 +0800
• 0fc57a454f feat: 改版需提供新批次号 caoqianming 2025-09-25 09:11:00 +0800
• d26e066769 feat: ofm 修改publicity 的model zty 2025-09-24 14:08:51 +0800
• f347fa0d23 feat: 修改ofm-services.py zty 2025-09-24 14:04:06 +0800
• 362a5ef725 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-24 13:59:57 +0800
• ad98280458 add : ofm-新增宣传报道保密模块 zty 2025-09-24 13:59:55 +0800
• 3c0fa9f244 feat: base send_sms auto_log send_mail使用False caoqianming 2025-09-23 16:26:07 +0800
• b520b69f95 feat: 优化bind_routepack caoqianming 2025-09-23 15:08:22 +0800
• 899a314f5d feat: base 优化wf通知发送 caoqianming 2025-09-23 14:59:50 +0800
• dbb0d6ae75 feat: routepack_ticket_change 变为创建中状态 caoqianming 2025-09-23 13:34:34 +0800
• bc4953893b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-22 11:31:22 +0800
• a8722724e1 feat: route增加查询条件以支持获取后续工段的信息 caoqianming 2025-09-22 11:31:21 +0800
• 1c447a86ef feat: 导入物料优化一下 caoqianming 2025-09-20 14:14:26 +0800
• 820f814766 feat: 优化的mplogxview caoqianming 2025-09-19 13:02:31 +0800
• 1689683aa3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-19 10:52:23 +0800
• cdb201a0ce feat: base sql querydict可传入是否格式化时间参数 caoqianming 2025-09-19 10:52:22 +0800
• d8ad57fa7e Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-19 09:22:49 +0800
• e32d4b816b add: ofm-增加宣传保密model zty 2025-09-19 09:22:47 +0800
• 47ca272cee feat: base workflow list 返回view_path caoqianming 2025-09-19 09:20:02 +0800
• 4390992a14 feat: base workflow添加view_path caoqianming 2025-09-19 09:09:44 +0800
• 085978a6c4 fix: 优化handover list接口 caoqianming 2025-09-18 15:06:45 +0800
• f6668b5d38 feat: 优化handover list接口 caoqianming 2025-09-18 14:48:28 +0800
• f6720ad7ce feat: 玻纤拉丝采集问题 caoqianming 2025-09-18 13:20:55 +0800
• e5a9f77f3d feat: ana_batch_thread 优化一下 caoqianming 2025-09-18 10:44:23 +0800
• c2deb0ee45 feat: base 优化system事务处理 caoqianming 2025-09-17 12:51:20 +0800
• 94f87df707 feat: 多个app优化事务处理 caoqianming 2025-09-17 12:50:19 +0800
• 694dca27cc feat: base system和wf优化事务处理2 caoqianming 2025-09-17 12:23:08 +0800
• 0284809933 feat: base system和wf优化事务处理 caoqianming 2025-09-17 12:15:26 +0800