Commit Graph

455 Commits

Author SHA1 Message Date
caoqianming 1fd76611b6 fix: make_sflogs if start_time的bug 2024-12-29 00:34:32 +08:00
caoqianming afc910a805 fix: make_sflogs bug 2024-12-27 15:29:57 +08:00
zty cc8d9b1bf4 feat: enm/service 修改 service 2024-12-27 14:42:10 +08:00
zty c08dff56bf Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-18 14:16:14 +08:00
zty 0df2506f26 feat: 修改 enm/qua_data 排序问题 2024-12-18 14:16:11 +08:00
caoqianming 7d2d74ee80 feat: 日志操作时对有ticket的进行处理 2024-12-17 13:37:22 +08:00
caoqianming bdd644a527 fix: 日志撤销的同时将任务变更状态 2024-12-16 13:06:02 +08:00
zty cdc70177bb fix: sflog work_date 默认start_time.date 2024-12-13 17:32:56 +08:00
caoqianming 6ecf61706a feat: 优化cal_exp_duration_sec 2024-12-11 18:16:03 +08:00
caoqianming 41b27c0113 feat: sflog save 保存team leader 2024-12-11 13:03:29 +08:00
caoqianming 13639568b1 feat: 回退make_sflogs中start_time缺班bug 2024-12-11 12:58:55 +08:00
caoqianming 6815babe0f feat: get_team_x bug 2024-12-11 12:45:57 +08:00
zty 44af9bc494 feat : 修改排班规则 2024-12-11 12:18:09 +08:00
zty e0915676e3 feat: enm/view service 修改聚合和煤粉热值 缓存失效时间。 2024-12-09 09:46:51 +08:00
caoqianming 6da1b14e7b feat: stlog部分字段设置为非必填 2024-12-06 17:59:28 +08:00
caoqianming 152b0b5a3a feat: 忽略10s内的停机 2024-12-06 17:24:07 +08:00
caoqianming 17622f230e feat: 根据排班规则填入班组 2024-12-05 18:59:55 +08:00
zty 4c732894df feat: wpm 排班修改 2024-12-05 18:19:58 +08:00
zty 918df6b345 feat: 新增tkx 测点 聚合 2024-12-05 15:22:33 +08:00
caoqianming 5e9ebcdd36 feat: 产品规格还需在管料退火处处理 2024-12-04 13:04:19 +08:00
caoqianming 7ce9ed5a19 fix: get_alldata_with_batch hanle_user bug 2024-12-04 12:42:12 +08:00
caoqianming 784500bf5b feat: get_alldata_with_batch 其他入库也需要记录产品规格 2024-12-04 12:37:08 +08:00
caoqianming a69f718859 feat: mlog 支持handle_user 默认create_by 2024-12-04 12:22:52 +08:00
caoqianming 5533cc6967 fix: get_alldata_with_batch 加入检验备注统计 2024-12-04 11:18:23 +08:00
caoqianming ffd7bc13b0 feat: get_alldata_with_batch 加入检验备注统计 2024-12-04 11:00:49 +08:00
caoqianming bcbaba330d feat: batchst增加batch__startswith__in筛选条件 2024-12-04 10:16:41 +08:00
caoqianming b93c4bddeb feat: 触发批次分析统计 2024-12-03 18:07:23 +08:00
caoqianming 67be714355 fix: 完善get_alldata_with_batch -改_ 2024-12-03 11:41:23 +08:00
caoqianming 91bc99a135 fix: 完善get_alldata_with_batch4 2024-12-03 11:13:55 +08:00
caoqianming 4253b39cc6 fix: 完善get_alldata_with_batch3 2024-12-03 11:06:01 +08:00
caoqianming 7e44cda500 fix: 完善get_alldata_with_batch 2024-12-03 11:02:55 +08:00
caoqianming fb43bdde85 feat: 完善get_alldata_with_batch 2024-12-03 10:36:23 +08:00
zty c0169d25ac add : enm 增加峰谷平电量统计 2024-12-02 15:26:12 +08:00
caoqianming d9a1512a92 feat: 定义batchst默认排序为batch 2024-12-02 14:33:44 +08:00
caoqianming bc6baca698 fix: batchst last_time取用错误 2024-12-02 14:20:54 +08:00
caoqianming de6e5d315a feat: 记录batchst 最后操作时间 2024-12-02 14:13:17 +08:00
caoqianming 17697d6482 feat: 添加batchst路由 2024-12-02 13:39:43 +08:00
caoqianming c3bd32ee68 feat: property改为classmethod 2024-12-02 13:13:28 +08:00
caoqianming 8435b35be6 feat: get_alldata_with_batch 2024-12-02 12:27:26 +08:00
caoqianming ab52c033dc Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-28 17:06:58 +08:00
caoqianming 6396eff968 feat: fmlog 移除route字段 2024-11-28 17:06:42 +08:00
zty 4671ee9e7a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-28 14:28:26 +08:00
zty 4c38cee983 add: mtm/model serializer view 增加tkx 自动排班 2024-11-28 14:28:24 +08:00
caoqianming 31b1aae03c feat: generate_new_batch 追加锅号 2024-11-28 09:37:17 +08:00
caoqianming 08d6763db6 feat: 添加count_n_b 2024-11-28 09:27:15 +08:00
caoqianming 87c6b0cf9e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-28 09:12:22 +08:00
caoqianming bf524286c1 feat: 添加不合格项目 炸头 2024-11-28 09:12:08 +08:00
zty 9db524dfdb feat: em/filter apps 修改设备字段信息 2024-11-25 18:14:12 +08:00
zty 1010a6b86f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-25 17:45:10 +08:00
zty f0a748e304 feat:修改自动生成班组 2024-11-25 17:45:08 +08:00