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

Mono Color

• 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
• a6fcdab836 fix: mlogbwstarttest bug3 caoqianming 2025-09-04 17:20:31 +0800
• 026ebccef5 fix: mlogbwstarttest bug2 caoqianming 2025-09-04 17:18:38 +0800
• f1aa922946 fix: mlogbwstarttest bug caoqianming 2025-09-04 17:08:19 +0800
• a7fd4b9448 feat: MlogbDefect 添加count_has 的处理 caoqianming 2025-09-04 16:59:20 +0800
• 65d47008a4 feat: mlogbdefect添加count_has 字段 caoqianming 2025-09-04 16:48:41 +0800
• 65726e967f feat: update_mb_item defect处理更严谨 caoqianming 2025-09-04 16:48:10 +0800
• 2524feca72 feat: 取消最后一步产出与工艺包不一致 的校验 caoqianming 2025-09-04 15:07:07 +0800
• 01b30e21d3 feat: 出入库记录添加乐观锁 caoqianming 2025-09-04 14:42:14 +0800
• 4cffb8a563 feat: 出入库明细可默认批次为无 caoqianming 2025-09-04 10:55:56 +0800
• 0c08543e9c feat: 导入物料明细时可默认批次号为 无批次 caoqianming 2025-09-04 10:44:32 +0800
• e6a1363b43 feat: 导入物料明细时可默认批次号为 无批次 caoqianming 2025-09-04 10:40:52 +0800
• 3d188a72f3 feat: 导入物料明细时可默认批次号3 caoqianming 2025-09-04 10:25:42 +0800
• 6104a2e6be feat: 导入物料明细时可默认批次号2 caoqianming 2025-09-04 10:08:44 +0800
• abd1ac9d56 feat: batch_bxerp考虑mlogbw_from caoqianming 2025-09-04 08:54:21 +0800
• cc45163775 feat: mlog_submit mlogbdefect增加筛选条件 caoqianming 2025-09-04 08:53:37 +0800
• f82db7bb6f feat: 导入物料明细时可默认批次号 caoqianming 2025-09-03 11:27:58 +0800
• c4539260a8 feat: 光芯批次统计增加班次返回 caoqianming 2025-09-02 16:45:40 +0800
• 872e59ffe1 feat: route update 时from_route存在则不可修改关键信息3 caoqianming 2025-09-02 15:53:24 +0800
• 7d2f11f194 feat: route update 时from_route存在则不可修改关键信息2 caoqianming 2025-09-02 15:22:29 +0800
• bf3803a0e8 feat: mlog_submit 进行操作时间校验 caoqianming 2025-09-02 15:17:59 +0800
• a6b320bad6 feat: route update 时from_route存在则不可修改关键信息 caoqianming 2025-09-02 15:16:55 +0800
• ba0e86d834 fix: ftestwork submit 校验wm和mb bug caoqianming 2025-09-02 14:30:25 +0800
• 28671451b0 feat: mlogchange支持work_start_time caoqianming 2025-09-02 12:15:29 +0800
• 45af751350 feat: MlogSerializer 处理 work_start_time 的 bug2 caoqianming 2025-09-02 11:32:05 +0800
• c997cba6a5 feat: route采用引用方式允许重复创建 caoqianming 2025-09-02 11:23:37 +0800
• 9af23216b6 feat: MlogSerializer 处理 work_start_time 的 bug caoqianming 2025-09-02 11:09:12 +0800
• 81561b5238 fix: MlogbInUpdateSerializer 联动count_use 和 count_real caoqianming 2025-09-02 09:10:52 +0800
• f7cc3b438f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-02 08:48:03 +0800
• 5c163cdcbb feat: 修改能管采集的点位 zty 2025-09-02 08:48:01 +0800
• 67f7afd3fc Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-02 08:40:20 +0800
• 1929fd30a6 feat: mlog work_start_time必填 caoqianming 2025-09-02 08:40:20 +0800
• c38457e947 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-01 17:05:21 +0800
• 8f6e401fdd feat: ftestwork submit支持mb zty 2025-09-01 17:05:20 +0800
• 6582a4dae1 feat: toggle_state 使用 routepack.update权限 caoqianming 2025-09-01 16:06:00 +0800
• 30f8d484d1 fix: batchlog batches_to 优化 caoqianming 2025-09-01 13:17:35 +0800
• 31d0dc4829 feat: ftestwork支持对materialbatch检查 caoqianming 2025-08-29 13:11:58 +0800
• 9d1c5415e1 feat: batchst返回material_start相关信息 caoqianming 2025-08-29 09:48:09 +0800
• a249258ba6 feat: 添加定时任务以标记mtask 状态2 caoqianming 2025-08-28 16:43:10 +0800
• 4fa0b33254 feat: 添加定时任务以标记mtask 状态 caoqianming 2025-08-28 16:37:23 +0800
• 22a310906a release: 2.7.2025082816 2.7.2025082816 caoqianming 2025-08-28 16:12:48 +0800