factory

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

4739124cc8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-26 13:28:40 +0800
ba00580fec feat: myschedule createserializer 优化 caoqianming 2024-08-26 13:27:09 +0800
c5e180944d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-23 17:21:16 +0800
28834f88cd fix ：煤磨 zty 2024-08-23 17:20:57 +0800
6205ba682c feat: gascheck增加字段 caoqianming 2024-08-22 15:08:45 +0800
26172b767f feat: utask mtask 增加筛选条件 caoqianming 2024-08-22 12:45:53 +0800
4960ee7fac feat: 增加水泥包装 zty 2024-08-21 17:55:23 +0800
33a7e7320b fix: daoru_material 增加校验 caoqianming 2024-08-21 14:12:52 +0800
a48ee63679 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-21 09:27:40 +0800
4a277eb954 feat: base 可使用跳板机转发错误邮件 caoqianming 2024-08-21 09:27:37 +0800
5a35ea6028 feat: 增加出厂水泥和计算 zty 2024-08-21 08:59:24 +0800
bc38196f68 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-20 14:43:55 +0800
206e33d091 fix ：apps\enm filter zty 2024-08-20 14:43:53 +0800
1e667e69ac feat: daoru_material 增加校验 caoqianming 2024-08-20 14:39:38 +0800
561c2a0c31 feat: materialbatch也不进行物理删除 caoqianming 2024-08-20 14:25:01 +0800
592e34c07e refector: mgroup_on_change时创建stlog优化 caoqianming 2024-08-20 08:56:08 +0800
d102f01c26 feat: 增加check_opl_work_imgs caoqianming 2024-08-19 16:51:46 +0800
e2d652f9ef fix: get_area_from_point 获取cache bug caoqianming 2024-08-19 16:17:33 +0800
28958b405c fix: check_opl_audit_imgs bug caoqianming 2024-08-19 13:41:47 +0800
9ce56d3f34 feat: ftestwork增加关联仓库库存字段 caoqianming 2024-08-19 11:35:36 +0800
c00f59f8d9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-19 08:59:26 +0800
808a1c825d feat: check_opl_audit_imgs raise caoqianming 2024-08-19 08:59:24 +0800
c3b62f1831 fix: equip_elec_data 计算 zty 2024-08-16 18:45:31 +0800
62fb5aa54c feat: sflog teamchange cal_quastat_sflog zty 2024-08-16 18:45:11 +0800
7a780ebd0d fix: set coefficient zty 2024-08-16 18:44:50 +0800
cbce4998d9 feat: mpoint stat添加筛选条件 zty 2024-08-16 18:44:30 +0800
a09343322e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-16 18:44:02 +0800
4cdc48e549 fix: equip_elec_data 计算 zty 2024-08-16 18:44:00 +0800
c8db1ad29b feat: base handle_parent报错调整 caoqianming 2024-08-15 15:53:42 +0800
0aa0b051e9 fix: em ecate serializer 优化 caoqianming 2024-08-15 15:53:17 +0800
c71624def0 fix: em serializer 优化 caoqianming 2024-08-15 11:36:38 +0800
3976e3834e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-15 11:17:51 +0800
cb46d9bfc6 fix: ecate code 必填校验 caoqianming 2024-08-15 11:17:48 +0800
71dd916dbf Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-15 10:47:47 +0800
13fb91e83a fix：enm/service 修改稿last_val zty 2024-08-15 10:47:43 +0800
7028fd31ee feat: wmaterial增加state字段并进行相应处理2 caoqianming 2024-08-15 10:43:45 +0800
ba6c30a745 feat: wmaterial增加state字段并进行相应处理 caoqianming 2024-08-15 10:41:36 +0800
824dacf78d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-15 09:47:06 +0800
bcafe94e71 fix: base validate_password支持.号 caoqianming 2024-08-15 09:47:04 +0800
f52b501aa1 feat : enm/service 增加测点采集系数 zty 2024-08-15 09:19:19 +0800
29ba9647b4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-14 18:33:05 +0800
6a20445ddd fix : em/service 修改update_time zty 2024-08-14 18:33:01 +0800
42769e3abe fix: mioitempurin bug caoqianming 2024-08-14 18:17:31 +0800
db792a2de5 feat: ftestwork增加检验人及不合格项 caoqianming 2024-08-14 18:07:12 +0800
a9acf6d187 feat: 物料导入模板增加编号列 caoqianming 2024-08-14 17:42:27 +0800
27c60ff973 feat: mio pur test 支持count_sampling自填 caoqianming 2024-08-13 17:28:39 +0800
3bb3834c04 fix: miolist pu_order_number caoqianming 2024-08-13 17:11:22 +0800
cc5dcc9685 fix: gen_material_out bug caoqianming 2024-08-13 16:29:59 +0800
58ddc8dd0b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-13 15:06:10 +0800
ad1d0680b1 feat: mlogbupdate 校验 caoqianming 2024-08-13 15:06:07 +0800
779bd763a1 fix : em/service 修改运行设备更新状态根据最后一次时间修改 zty 2024-08-13 15:00:09 +0800
bbac19c791 feat: notok option 其他 caoqianming 2024-08-13 14:47:26 +0800
bfad89bf2f feat: ftestwork_submit增加抽检逻辑 caoqianming 2024-08-13 14:31:38 +0800
23dd745192 feat: ftestwork增加查询条件 caoqianming 2024-08-13 13:59:58 +0800
0a0b6b72ba feat: ftestworkcreate type2处理 caoqianming 2024-08-13 13:42:00 +0800
8e7e60c600 fix: ftestwork_submit bug2 caoqianming 2024-08-12 17:36:12 +0800
e6e4a61289 fix: ftestwork_submit bug caoqianming 2024-08-12 17:31:19 +0800
096ad540d4 feat: qm batch增加长度 caoqianming 2024-08-12 17:21:17 +0800
f6f84533d1 fix: notokoption 修改3 caoqianming 2024-08-12 17:18:09 +0800
38f052c015 fix: notokoption 修改2 caoqianming 2024-08-12 17:15:23 +0800
cfbd79a206 fix: notokoption 修改 caoqianming 2024-08-12 17:12:22 +0800
274a0df0eb feat: 检验工作增加查询条件 caoqianming 2024-08-12 16:57:22 +0800
b9dc211df3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-12 16:46:14 +0800
5fc38eabaa fix: notokoption values caoqianming 2024-08-12 16:46:12 +0800
7664dfefa4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-12 16:04:57 +0800
47acf9ceb4 fix: enm/service 修改service zty 2024-08-12 16:04:55 +0800
ba2368f59b feat: handover增加筛选条件 caoqianming 2024-08-12 15:05:47 +0800
c5dfb325dc feat: handover 增加查询条件 caoqianming 2024-08-12 14:39:44 +0800
2108b1c33a feat: wmaterial增加查询条件 caoqianming 2024-08-12 14:35:33 +0800
50c3efe39b feat: ftestwork提交并更新车间库存 caoqianming 2024-08-12 12:58:27 +0800
5821b6b7df Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-12 11:07:31 +0800
562372b0b9 feat: mlog添加不合格项目 caoqianming 2024-08-12 11:07:29 +0800
345588b611 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-12 10:32:39 +0800
a6d5604acb fix: em.service.py 更改状态变动 zty 2024-08-12 10:32:34 +0800
ae1099cbec fix: base wf 工段的字段获取处理人时没找到返回0 caoqianming 2024-08-09 15:19:21 +0800
1a42cf34f0 feat: wmaterial增加count_xtest/handover增加检验交接 caoqianming 2024-08-09 15:09:26 +0800
a2b52e95a5 doc: drain view swagger 变动3 caoqianming 2024-08-08 15:07:05 +0800
fff6c76cc6 doc: drain view swagger 变动2 caoqianming 2024-08-08 15:03:15 +0800
758d403f5d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-08 14:55:28 +0800
f1aa402383 doc: drain view swagger 变动 caoqianming 2024-08-08 14:55:26 +0800
169a31da5a fix : apps/em /enm 更改缓存存储 zty 2024-08-08 14:52:36 +0800
e2c44f06c4 feat: drain serializer增加返回序列化 caoqianming 2024-08-08 14:45:40 +0800
3f32390fb2 feat: 自动生成物料时延续cate caoqianming 2024-08-08 09:12:46 +0800
1781dba630 feat: 更改testitem field type caoqianming 2024-08-07 15:43:28 +0800
c64387e5bc Merge branch 'erp1' caoqianming 2024-08-07 15:26:49 +0800
1418141a67 feat: ftestwork返回material_cate caoqianming 2024-08-07 15:25:48 +0800
fe61081ec7 feat: ftestworkcreateupdate 支持更改 caoqianming 2024-08-07 11:07:48 +0800
9136f7e87f feat: 增加material cate 接口 caoqianming 2024-08-07 10:54:00 +0800
ab9b1b7f27 feat: 增加testitem筛选条件 caoqianming 2024-08-07 10:18:11 +0800
239f01a4ca feat: qm添加字段2 caoqianming 2024-08-07 10:01:22 +0800
b8dceb03a3 feat: qm添加字段 caoqianming 2024-08-07 09:46:17 +0800
15043bbb49 feat: ftestworkcreateupdate 支持更改 caoqianming 2024-08-07 11:07:48 +0800
211fd1ac77 feat: 增加material cate 接口 caoqianming 2024-08-07 10:54:00 +0800
cf7007f8b8 feat: 增加testitem筛选条件 caoqianming 2024-08-07 10:18:11 +0800
be8fbec24e feat: edu添加字段 caoqianming 2024-08-07 10:01:41 +0800
632c36edd0 feat: qm添加字段2 caoqianming 2024-08-07 10:01:22 +0800
8aabf1fca0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-07 09:46:20 +0800
549ef24c70 feat: qm添加字段 caoqianming 2024-08-07 09:46:17 +0800
6bdc5a04aa fix :enm service.py 修改缓存不存在直接返回 zty 2024-08-07 09:30:56 +0800
314b614c53 fix: cal_exp_duration_sec 还需要更新时间为None3 zty 2024-08-06 19:00:38 +0800