factory

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

2ea048cc53 fix: mqtt 包引入调整 caoqianming 2024-04-11 21:31:49 +0800
3e75683ee1 fix: EnvDataSerializer round处理2 caoqianming 2024-04-11 16:59:18 +0800
68933e3e16 fix: EnvDataSerializer round处理 caoqianming 2024-04-11 16:57:47 +0800
99e4079c52 fix: equipment evdata add_info_for_list2 caoqianming 2024-04-11 16:38:24 +0800
d191a18f7b fix: equipment evdata add_info_for_list caoqianming 2024-04-11 16:32:52 +0800
0061285355 feat: 变更一下envdata表结构 caoqianming 2024-04-11 15:49:44 +0800
74cbaa8497 refector: 修改函数名 caoqianming 2024-04-11 15:01:23 +0800
bd1897f6f6 feat: correct_material_cate caoqianming 2024-04-11 11:29:21 +0800
16417e0016 feat: 优化亚控测点批量存库及相应enm逻辑更改 caoqianming 2024-04-11 11:08:32 +0800
6fde78574b fix: base period_dict错误修改 caoqianming 2024-04-11 10:59:13 +0800
0fdb230822 feat: mplog视图层转mplogx caoqianming 2024-04-11 10:58:33 +0800
1139bb6119 feat: 优化make_sflog/get_sflog caoqianming 2024-04-11 10:56:32 +0800
d8de59c3f2 feat: base 增加ctask_run将普通函数转celery执行 caoqianming 2024-04-11 10:53:39 +0800
813301e7e1 feat: 变更mpoint字段 caoqianming 2024-04-11 10:52:13 +0800
23eac91491 feat: enm启动时缓存测点 caoqianming 2024-04-11 10:47:06 +0800
19f6e18154 feat: material的count改为对所有库存进行统计 caoqianming 2024-04-09 08:40:28 +0800
9b2dbb8a01 feat: 增加矫正correct_material_count的task caoqianming 2024-04-08 18:34:04 +0800
8c798984f3 fix: correct_mb_count_notok caoqianming 2024-04-08 17:08:08 +0800
fa3452088f fix: correct_mb_count_notok caoqianming 2024-04-08 17:03:48 +0800
e8802c09b2 fix: 矫正mioitem count_notok错误的数据 caoqianming 2024-04-08 16:30:28 +0800
fe19847458 feat: mioitem增加扁不合格项字段 caoqianming 2024-04-08 13:53:12 +0800
4f0ef8b4ac feat: kingclient兼容处理 caoqianming 2024-04-07 19:15:34 +0800
3c1319d48f feat: material增加search字段 caoqianming 2024-04-07 19:15:10 +0800
93022f7c40 feat: king_sync以d做name caoqianming 2024-04-07 18:34:47 +0800
c6222c65f6 feat: 半成品检验有关库存消耗完的逻辑处理 caoqianming 2024-04-07 18:33:40 +0800
29f085253c fix: MIOPurSerializer添加supplier caoqianming 2024-04-07 15:18:41 +0800
0cf9f14a5c fix: generate_envdata 优化 caoqianming 2024-04-04 01:03:06 +0800
76f5d12b34 feat: envdata生成模拟数据 caoqianming 2024-04-03 16:45:33 +0800
68fc7f4217 feat: 生产领料校验优化 caoqianming 2024-04-03 09:23:27 +0800
0b193c6950 fix: correct_mb优化 caoqianming 2024-04-02 22:39:24 +0800
2982bccf7f fix: 多了一次save调用 caoqianming 2024-04-02 17:22:56 +0800
759bd3e149 feat: mio支持从明细批次号查询 caoqianming 2024-04-02 17:19:07 +0800
c5ae117436 feat: mioitem增加划伤字段 caoqianming 2024-04-02 17:11:02 +0800
6254e251d3 feat: 生产领料半成品时需校验是否经过检验 caoqianming 2024-04-02 17:07:22 +0800
462a25bb9a feat: 生产入库update_mb时记录production_dept caoqianming 2024-04-02 16:46:13 +0800
aaa5545c30 feat: 增加correct_material_batch以矫正mb caoqianming 2024-04-02 16:14:33 +0800
3eb7b76095 fix: material create指定所到工序校验 caoqianming 2024-04-02 16:12:14 +0800
5078a516d2 feat: mlog增加退火后碎字段 caoqianming 2024-04-02 15:44:19 +0800
c8bcbc62c3 feat: inm支持小数点后3位 caoqianming 2024-04-02 12:27:19 +0800
bec6644138 feat: enm mpoint增加third_info字段 caoqianming 2024-04-02 12:07:53 +0800
2d8f546104 fix: cache_mpoints 标注错误 caoqianming 2024-04-02 11:40:46 +0800
7d5b1223d5 feat: inm mioitem同步数据库 caoqianming 2024-04-02 11:40:07 +0800
7e18ea572a feat: mioitem添加检验备注等字段 caoqianming 2024-04-02 10:21:22 +0800
567c40e962 feat: 完善mqtt获取数据 caoqianming 2024-04-02 10:19:17 +0800
a104191341 feat: 从kioserver中获取数据 caoqianming 2024-04-02 10:18:42 +0800
76ccb4dc55 feat: 性能测试提供search字段 caoqianming 2024-04-01 14:43:22 +0800
7604ee9af3 feat: 更改供应商部分字段可不填 caoqianming 2024-03-29 09:44:47 +0800
356ef262de feat: mpoint增加interval字段 caoqianming 2024-03-22 18:22:06 +0800
4d524e3bf8 refector: mqtt优化 caoqianming 2024-03-22 18:21:41 +0800
33dba0a30e refector: 重构一点third中的三方client代码 caoqianming 2024-03-22 15:30:00 +0800
0e0262d170 feat: mioitem添加js,qx字段 caoqianming 2024-03-22 14:57:06 +0800
a737343d3a feat: 添加亚控restful接口 caoqianming 2024-03-21 18:44:02 +0800
6e4298873f feat: 增加周预估消耗量字段 caoqianming 2024-03-20 17:39:44 +0800
fd8040b20e feat: bi exec 默认raise_exception caoqianming 2024-03-20 15:24:22 +0800
de0b1ade8d refector: dataset list 排序 caoqianming 2024-03-19 17:13:02 +0800
bff47cbac3 feat: 优化dataset exec caoqianming 2024-03-19 13:23:10 +0800
f548785014 fix: dataset exec query update逻辑变化 caoqianming 2024-03-19 13:15:41 +0800
d05ee1595c feat: bi dataset 表增加字段 caoqianming 2024-03-19 11:30:20 +0800
eaf1a5671f fix: 用于correct utask错误数据 caoqianming 2024-03-18 16:29:53 +0800
f456c7cbc8 fix: mtask_submit后不更改utask状态的bug caoqianming 2024-03-18 16:13:04 +0800
37d8baa875 fix: opeation filter暂不支持cates多对多in caoqianming 2024-03-18 10:43:17 +0800
370ae64299 feat: 添加mqtt脚本并增加require caoqianming 2024-03-17 22:14:23 +0800
06bd6a7544 feat: base 调整项目可自定义配置精简settings.py caoqianming 2024-03-17 22:06:52 +0800
077707f493 fix: celeryinfo取值错误 caoqianming 2024-03-15 16:41:13 +0800
c0567f5a55 feat: 返回redis和celery的一些监控数据 caoqianming 2024-03-15 16:01:26 +0800
8a388928f0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-03-13 17:41:14 +0800
966edbacd4 feat: 添加celery监控信息2 caoqianming 2024-03-13 17:41:16 +0800
0af253fb0b feat: 添加celery监控信息 caoqianming 2024-03-13 17:39:45 +0800
718f594a4b feat: 添加是否新能源字段 caoqianming 2024-03-13 17:39:23 +0800
a891692b71 feat: base 提供监测celery的实例 caoqianming 2024-03-13 17:37:46 +0800
33a0ddad4c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-03-12 18:41:58 +0800
38b7d0c586 feat: time_20_y 改为6点半 caoqianming 2024-03-11 15:38:09 +0800
a32cefb939 feat: operationlist增加筛选条件 caoqianming 2024-03-11 09:04:10 +0800
7eba5a8e13 feat: base 从request.data获取page和size caoqianming 2024-03-11 08:45:21 +0800
6589364eb4 fix: base 支持从request.data中获取page和page_size caoqianming 2024-03-08 18:15:58 +0800
2d5e06241d fix: base 支持从request.data中获取page和page_size caoqianming 2024-03-08 18:14:15 +0800
78306f7a29 feat: base complexserializer 非必填 caoqianming 2024-03-08 17:59:35 +0800
c159409c3a feat: base complexserializer支持传入page或自行在url中传page caoqianming 2024-03-08 17:56:47 +0800
87cd39ee89 feat: base 支持从request.data中获取page和page_size caoqianming 2024-03-08 17:56:04 +0800
779488589a fix: handover_submit针对混料特殊处理的bug3 caoqianming 2024-03-06 22:24:11 +0800
2addfc8433 fix: handover_submit针对混料特殊处理的bug2 caoqianming 2024-03-06 21:52:55 +0800
3ddb050330 fix: handover_submit针对混料特殊处理的bug caoqianming 2024-03-06 21:45:17 +0800
b429ad9059 fix: 废弃一些接口 caoqianming 2024-03-06 18:01:24 +0800
8a32690395 feat: handoverserializer返回更多数据 caoqianming 2024-03-06 17:44:50 +0800
abdee3d2d5 feat: 增加wmaterial查询条件 caoqianming 2024-03-06 17:21:48 +0800
4c3610ac25 feat: 混料支持车间库存 caoqianming 2024-03-06 17:07:51 +0800
f6db92f815 feat: 增加wmaterial查询条件 caoqianming 2024-03-06 15:50:29 +0800
02344da862 feat: 增加equipment设备类型 caoqianming 2024-03-06 09:53:16 +0800
0de0489272 feat: 增加箱中破不合格字段 caoqianming 2024-03-05 10:11:33 +0800
5c0c016872 fix: correct_tuihuo_log矫正退火日志2 caoqianming 2024-03-04 15:50:49 +0800
c1d5ef86f1 fix: correct_tuihuo_log矫正退火日志 caoqianming 2024-03-04 14:58:36 +0800
5aab22e9d9 fix: 工段删除同时更新route caoqianming 2024-03-04 14:22:22 +0800
e99854b56f fix: mlog填写时进行更进一步校验 caoqianming 2024-03-04 13:54:31 +0800
eecda9e5a6 fix: material导入可更改count_safe caoqianming 2024-03-04 10:44:42 +0800
70b5a4d87e fix: material unit 忽略大小写2 caoqianming 2024-03-04 10:37:33 +0800
9cd5bfc8f9 fix: material unit 忽略大小写 caoqianming 2024-03-04 10:25:58 +0800
fcc613170e feat: 物料信息导入功能 caoqianming 2024-03-04 09:58:09 +0800
1c802eafb1 fix: check_same_allow_minute_and_raise_event 判断错误 caoqianming 2024-03-02 09:47:53 +0800
652ee31f6f fix: check_same_allow_minute_and_raise_event 判断错误 caoqianming 2024-03-02 09:41:47 +0800
641c4cefc6 fix: snap_and_analyse ecs为空就不创建事件 caoqianming 2024-03-02 08:59:47 +0800