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

• 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
• 5e9c15c4a5 feat: 添加定时任务以标记mtask为已完成 caoqianming 2025-08-28 16:08:18 +0800
• 786e885071 feat: update_mtask 不再触发状态改变 caoqianming 2025-08-28 16:07:41 +0800
• 41485d7143 feat: 子任务提交会触发大任务提交 caoqianming 2025-08-28 15:40:24 +0800
• 73b225fa19 feat: 优化mlog list查询2 caoqianming 2025-08-28 10:52:11 +0800
• c47b66af6c feat: 优化mlog list查询 caoqianming 2025-08-28 09:54:56 +0800
• 1d0861e0e7 feat: 增加直接userid获取token的接口 caoqianming 2025-08-27 15:47:57 +0800
• fa243faf34 feat: mlog 添加索引 caoqianming 2025-08-27 15:35:04 +0800
• ebe0e4cc6a fix: 增加mlogbw start_test接口以优化批量操作 caoqianming 2025-08-27 15:10:40 +0800
• 894142712f feat: mlog view 暂时性能优化 caoqianming 2025-08-27 14:23:56 +0800
• cd4b686f11 feat: 增加mlogbw start_test接口以优化批量操作 caoqianming 2025-08-27 11:11:04 +0800
• 9ce5d29fa6 feat: 优化mlogbw bulk update 3 caoqianming 2025-08-27 10:07:35 +0800
• 3e8bce688a feat: 优化mlogbw bulk update 2 caoqianming 2025-08-27 10:04:45 +0800
• fa7d3095de feat: 优化mlogbw bulk update caoqianming 2025-08-27 10:02:50 +0800
• c7514836cb release: 2.7.2025082616 2.7.2025082616 caoqianming 2025-08-26 16:51:51 +0800
• 316931fb40 feat: 添加mlog和handover的锁 caoqianming 2025-08-26 16:34:49 +0800
• 8a039094cf feat: base 添加悲观锁及其装饰器 caoqianming 2025-08-26 16:34:25 +0800
• f0b24da22f feat: number_to_batch 支持结合工序 caoqianming 2025-08-26 10:35:21 +0800
• 5496058226 feat: 物料清单的导出 caoqianming 2025-08-25 15:37:05 +0800
• 3810860f13 feat: mlogbw create 优化 caoqianming 2025-08-25 11:17:50 +0800
• 0a6959a36c fix: mlogbw create 调换一下if顺序 caoqianming 2025-08-25 09:44:32 +0800
• 4823acb004 fix: mlogbw create cal_count_notok bug caoqianming 2025-08-25 08:58:47 +0800
• 8b6d6fd668 fix: handover revert 可传入handler2 caoqianming 2025-08-21 20:17:02 +0800
• c58c79a18a fix: handover revert 可传入handler caoqianming 2025-08-21 20:13:09 +0800
• 41a3418110 feat: material添加img字段 caoqianming 2025-08-21 17:34:39 +0800
• 05955abd9c fix: base ComplexQueryMixin 默认null值排最后 caoqianming 2025-08-21 09:24:14 +0800
• 0cf04c50b3 feat: 过滤来料未完成的优化 caoqianming 2025-08-20 17:39:43 +0800
• 01e7d73bee feat: mlog quick添加mlogb caoqianming 2025-08-20 15:03:58 +0800
• 58024cc33d feat: batch_gzerp添加库存等字段 caoqianming 2025-08-19 16:01:18 +0800
• 4921383de1 feat: check_sql_safe 优化一下 caoqianming 2025-08-19 15:11:03 +0800
• bbfa512bb1 feat: quick返回mlogId caoqianming 2025-08-19 11:32:48 +0800
• d019e708cd feat: mlog submit revert支持放置到车间 caoqianming 2025-08-19 11:22:21 +0800
• d9326bc264 feat: 可根据work_start_time 推出handle_date caoqianming 2025-08-19 10:39:46 +0800
• a8ed1c3083 feat: MlogInitSerializer 可传入handle_date caoqianming 2025-08-19 10:35:45 +0800
• 2bb1cf2844 feat: 去除commands命令权限 caoqianming 2025-08-19 08:56:29 +0800
• 0dab1714f3 feat: 交接记录在审批状态下对撤销的处理 caoqianming 2025-08-18 16:52:23 +0800
• fbce5ec64f feat: base retreat 撤回功能提到wfservice里 caoqianming 2025-08-18 16:51:23 +0800
• 69e606bccc release: 2.7.2025081813 2.7.2025081813 caoqianming 2025-08-18 13:45:47 +0800
• efd25b040b fix: 导入出入库明细 caoqianming 2025-08-18 13:34:21 +0800
• ee9fce675d feat: 导入出入库明细 caoqianming 2025-08-18 11:04:24 +0800
• 7f619a36b0 feat: mlogbw增加type查询区分inout caoqianming 2025-08-14 14:58:50 +0800
• 84c701bdeb fix: 快速创建日志接口 caoqianming 2025-08-14 11:09:42 +0800
• ca3e811b1b feat: 快速创建日志接口 caoqianming 2025-08-14 11:05:33 +0800
• 1d778dbdf0 feat: 添加wamterial ava_qs方法 caoqianming 2025-08-14 09:48:23 +0800
• c69c33e85a feat: mlogbw添加排序以支持直接展示 caoqianming 2025-08-14 08:44:23 +0800
• 8ecd7d25b0 fix: mlogb__batch bug caoqianming 2025-08-13 14:45:21 +0800
• e03faeffc4 feat: WMaterialFilter filter tag优化 caoqianming 2025-08-13 10:03:00 +0800
• c7b1c8a8b8 feat: mlogbw添加筛选条件2 caoqianming 2025-08-13 09:15:46 +0800
• ddefbd49b2 feat: mlogbw添加筛选条件 caoqianming 2025-08-13 08:44:56 +0800
• 10745394e3 feat: MIOItemCreateSerializer 添加pack_index4 caoqianming 2025-08-08 16:44:59 +0800
• 82f6f4ee5e feat: MIOItemCreateSerializer 添加pack_index3 caoqianming 2025-08-08 14:34:57 +0800
• 46c9c5abab feat: MIOItemCreateSerializer 添加pack_index2 caoqianming 2025-08-08 13:53:21 +0800
• 09e390b37b feat: MIOItemCreateSerializer 添加pack_index caoqianming 2025-08-08 13:47:25 +0800
• afb27246d5 release: 2.7.2025080716 2.7.2025080716 caoqianming 2025-08-07 16:06:17 +0800
• 98a9806c4b feat: MaterialBatch返回can_mio2 caoqianming 2025-08-07 15:44:04 +0800
• d3f83605aa feat: MaterialBatch返回can_mio caoqianming 2025-08-07 15:39:43 +0800
• 783f288926 feat: wpr 不做删除 caoqianming 2025-08-07 15:07:03 +0800
• 40eb07eb12 feat: number_out_last 改为原始sql查询 caoqianming 2025-08-07 14:38:06 +0800
• 835c5f78dd feat: base query_one_dict优化 caoqianming 2025-08-07 14:37:41 +0800
• e30241dc22 feat: mioitemw 返回wpr_number_out caoqianming 2025-08-07 14:25:55 +0800
• b9376cc2d6 feat: 捕获number_out_last异常 caoqianming 2025-08-07 13:47:57 +0800