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

3.1.2026071608

3.1.2026071614

3.1.2026072309

3.1.2026072316

3.1.2026072713

Mono Color

• cd294bc53c fix: 返修交接后物料状态都变为返修品 caoqianming 2025-04-14 23:03:34 +0800
• 88bf75baaf feat: fmlog添加is_fix字段 caoqianming 2025-04-14 22:49:31 +0800
• 1cbbade280 feat: 单个日志填写时带入wm_in的batch caoqianming 2025-04-14 22:26:42 +0800
• c791bde5be fix: handover拆批请选择车间库存2 caoqianming 2025-04-14 15:29:36 +0800
• 22b6b1305f fix: handover拆批请选择车间库存 caoqianming 2025-04-14 15:19:45 +0800
• 882b0f2cbd feat: 添加ichat以支持AI对话 caoqianming 2025-04-13 10:12:38 +0800
• f228884b27 release: 2.6.2025041113 2.6.2025041113 caoqianming 2025-04-11 13:33:48 +0800
• fda9ecae94 fix: get_alldata_with_batch中小数计算异常捕获 caoqianming 2025-04-11 10:16:51 +0800
• 1ff822161a feat: ptest性能检验样品编号字段更改为text caoqianming 2025-04-11 08:42:10 +0800
• 4b87f6fe8e Merge branch 'gzerp' caoqianming 2025-04-09 15:30:58 +0800
• 648aaa465c fix: 光子综合查询对小数和None的处理 caoqianming 2025-04-09 15:30:17 +0800
• cdc30f5163 release: 2.6.2025040913 2.6.2025040913 caoqianming 2025-04-09 13:20:45 +0800
• 060c07abd7 fix: 来料加工和完成筛选完善 caoqianming 2025-04-09 13:19:12 +0800
• c0eacd7fa8 fix: decimal存入json字段时使用myjsondecoder caoqianming 2025-04-09 13:18:42 +0800
• 8068cb1ca3 fix: cal_x_task_count分配任务数的bug caoqianming 2025-04-09 13:18:00 +0800
• 15ccfbe6f9 feat: 添加MyJSONEncoder以支持decimal caoqianming 2025-04-09 10:50:18 +0800
• 948bbcb805 release: 2.6.2025040813 2.6.2025040813 caoqianming 2025-04-08 13:38:31 +0800
• 2a0c97dfb2 fix: ftest当is_ok为True时设置defect为空 caoqianming 2025-04-08 11:38:46 +0800
• b34e477593 fix: ftest当is_ok为false时才设置defect_main caoqianming 2025-04-08 11:06:51 +0800
• ef0414b053 fix: material_out_tracking获取时对None的情况进行处理 caoqianming 2025-04-08 08:38:22 +0800
• 1efd1c71da release: 2.6.2025040710 2.6.2025040710 caoqianming 2025-04-07 10:29:00 +0800
• b852e9b740 fix: get_dag时matin matout为空时不报错 caoqianming 2025-04-07 10:18:43 +0800
• 61488bb4bd feat: copy时matin matout不自动生成 caoqianming 2025-04-07 10:13:33 +0800
• 166b83c04d release: 2.6.2025040316 2.6.2025040316 caoqianming 2025-04-03 16:42:49 +0800
• de5f231154 release: 2.6.2025040316 caoqianming 2025-04-03 16:35:14 +0800
• 9f0a9fc699 fix: 通过指定mat_in/mat_out复制工艺路线 bug2 caoqianming 2025-04-03 16:12:35 +0800
• 885d932fc8 fix: 通过指定mat_in/mat_out复制工艺路线 bug1 caoqianming 2025-04-03 16:11:54 +0800
• b400b13ded feat: 通过指定mat_in/mat_out复制工艺路线 caoqianming 2025-04-03 14:48:14 +0800
• a8f9676ed0 fix: get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal caoqianming 2025-04-03 08:34:57 +0800
• a79717abd8 fix: 组合件入库后未添加count的bug caoqianming 2025-04-02 18:39:31 +0800
• 18546d48f5 feat: 销售发货编号非必填 caoqianming 2025-04-02 16:31:12 +0800
• 10e0f4aaef release: 2.6.2025040211 2.6.2025040211 caoqianming 2025-04-02 11:19:42 +0800
• 2923fad2a8 feat: HTML_BASE_URL 前缀统一修改 caoqianming 2025-04-02 11:04:46 +0800
• 5fe24c381b feat: sysbaseview返回系统版本号 caoqianming 2025-04-02 10:12:30 +0800
• 20943494ad fix: base log delay=True减少冲突 caoqianming 2025-04-02 10:11:00 +0800
• 783a56dfea fix: get_can_save_from_save_expr的match转为str caoqianming 2025-04-02 09:32:33 +0800
• cde15991a1 feat: 2.6.2025040115 2.6.2025040115 caoqianming 2025-04-01 15:57:30 +0800
• 6dfb5c489a fix: 该工艺步骤已存在的校验bug caoqianming 2025-04-01 15:41:33 +0800
• c05c59b004 feat: handover数据库变动/初步更新批次数据关系链 caoqianming 2025-03-31 16:42:18 +0800
• cb28f1d9ef feat: 添加mio,mlog,handover关于batch的查询条件 caoqianming 2025-03-31 15:35:39 +0800
• 146fe6641f feat: get_batch_dag节点排序改动 caoqianming 2025-03-31 15:11:43 +0800
• 0b76602c84 change: base 改变log backupcount为30 caoqianming 2025-03-31 15:08:23 +0800
• 1936fe183f perf: base settings里日志记录handler优化 caoqianming 2025-03-31 15:04:39 +0800
• 3c0e416735 feat: 支持退料交接 caoqianming 2025-03-31 14:17:20 +0800
• 88da422f54 feat: mlogchangeserializer增加生产设备选择 caoqianming 2025-03-31 13:36:25 +0800
• 853c28976d feat: 完善版本追踪 2.6.2025033109 caoqianming 2025-03-31 11:10:47 +0800
• cb1b2dfae6 fix: cal_x_task_count bug caoqianming 2025-03-28 10:25:30 +0800
• 98d76424c7 feat: route create update 强校验4 caoqianming 2025-03-28 09:20:08 +0800
• c541e58006 feat: route create update 强校验3 caoqianming 2025-03-28 09:07:50 +0800
• 6b3a34879e feat: route create update 强校验2 caoqianming 2025-03-28 08:49:57 +0800
• 4b9e65ba40 feat: route create update 强校验 caoqianming 2025-03-28 08:48:05 +0800
• 18e5ca2598 fix: routeserializer material_out_tracking错误 caoqianming 2025-03-28 08:29:25 +0800
• 73f0e504c9 feat: batchst g_create 默认relation_type caoqianming 2025-03-28 08:28:58 +0800
• 40370b876f fix: 分配任务的get_routes 参数bug caoqianming 2025-03-27 17:21:58 +0800
• ce38115255 fix: validate_and_return_gjson bug caoqianming 2025-03-27 13:36:34 +0800
• afe53f3687 fix: _validate_subgraph bug caoqianming 2025-03-27 12:50:07 +0800
• c002017a84 feat: 工艺路线支持子图逻辑 caoqianming 2025-03-27 12:40:09 +0800
• a31faa0cda feat: 添加route pack dag显示 caoqianming 2025-03-26 17:23:38 +0800
• 2d7183f8dd feat: 简化validate dag 的报错提示 caoqianming 2025-03-26 16:45:39 +0800
• eaa5d75b99 feat: 工艺路线校验 caoqianming 2025-03-26 16:36:29 +0800
• bac30a2925 feat: wpr追溯上游 caoqianming 2025-03-26 15:17:26 +0800
• 4e7757f64d feat: 合批时的物料校验 caoqianming 2025-03-26 13:30:39 +0800
• 0ddc6692ac feat: handover 合并可指定现有库存 caoqianming 2025-03-26 13:19:30 +0800
• 3e074b51e3 feat: routepack变更工艺路线的状态 caoqianming 2025-03-26 09:10:33 +0800
• a2ed0eb1d3 feat: base 允许同源嵌入 caoqianming 2025-03-25 18:09:32 +0800
• 5c77eb2742 feat: testscan页面2 caoqianming 2025-03-25 16:15:53 +0800
• 0c9c38890e feat: testscan页面 caoqianming 2025-03-25 16:04:52 +0800
• 8bf3ad06d6 feat: mlog get_queryset bug caoqianming 2025-03-25 15:40:53 +0800
• 546b020dae feat: mloguserserializer handle_user_name caoqianming 2025-03-25 14:59:01 +0800
• 7f2aaf3f86 feat: process添加查询条件 caoqianming 2025-03-25 14:19:29 +0800
• 22e64e5b84 fix: 其他入库允许wpr非必填 caoqianming 2025-03-25 11:17:27 +0800
• 0e8cce0669 feat: get_batch_dag bug2 caoqianming 2025-03-25 09:54:57 +0800
• 11d7e1a772 feat: get_batch_dag bug caoqianming 2025-03-25 09:51:25 +0800
• 52b96dc740 fix: batchst g_create bug caoqianming 2025-03-25 09:48:17 +0800
• 6f28056ed4 feat: 重构以下batchlog caoqianming 2025-03-25 09:44:22 +0800
• b9a3427162 feat: batchst添加查询条件 caoqianming 2025-03-24 15:18:44 +0800
• d4df340c1c feat: batchst添加字段以追踪material_start caoqianming 2025-03-24 15:16:37 +0800
• b070b312a8 feat: batchst添加字段以追踪 caoqianming 2025-03-24 15:07:50 +0800
• e07f9c877c feat: 添加mloguser字段及逻辑 caoqianming 2025-03-24 14:37:18 +0800
• c1a4edf9e5 fix: handover 创建并提交的接口 caoqianming 2025-03-24 09:02:03 +0800
• 468cb7b658 feat: handover 创建并提交的接口 caoqianming 2025-03-24 08:42:02 +0800
• 5ee10e7cc5 fix: handover 合批时创建关系链的bug caoqianming 2025-03-24 08:41:43 +0800
• f57604492b fix: batchst create bug caoqianming 2025-03-21 17:54:50 +0800
• 9780cd8021 feat: utask编号可不填2 caoqianming 2025-03-21 16:54:52 +0800
• d8c421969c feat: utask编号可不填 caoqianming 2025-03-21 16:48:52 +0800
• 43ddafa6d7 feat: mio 编号可不填 caoqianming 2025-03-21 16:47:03 +0800
• 0842806f83 feat: process添加parent字段 caoqianming 2025-03-21 16:33:30 +0800
• 108116342e feat: batchlog数据链 caoqianming 2025-03-21 14:15:10 +0800
• 23ad849e36 fix: wpr oinfo bug caoqianming 2025-03-21 12:15:05 +0800
• 8867e76701 feat: wpr oinfo bug caoqianming 2025-03-21 11:30:56 +0800
• 0474d0a943 feat: mioitem wm校验 caoqianming 2025-03-20 11:34:51 +0800
• 1289c19aaa feat: MIODo 可不填belong_dept caoqianming 2025-03-20 11:24:06 +0800
• a773f4884b feat: mio number不设置为只读 caoqianming 2025-03-20 10:50:44 +0800
• 5e3069b147 feat: mlog count_fields 可不带count_ok_full caoqianming 2025-03-20 09:51:15 +0800
• fa66a9a4d5 fix: wmaterial search bug caoqianming 2025-03-20 09:38:28 +0800
• 3ad7acafc9 fix: wmaterial search bug3 caoqianming 2025-03-20 09:37:07 +0800
• cde3d68d7f fix: wmaterial search bug2 caoqianming 2025-03-20 09:34:59 +0800
• d136f96bcc fix: wmaterial search bug caoqianming 2025-03-20 09:33:11 +0800
• 77f411887a feat: mio utask number非必填 caoqianming 2025-03-20 09:30:33 +0800
• 48988d3237 fix: wmaterial 去除 material__process__exclude 字段 caoqianming 2025-03-20 09:09:41 +0800