Commit Graph

2690 Commits

Author SHA1 Message Date
caoqianming 1042deb817 feat: base 对登录失败次数过多做限制 2024-12-05 14:47:38 +08:00
zty 15d37604ea Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-04 16:08:47 +08:00
zty c4c50670fd feat: 修改 tkx 峰谷平 2024-12-04 16:08:43 +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
zty cbaf79084c fix: em回退到0021 2024-12-04 09:58:53 +08:00
zty ca08fb5c20 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-03 18:27:51 +08:00
zty 284dc01f69 add : enm/filter 增加峰谷平查询字段 2024-12-03 18:27:48 +08:00
caoqianming b2c28e1a88 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-03 18:07:35 +08:00
caoqianming b93c4bddeb feat: 触发批次分析统计 2024-12-03 18:07:23 +08:00
zty 6f3b418265 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-03 18:02:21 +08:00
zty 55b8564f0d feat:tkx 计量设备临期预警 2024-12-03 18:02:17 +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 a08e66a06a fix: task bug 修字段名 2024-12-02 15:36:36 +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 2f31997b43 feat: enm/task 修改报警事件 2024-11-28 16:13:00 +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 c0f796f4a0 fix: em/service 修改tkx 设备model 2024-11-26 17:54:59 +08:00
zty 42d8dced09 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-25 18:14:17 +08:00
zty 9db524dfdb feat: em/filter apps 修改设备字段信息 2024-11-25 18:14:12 +08:00
caoqianming 1311217668 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-25 17:52:17 +08:00
caoqianming f3d023432d feat: 支持合格b类 2024-11-25 17:52:04 +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
caoqianming 53322ed9ad feat: 兄弟件产出需要注意batch的修改 2024-11-24 17:22:03 +08:00
caoqianming 12d77e53b6 feat: mlog submit 添加一个注释 2024-11-24 17:03:39 +08:00
caoqianming a484c0021d fix: wm_in 找不到的错误 2024-11-24 16:07:11 +08:00
caoqianming d52bd4e064 feat: mlog 变化不再创建日志 2024-11-23 23:12:45 +08:00