 caoqianming
|
15de6e3a5e
|
feat: srule list 返回rule_display
|
2024-12-05 18:13:11 +08:00 |
 zty
|
22abc35d4b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-12-05 15:22:35 +08:00 |
|
zty
|
918df6b345
|
feat: 新增tkx 测点 聚合
|
2024-12-05 15:22:33 +08:00 |
|
caoqianming
|
62fae4ceac
|
feat: mpoint增加筛选条件
|
2024-12-05 15:09:27 +08:00 |
|
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 |
|
caoqianming
|
84f7de61bc
|
fix: mlog update 没有消耗时的校验
|
2024-11-23 23:06:01 +08:00 |
|
caoqianming
|
cb36aac9ca
|
feat: 去除handover send强校验
|
2024-11-23 22:32:55 +08:00 |
|
caoqianming
|
89d9a987f4
|
fix: mtask_submit 不会触发utask_submit
|
2024-11-23 22:24:38 +08:00 |
|
caoqianming
|
580109aa9f
|
fix: mlog 填写方式及handoverb的问题
|
2024-11-22 18:35:12 +08:00 |
|
caoqianming
|
5d6ce9f6c0
|
feat: mlog_submit mlog_revert bug
|
2024-11-22 09:07:03 +08:00 |
|
caoqianming
|
2c569db0d8
|
fix: do_in wm_production_dept
|
2024-11-21 17:23:35 +08:00 |
|
caoqianming
|
8c63aea877
|
fix: validate data pop None
|
2024-11-21 17:04:36 +08:00 |
|
caoqianming
|
05af336180
|
fix: mlog create 时的bug
|
2024-11-21 17:03:34 +08:00 |
|
caoqianming
|
72b04ddc7a
|
feat: 单工序多工段情况下平均分配
|
2024-11-21 15:20:27 +08:00 |
|
caoqianming
|
32158dfa77
|
feat: WMaterialFilter mtaskx根据batch_bind进行校验
|
2024-11-21 13:34:15 +08:00 |
|
caoqianming
|
1bfafdb0e4
|
feat: handover添加备注字段
|
2024-11-21 13:21:53 +08:00 |
|
caoqianming
|
93cabf0ebc
|
feat: mlogb增加查询条件以支持查询返工记录
|
2024-11-21 11:25:31 +08:00 |
|
caoqianming
|
9014a7c869
|
feat: ftestwork添加设备和备注字段
|
2024-11-21 10:45:31 +08:00 |
|
caoqianming
|
3dfcbd8a8b
|
feat: speaker 接口忽略采集器5
|
2024-11-20 16:42:19 +08:00 |
|
caoqianming
|
258d4975f8
|
feat: speaker 接口忽略采集器4
|
2024-11-20 16:38:44 +08:00 |
|
caoqianming
|
5c2aac22e1
|
feat: speaker 接口忽略采集器3
|
2024-11-20 16:38:14 +08:00 |
|
caoqianming
|
72604f9992
|
feat: speaker 接口忽略采集器2
|
2024-11-20 16:28:11 +08:00 |
|
caoqianming
|
ae15f1a33c
|
feat: speaker 接口忽略采集器
|
2024-11-20 16:24:04 +08:00 |
|
caoqianming
|
8667267046
|
feat: equipment 列表支持is_deleted查询
|
2024-11-20 13:18:42 +08:00 |
|
caoqianming
|
16272cd15f
|
feat: save_voice_and_speak 添加日志
|
2024-11-20 09:56:00 +08:00 |
|
caoqianming
|
598cadc4bb
|
feat: 添加事件喇叭播放测试api
|
2024-11-20 09:49:42 +08:00 |
|
caoqianming
|
a11ce128be
|
feat: 喇叭播放的日志
|
2024-11-20 09:45:53 +08:00 |
|
caoqianming
|
5730a00742
|
feat: ftest更新ftestwork的count_sampling等字段
|
2024-11-19 17:52:57 +08:00 |
|
caoqianming
|
1cb64b26af
|
feat: mlog list 接口一点优化
|
2024-11-19 09:25:36 +08:00 |
|
caoqianming
|
7c85d3df65
|
fix: mlog select_related_fields bug2
|
2024-11-18 17:38:11 +08:00 |
|
caoqianming
|
a0423cbd3f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-11-18 17:28:03 +08:00 |
|
caoqianming
|
af72749b8a
|
fix: mlog select_related_fields bug
|
2024-11-18 17:27:41 +08:00 |
|
zty
|
13751b8a76
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-11-18 13:51:09 +08:00 |
|
zty
|
3fff294189
|
fix : enm 修改 单位产品综合能耗
|
2024-11-18 13:51:04 +08:00 |
|
caoqianming
|
e67bd892ae
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-11-18 10:42:44 +08:00 |
|
caoqianming
|
71db15bacd
|
feat: 添加cms模块创建article表
|
2024-11-18 10:42:33 +08:00 |
|
zty
|
c2cae12c4f
|
fix:enm/service 修改小数点
|
2024-11-18 09:34:27 +08:00 |
|
zty
|
9d5d7eceaf
|
fix : tkx enm bug fix
|
2024-11-14 17:48:48 +08:00 |
|
caoqianming
|
4518344fa6
|
fix: do_out 领料时的material_ofrom
|
2024-11-14 13:04:40 +08:00 |
|
caoqianming
|
6ef01ee301
|
fix: 其他出入库错误
|
2024-11-14 12:26:40 +08:00 |
|
caoqianming
|
95739bc3bb
|
feat: wmaterial增加查询条件
|
2024-11-14 12:12:14 +08:00 |
|
caoqianming
|
6006d42f9d
|
fix: do_in bug
|
2024-11-14 11:54:55 +08:00 |
|
caoqianming
|
a00f533752
|
fix: mlog submit 关于wm.batch_ofrom的bug
|
2024-11-14 11:39:17 +08:00 |
|
caoqianming
|
9fb09f7c2a
|
fix: mlog submit 关于count_n的bug
|
2024-11-14 11:24:13 +08:00 |
|
caoqianming
|
fdb06c6883
|
fix: 非合格/返修品不可使用 报错
|
2024-11-14 11:17:11 +08:00 |
|
caoqianming
|
384bef705c
|
fix: MaterialBatch 添加字段以支持追踪原料批次6
|
2024-11-14 11:02:05 +08:00 |
|
caoqianming
|
e92ceca953
|
feat: MaterialBatch 添加字段以支持追踪原料批次5
|
2024-11-14 10:52:21 +08:00 |
|
caoqianming
|
b5928b2927
|
feat: MaterialBatch 添加字段以支持追踪原料批次4
|
2024-11-14 10:40:14 +08:00 |
|
caoqianming
|
b9d9cf42cb
|
feat: mlog serializer添加batch_ofrom等
|
2024-11-14 08:47:31 +08:00 |
|
caoqianming
|
90e699155c
|
feat: MaterialBatch 添加字段以支持追踪原料批次3
|
2024-11-13 18:16:02 +08:00 |
|
caoqianming
|
27c646e6df
|
feat: MaterialBatch 添加字段以支持追踪原料批次2
|
2024-11-13 17:23:41 +08:00 |