Commit Graph

Select branches

Hide Pull Requests

base

dev_cqm

dev_sj

master

#2

#3

#4

#5

#6

#7

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

3.1.2026042912

Mono Color

• 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
• f60250bb21 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-17 11:15:17 +0800
• 0b4524aa85 feat: 优化cd.py caoqianming 2025-09-17 11:15:15 +0800
• f7e27c290f feat: wpr list 返回process_name caoqianming 2025-09-17 11:14:49 +0800
• 2c9c74131c feat: 优化cd.py caoqianming 2025-09-16 18:51:38 +0800
• 70cdf0d1c6 release: 2.8.2025091616 2.8.2025091616 caoqianming 2025-09-16 16:19:15 +0800
• bac046530e fix: wpm取消事务时出现的缩进bug caoqianming 2025-09-16 15:27:25 +0800
• 7a3988d6bd feat: mioitem处理事务处理 caoqianming 2025-09-16 14:51:06 +0800
• f151f4f2ec feat: base 移除基础model层事务 caoqianming 2025-09-16 10:33:44 +0800
• 7a82844842 feat: inm和wpm关于事务处理的修改 caoqianming 2025-09-16 10:25:52 +0800
• 9bf44c4211 fix: 次批作为输入不会影响输出批次号 caoqianming 2025-09-15 15:48:21 +0800
• ed2804c098 feat: 批次的DAG数据只获取直接的上下级 caoqianming 2025-09-15 10:26:36 +0800
• 00d0b1ea00 feat: wpm优化事务和悲观锁 caoqianming 2025-09-15 09:41:20 +0800
• aa80c1b00a feat: cdview优化校验 caoqianming 2025-09-15 09:40:39 +0800
• 67b92f0dd4 feat: base 优化get_object caoqianming 2025-09-15 09:40:12 +0800
• 06e86330bd fix: lock_and_check_can_update caoqianming 2025-09-12 17:02:06 +0800
• 34ca36aced fix: lock_and_check_can_update caoqianming 2025-09-12 17:00:10 +0800
• 649022eb57 feat: mlogbout serializer update校验mlog caoqianming 2025-09-12 16:52:53 +0800
• 5709bc3a47 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-12 16:48:34 +0800
• cdcb02d4d5 feat: 生产日志子表全部加mlog锁 caoqianming 2025-09-12 16:48:33 +0800
• e7ea16ece6 feat: ofm-serializer fix zty 2025-09-12 16:06:21 +0800
• 6b08200016 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-12 15:01:12 +0800
• 8ef9852e27 add: ofm-档案管理增加审批 zty 2025-09-12 15:01:11 +0800
• e9246cc47f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-12 14:47:50 +0800
• 5ece330457 feat: base 优化get_object事务 caoqianming 2025-09-12 14:47:50 +0800
• 643c45882f feat: ofm-修改字段 zty 2025-09-12 14:43:35 +0800
• 8bcd9b7d03 feat:ofm - 档案管理修改 serializer zty 2025-09-12 14:32:36 +0800
• aff39f3e31 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-12 14:18:57 +0800
• 53117c838b feat: ofm-档案管理-serializer 更新 zty 2025-09-12 14:18:56 +0800
• 57a61daa66 feat: wpm修改为自动事务 caoqianming 2025-09-12 13:48:34 +0800
• e5008c8412 fix: base 在create update destroy添加自动事务 caoqianming 2025-09-12 13:48:10 +0800
• 5e8e72cee9 feat: 修改wpm事务 caoqianming 2025-09-12 12:41:00 +0800
• 674f62a05a fix: base 修改_should_use_transaction caoqianming 2025-09-12 12:40:42 +0800
• 527e6c0fc2 feat: wpm 取消 transaction caoqianming 2025-09-12 12:16:47 +0800
• 90b7e2087b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-12 12:14:29 +0800
• 412398d461 feat: base CustomGenericViewSet 添加自动事务 caoqianming 2025-09-12 12:14:29 +0800
• ebd125ca1d feat: ofm-修改 -档案借 filterset_class zty 2025-09-12 10:32:12 +0800
• 6d36f3fa7d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-12 10:19:50 +0800
• e8b914d556 feat: ofm 增加档案台账模糊查询 zty 2025-09-12 10:19:49 +0800
• c9a2daaa48 feat: 默认提交时间为结束时间 caoqianming 2025-09-12 10:11:25 +0800
• c4c61ff737 fix: 产生编号时存在bug caoqianming 2025-09-12 09:19:57 +0800
• aa72b0780a feat: 快速报工的bug caoqianming 2025-09-12 09:11:35 +0800
• 9d692b4d5d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-11 15:53:36 +0800
• 42a4332b87 feat: base 日志默认记录耗时大于2s的 caoqianming 2025-09-11 15:53:36 +0800
• 51fb42d597 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-11 14:43:04 +0800
• 19c7e7aad1 feat: ofm 增加档案台账 zty 2025-09-11 14:43:04 +0800
• b4cfdd693a fix: 交接记录已提交不可变动 caoqianming 2025-09-11 14:14:47 +0800
• 448bdb9ee6 fix: mlog change 导致的bug问题 caoqianming 2025-09-11 14:09:27 +0800
• 839fc2af82 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-11 13:26:37 +0800
• cecffbdb78 feat: mlog submit/revert 改用乐观锁 caoqianming 2025-09-11 13:26:37 +0800
• a0c3443d9e feat: ofm 修改车辆model zty 2025-09-11 09:53:35 +0800
• b380c3805b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-11 09:51:42 +0800
• 80fa245b58 feat: ofm 修改 车辆model zty 2025-09-11 09:51:41 +0800
• d828bb76d5 feat: wpr list 返回wm_material_ofrom_name caoqianming 2025-09-11 09:13:37 +0800
• e4a2e7c4f5 feat: wpr list 返回wm_material_name caoqianming 2025-09-11 09:08:48 +0800
• 53858cac94 feat: wpr list 返回material_start_name caoqianming 2025-09-10 17:01:53 +0800
• a5f32dbeda Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-10 15:35:18 +0800
• e491d7b4fe fix: wpr list filter bug caoqianming 2025-09-10 15:35:17 +0800
• 1ea9ef48a6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-10 15:21:19 +0800
• 9db173cdb9 feat: vehicle 增加serializer 返回字段 zty 2025-09-10 15:21:19 +0800
• 2369c1469e feat: wpr list返回batch caoqianming 2025-09-10 15:03:24 +0800