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

39d69952f1 fix: check_same_allow_minute_and_raise_event bug caoqianming 2024-03-01 18:56:49 +0800
61c8e6ab98 feat: ecm提出check_same_allow_minute_and_raise_event方法 caoqianming 2024-03-01 18:49:40 +0800
f51075e1ef feat: 采购入库和销售出库订单可为空 caoqianming 2024-03-01 17:36:43 +0800
373a4999c3 fix: materialcreateserializer bug caoqianming 2024-03-01 15:58:04 +0800
d3ae9d4a79 fix: mgroup筛选bug caoqianming 2024-03-01 15:57:19 +0800
3c87e157de fix: puorder update bug caoqianming 2024-03-01 15:50:50 +0800
2a3bcc1b33 fix: ftest中type设置为必填 caoqianming 2024-03-01 15:34:56 +0800
ab3bcee0f8 fix: 生产领料反向操作bug caoqianming 2024-03-01 15:16:19 +0800
4c75328e67 feat: materialbatch默认按update_time倒序排列 caoqianming 2024-03-01 15:09:41 +0800
eef99ed624 feat: 出入库操作支持提交后可撤销功能 caoqianming 2024-02-29 17:10:50 +0800
33e661b1dc fix: 调整envdata的字段格式 caoqianming 2024-02-28 17:20:49 +0800
4ddfbb266c fix: em可返回envdata caoqianming 2024-02-28 17:20:28 +0800
820f316511 fix: envdata因未配置ordering触发bug caoqianming 2024-02-28 16:34:48 +0800
1b6c58e7c8 feat: jsonfield默认blank=True caoqianming 2024-02-28 16:19:10 +0800
983e11af74 fix: jsonfield 默认blank=True caoqianming 2024-02-28 16:18:50 +0800
2e15c8ff31 feat: em返回数据可携带环保数据信息 caoqianming 2024-02-28 15:02:19 +0800
d4bf7a7e19 perf: 一些性能优化 caoqianming 2024-02-28 15:01:52 +0800
2c2e5bc4cd feat: base 可给list返回数据添加额外信息 caoqianming 2024-02-28 15:00:53 +0800
080c14b5f8 feat: 增加drain查询条件 caoqianming 2024-02-27 17:41:46 +0800
7f93c453e6 feat: 修改drain2serializer返回数据 caoqianming 2024-02-27 15:50:46 +0800
44c4a34c69 feat: 增加drain2serializer返回数据 caoqianming 2024-02-27 14:46:28 +0800
666d317f01 feat: carwash增加返回记录 caoqianming 2024-02-27 14:31:35 +0800
bb05ba8c5c feat: 增加DrainEquipEnvSerializer返回数据 caoqianming 2024-02-27 10:40:04 +0800
096650e592 feat: emserializer增加返回cate信息 caoqianming 2024-02-27 09:20:47 +0800
31b4af5fbb doc: 增加config查询文档 caoqianming 2024-02-27 09:20:27 +0800
34aaf22650 feat: base viewset增加query定制返回参数 caoqianming 2024-02-27 09:14:27 +0800
9d48575be4 feat: enp count_cate接口 caoqianming 2024-02-26 15:22:36 +0800
826cb8c8b1 feat: count_state统计数据增加 caoqianming 2024-02-26 15:22:14 +0800
b71a8921c3 feat: 设备运行状态count统计接口 caoqianming 2024-02-26 14:22:43 +0800
53193650f6 feat: 增加ecate筛选条件 caoqianming 2024-02-26 10:48:47 +0800
d2a503c482 feat: 增加ecate表 caoqianming 2024-02-26 10:31:12 +0800
e7f8086f23 feat: base 提供查询子集数据方法 caoqianming 2024-02-26 08:08:47 +0800
a1ef065e8c feat: base 优化utils queryset查询 caoqianming 2024-02-25 21:12:46 +0800
f252f206ac fix: access_time 错误 caoqianming 2024-02-23 13:51:28 +0800
a00a02bde6 feat: 模拟车辆出入厂数据 caoqianming 2024-02-23 13:47:11 +0800
dcaf7b1ca1 fix: ftest test_group可以为空 caoqianming 2024-02-22 09:41:56 +0800
2e0f2ec263 feat: 设备表增加字段 caoqianming 2024-02-22 09:37:11 +0800
af5a6c3d55 feat: 添加drain2serializer caoqianming 2024-02-21 09:54:42 +0800
46d8bd7ef6 feat: 增加设备tags查询 caoqianming 2024-02-21 09:54:00 +0800
c265295159 feat: base 增加MyJsonListFilter caoqianming 2024-02-21 09:53:41 +0800
00dfebd0c9 feat: carwash模拟数据 caoqianming 2024-02-21 08:56:00 +0800
8916349240 feat: abc!000增加default password caoqianming 2024-02-19 16:36:02 +0800
1934768b88 feat: base 增加DEFAULT_PWD caoqianming 2024-02-19 16:35:22 +0800
113a8c501f feat: 增加洗车记录 caoqianming 2024-02-05 11:05:02 +0800
4c774399b4 fix: 增加drainequip返回数据 caoqianming 2024-02-04 16:13:42 +0800
b8a9ca3782 feat: 增加drainequip返回数据 caoqianming 2024-02-04 16:10:42 +0800
dc453433a0 fix: drain mrgoup_name caoqianming 2024-02-04 09:25:37 +0800
887d549e7d fix: enp_envdata migrations caoqianming 2024-02-04 09:20:42 +0800
ff99772f94 feat: drainserializer mgroup_name caoqianming 2024-02-01 18:09:17 +0800
c2e087acf0 feat: EnvDataExportSerializer固定typechoice caoqianming 2024-02-01 14:00:28 +0800
34f487064b feat: 初步添加envdata数据导出功能 caoqianming 2024-02-01 13:57:54 +0800
0d79685b1e feat: 优化drainequip查询 caoqianming 2024-01-31 17:10:31 +0800
11d7438cb8 feat: 优化drainequip查询 caoqianming 2024-01-31 17:09:06 +0800
803affa7ce fix: DrainEquipEnvSerializer增加更完整的返回 caoqianming 2024-01-31 16:59:36 +0800
24020ea122 feat: DrainEquipEnvSerializer增加更完整的返回 caoqianming 2024-01-31 16:53:40 +0800
635e9df408 feat: 取消attendance联合约束 caoqianming 2024-01-31 11:25:59 +0800
19527f9736 feat: 变更attendance查询和排序条件 caoqianming 2024-01-31 10:24:40 +0800
8b2761b027 feat: 增加attendance查询和排序条件 caoqianming 2024-01-31 10:18:24 +0800
d6618ce25d fix: 修复可能的attendancecreatebug caoqianming 2024-01-31 10:07:53 +0800
986e9265d2 feat: bi报错信息完善2 caoqianming 2024-01-31 09:37:36 +0800
f050a335cc feat: bi报错信息完善 caoqianming 2024-01-30 17:45:53 +0800
83da22160f fix: enp增加设备编号返回bug caoqianming 2024-01-30 17:03:33 +0800
17c12cba85 feat: enp增加设备编号返回 caoqianming 2024-01-30 17:01:02 +0800
e089a02a32 feat: Material create校验是否存在 caoqianming 2024-01-29 18:25:10 +0800
e1fae87bcb feat: 更改物料排序 caoqianming 2024-01-29 18:15:57 +0800
32733e9800 fix: materialserializer count只读 caoqianming 2024-01-29 18:10:07 +0800
22978de879 feat: enp增加车辆出入记录 caoqianming 2024-01-29 16:38:00 +0800
9ff3ee2040 feat: 修改物料清单默认排序 caoqianming 2024-01-29 16:00:00 +0800
1a65e95127 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-01-29 15:57:41 +0800
c8cc3469e1 feat: 物料批次导入功能 caoqianming 2024-01-29 15:57:40 +0800
51893d23e0 fix: 去除不必要的print caoqianming 2024-01-28 00:20:17 +0800
d483bb6b61 fix: mlog update时mlogb不更新 caoqianming 2024-01-28 00:18:10 +0800
08f9fa106a feat: ptest增加test_user_name caoqianming 2024-01-25 09:52:29 +0800
d0b13ac215 feat: do_in时增加更完整的提示信息 caoqianming 2024-01-25 09:49:37 +0800
30dbeacdd0 fix: 修改mio查询条件以支持materials为空的情况 caoqianming 2024-01-25 09:45:12 +0800
1d2f9f09eb feat: mioviewset prefetch_related_fields优化 caoqianming 2024-01-24 12:35:50 +0800
6cb22744c2 fix: 增加materials__type__in筛选 caoqianming 2024-01-24 12:31:36 +0800
4a0f73c783 feat: 增加materials 筛选 caoqianming 2024-01-24 11:48:33 +0800
20e209ced2 fix: update_mb更新物料库存的bug caoqianming 2024-01-23 18:03:05 +0800
e81acb7aa7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-01-22 08:27:28 +0800
ddd0d2a6df feat: enp调整 caoqianming 2024-01-22 08:27:27 +0800
204730e2c8 Merge branch 'base' of https://github.com/caoqianming/django-vue-admin into base caoqianming 2024-01-21 22:44:55 +0800
fce6d86f07 fix: 处理合并的bug caoqianming 2024-01-10 10:11:43 +0800
8e96afac4c feat: 添加gitignore caoqianming 2024-01-21 22:30:38 +0800
e4a258088b fix: 处理合并的bug caoqianming 2024-01-10 10:11:43 +0800
7973a0093b feat: base 添加了对比字典及其嵌套内容的方法 caoqianming 2023-12-07 09:37:54 +0800
479eb91b99 feat: base 增加最大获取列表数 caoqianming 2024-01-21 00:23:49 +0800
6827b72231 feat: base 增加最大获取列表数 caoqianming 2024-01-21 00:23:49 +0800
e193a663c6 feat: 取消dataset exec 日志记录及可直接抛出错误 caoqianming 2024-01-21 00:06:19 +0800
6f8c7c0567 feat: mlog validate时计算count_notok caoqianming 2024-01-20 23:30:09 +0800
c88f33ad4d feat: 增加material name查询条件 caoqianming 2024-01-19 14:56:48 +0800
679e6bac4f feat: 增加物料导入功能 caoqianming 2024-01-19 14:36:08 +0800
61801784fc feat: equip增加tags字段 caoqianming 2024-01-19 11:37:57 +0800
318a39c948 fix: 成品检验 perform_create的bug caoqianming 2024-01-19 09:57:44 +0800
387bb66914 feat: 增加equip的name contains查询条件 caoqianming 2024-01-19 09:45:25 +0800
ec70aceb76 feat: count_sampling 默认为0 caoqianming 2024-01-18 15:14:48 +0800
78fd0c9721 feat: 日志撤回后修改任务状态 caoqianming 2024-01-18 10:55:41 +0800
a4d23f534a fix: mlog validate bug caoqianming 2024-01-18 10:27:38 +0800
67d8ede2a4 feat: 计算count_sampling caoqianming 2024-01-17 16:56:07 +0800
e5ba779b00 feat: 增加产品检验 caoqianming 2024-01-17 15:55:42 +0800