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

• 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
• 27416dfeaa Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-10 14:49:35 +0800
• ec8881fb02 feat: 增加wpr tag查询条件以支持todo等 caoqianming 2025-09-10 14:49:35 +0800
• f6f842c17f feat: 修改车辆的字段 zty 2025-09-10 14:36:30 +0800
• 172e2397be feat: ofm 车辆管理迁移文件 zty 2025-09-10 14:27:38 +0800
• 71bc4e76f0 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-10 14:26:25 +0800
• ba8b258ee7 feat: ofm 车辆审批 zty 2025-09-10 14:26:23 +0800
• 8b7a87abb6 fix: 出入库记录和交接记录提交处理时都进行单个的强校验 caoqianming 2025-09-10 13:11:51 +0800
• d42bc29d2c feat: 出入库记录和交接记录提交处理时都进行单个的强校验 caoqianming 2025-09-10 11:26:37 +0800
• 6b423c80eb feat: 添加物料明细与批次不匹配的校验2 caoqianming 2025-09-09 16:49:51 +0800
• df4b062209 feat: 添加物料明细与批次不匹配的校验 caoqianming 2025-09-09 16:38:58 +0800
• d84b8e94fd feat: gen_number_with_rule 优化一下 caoqianming 2025-09-09 16:19:05 +0800
• 6d09e5e4f3 feat: handover_submit增强校验 caoqianming 2025-09-09 15:39:13 +0800
• bc555b7bea feat: mlog list 支持返回mlogbw number caoqianming 2025-09-09 14:05:59 +0800
• 3906b0f744 feat: gen_number_with_rule按生产日志中的工段过滤 caoqianming 2025-09-09 13:37:56 +0800
• d19fee8e6f feat: gen_number_with_rule 完善 caoqianming 2025-09-09 11:28:04 +0800
• 81a16fd37e feat: 工段未配置班次提醒 caoqianming 2025-09-09 11:23:09 +0800
• ddb4a6930d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-09 10:37:56 +0800
• cbc5d558d9 feat: 板段号生成逻辑修改 caoqianming 2025-09-09 10:37:56 +0800
• 0183234497 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-08 16:31:24 +0800
• 068e391845 feat: ofm-印章绑定审批修改 zty 2025-09-08 16:31:20 +0800
• 6b6c4b7e57 release: 2.8.2025090815 2.8.2025090815 caoqianming 2025-09-08 16:23:34 +0800
• 0a12927518 feat: batch bxerp含缺陷统计 caoqianming 2025-09-08 15:18:10 +0800
• 3be13dd920 feat: mlog list 添加update_time caoqianming 2025-09-08 14:51:11 +0800
• 8cc9c46a95 feat: 工艺步骤中辅料使用的校验 caoqianming 2025-09-08 14:29:19 +0800
• 2e2ac78bad feat: mlogb添加parent isnull查询 caoqianming 2025-09-08 13:33:48 +0800
• 0b1f71e652 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-08 11:18:10 +0800
• 94a218c09a feat: 次批触发输出产生 caoqianming 2025-09-08 11:18:09 +0800
• de1e5b4d41 feat: 修改印章的model 和 serializer zty 2025-09-08 11:13:06 +0800
• 0e783a92e0 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-08 09:58:00 +0800
• 3e90dd6820 feat: 修改 ofm sevice 印章模块 zty 2025-09-08 09:57:58 +0800
• 10d4a64c3a feat: base 优化safe_get_or_create caoqianming 2025-09-08 09:28:04 +0800
• f97f51e72c feat: 修改ofm seal 过滤查询功能 zty 2025-09-05 14:49:50 +0800
• 6b246f147d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-05 14:32:43 +0800
• fdb49e1147 feat: mioitemcreate 批次号可不填 caoqianming 2025-09-05 14:32:42 +0800
• ca18fece21 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-05 11:10:16 +0800
• 6a6d46583b feat: 行政管理 -印章管理 zty 2025-09-05 11:10:15 +0800
• 41c1653d13 feat: ftest默认为合格 caoqianming 2025-09-05 09:47:20 +0800
• c20580e263 fix: mlogbwstarttest bug4 caoqianming 2025-09-04 17:23:00 +0800