 zty
|
4a3934b4fd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-09 13:36:58 +08:00 |
|
zty
|
07c996964d
|
feat: wpm/sflog 增加 enstat 数据
|
2025-01-09 13:36:54 +08:00 |
 caoqianming
|
ef4a31c3a5
|
fix：MlogbwCreateUpdateSerializer bug2
|
2025-01-09 11:25:52 +08:00 |
|
caoqianming
|
d33678a603
|
fix：MlogbwCreateUpdateSerializer bug
|
2025-01-09 11:15:15 +08:00 |
|
caoqianming
|
6fbe0a7b1c
|
fix: mlogbw删除的bug
|
2025-01-09 10:51:04 +08:00 |
|
caoqianming
|
3c6aa3ea18
|
feat: 去除mlogbdefects2
|
2025-01-09 10:12:01 +08:00 |
|
caoqianming
|
860e2157b1
|
feat: 去除mlogbdefects2
|
2025-01-09 10:09:48 +08:00 |
|
caoqianming
|
3751b2f2e2
|
feat: 去除mlogbdefect
|
2025-01-09 10:07:51 +08:00 |
|
caoqianming
|
f209d1767d
|
feat: mlogbin也需要找寻质检表
|
2025-01-09 09:37:57 +08:00 |
|
caoqianming
|
bc44d0335a
|
feat: mlogbin删除时需要删除子集ftest记录2
|
2025-01-09 09:03:32 +08:00 |
|
caoqianming
|
b20dee64df
|
feat: mlogbin删除时需要删除子集ftest记录
|
2025-01-09 08:58:24 +08:00 |
|
caoqianming
|
51123ee0c5
|
feat: mlogbw增加质检保存bug
|
2025-01-09 08:43:32 +08:00 |
|
caoqianming
|
a20b15abed
|
feat: mlogbw增加质检统计3
|
2025-01-08 16:43:47 +08:00 |
|
caoqianming
|
396fcdd7cc
|
feat: mlogbw增加质检统计2
|
2025-01-08 16:34:13 +08:00 |
|
caoqianming
|
5f88433a25
|
feat: mlogbw增加质检统计
|
2025-01-08 16:21:18 +08:00 |
|
caoqianming
|
2331bec13b
|
feat: 增加MlogbDefect以进行统计
|
2025-01-08 15:02:41 +08:00 |
|
caoqianming
|
8eddeb4f70
|
fix: mlogb质检
|
2025-01-08 10:29:12 +08:00 |
|
caoqianming
|
95b98df8cf
|
fix: mlogb找寻质检表
|
2025-01-07 15:41:04 +08:00 |
|
caoqianming
|
7c9feb23ac
|
feat: mlogb添加qct字段以便调用检验表
|
2025-01-07 15:29:19 +08:00 |
|
caoqianming
|
98f4af2f8c
|
fix: 如果是主要输入物料且是主批次，才需生成输出3
|
2025-01-07 14:38:34 +08:00 |
|
caoqianming
|
abd6ca53f1
|
feat: Mlogb返回增加树型结构
|
2025-01-07 14:31:10 +08:00 |
|
caoqianming
|
e333b84c1b
|
feat: Mlogb添加parent字段
|
2025-01-07 14:24:00 +08:00 |
|
caoqianming
|
d3a304b918
|
feat: Mlogb的排序
|
2025-01-07 14:08:32 +08:00 |
|
caoqianming
|
011df65e4c
|
fix: 如果是主要输入物料且是主批次，才需生成输出
|
2025-01-07 14:07:25 +08:00 |
|
caoqianming
|
c8594aaa99
|
feat: wm添加route查询条件
|
2025-01-07 13:52:31 +08:00 |
|
caoqianming
|
ccac1aea87
|
feat: 如果是主要输入物料且是主批次，才需生成输出2
|
2025-01-07 13:23:55 +08:00 |
|
caoqianming
|
0e428f6c9d
|
feat: 如果是主要输入物料且是主批次，才需生成输出
|
2025-01-07 11:10:07 +08:00 |
|
caoqianming
|
9f56968385
|
fix: change_or_new该物料编号已存在不可使用
|
2025-01-06 16:12:33 +08:00 |
|
caoqianming
|
561fb94930
|
fix: MlogbwCreateUpdateSerializer validate bug
|
2025-01-06 14:56:17 +08:00 |
|
caoqianming
|
afb3b23486
|
feat: mlogbin自动创建mlogbout数量2
|
2025-01-06 14:09:10 +08:00 |
|
caoqianming
|
b454972943
|
feat: mlogbin自动创建mlogbout数量
|
2025-01-06 13:46:23 +08:00 |
|
caoqianming
|
49d1b95968
|
feat: handoverbw的处理2
|
2025-01-06 11:34:03 +08:00 |
|
caoqianming
|
26c7652095
|
feat: handoverbw的处理
|
2025-01-06 11:02:08 +08:00 |
|
caoqianming
|
fc56ecea08
|
fix: mlogbin创建mlogbw的错误2
|
2025-01-06 10:40:33 +08:00 |
|
caoqianming
|
84723967dc
|
fix: mlogbin创建mlogbw的错误
|
2025-01-06 10:33:33 +08:00 |
|
caoqianming
|
d784ac8a3c
|
feat: 生产日志追踪到个完善
|
2025-01-06 10:23:51 +08:00 |
|
caoqianming
|
437501b668
|
feat: mioitemw等增加wpr字段
|
2025-01-03 16:53:42 +08:00 |
|
caoqianming
|
8d0d5ebcd0
|
fix: 主要是wpmw change_or_new的修正
|
2025-01-03 14:37:57 +08:00 |
|
caoqianming
|
cd6e78961b
|
fix: def cal_mlogb_count bug
|
2025-01-02 17:14:56 +08:00 |
|
caoqianming
|
70e344ed68
|
feat: mlogrever支持单件回退
|
2025-01-02 16:29:09 +08:00 |
|
caoqianming
|
426be9d805
|
feat: 添加mlogbw接口
|
2025-01-02 15:36:55 +08:00 |
|
caoqianming
|
ba41228d69
|
fix: 生产提交支持单个物料
|
2025-01-02 14:01:09 +08:00 |
|
caoqianming
|
def67ebac5
|
fix: base 添加wpmw并支持出入库提交
|
2025-01-02 10:32:36 +08:00 |
|
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 |
|
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
|
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
|
05af336180
|
fix: mlog create 时的bug
|
2024-11-21 17:03:34 +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
|
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
|
af72749b8a
|
fix: mlog select_related_fields bug
|
2024-11-18 17:27:41 +08:00 |
|
caoqianming
|
71db15bacd
|
feat: 添加cms模块创建article表
|
2024-11-18 10:42:33 +08:00 |
|
caoqianming
|
4518344fa6
|
fix: do_out 领料时的material_ofrom
|
2024-11-14 13:04:40 +08:00 |
|
caoqianming
|
95739bc3bb
|
feat: wmaterial增加查询条件
|
2024-11-14 12:12:14 +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
|
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
|
4016c421be
|
feat: MaterialBatch 添加字段以支持追踪原料批次
|
2024-11-13 17:22:25 +08:00 |
|
caoqianming
|
7d9582fe34
|
feat: mlogb添加字段以追踪原料批次
|
2024-11-13 15:56:40 +08:00 |
|
caoqianming
|
6698e38d32
|
feat: wmaterial增加字段
|
2024-11-12 14:51:53 +08:00 |
|
caoqianming
|
0d66ae5e90
|
feat: generate_new_batch 中添加-变为>
|
2024-11-12 14:13:06 +08:00 |
|
caoqianming
|
a6fadedee2
|
fix: handle_date使用localdate获取日期
|
2024-11-11 17:00:33 +08:00 |
|
caoqianming
|
6eec199488
|
feat: mlog create时校验mtask是否是下达状态
|
2024-11-07 09:40:32 +08:00 |
|
caoqianming
|
bce4a44408
|
feat: wmaterial可按mtask进行查询过滤
|
2024-11-05 17:43:34 +08:00 |
|
caoqianming
|
3d7a9fb481
|
feat: labelmat 返回state_name
|
2024-10-14 13:20:36 +08:00 |
|
zty
|
780564f6e1
|
feat: 煤粉热值处理2
|
2024-09-30 16:22:30 +08:00 |
|
zty
|
cc5b521f5d
|
feat: 煤粉热值校正
|
2024-09-30 16:21:44 +08:00 |
|
zty
|
008219e9ba
|
fix : em enm wpm 修改更新设备运行状态
|
2024-09-25 16:03:59 +08:00 |
|
caoqianming
|
305fda44c2
|
feat: wmaterialserializer 增加count_cando返回
|
2024-09-18 09:34:55 +08:00 |
|
zty
|
7aae49b378
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-13 13:41:29 +08:00 |
|
zty
|
c4607e1608
|
fix /enm/service.py 停机时间短 无班组 加入异常原因
|
2024-09-13 13:40:45 +08:00 |
|
caoqianming
|
f51bb48428
|
feat: handover serializer 优化
|
2024-09-13 12:53:55 +08:00 |
|
caoqianming
|
bc6406f12b
|
fix: ana equip_last_mlog
|
2024-09-12 17:23:40 +08:00 |
|
caoqianming
|
28e5b83896
|
fix: wmaterial 返回count_working3
|
2024-09-12 11:31:08 +08:00 |
|
caoqianming
|
2d79796ccb
|
fix: wmaterial 返回count_working2
|
2024-09-12 11:29:43 +08:00 |
|
caoqianming
|
8f0e512654
|
fix: wmaterial 返回count_working
|
2024-09-12 11:26:39 +08:00 |
|
caoqianming
|
de42dfc75f
|
fix: wmaterial 返回count_working
|
2024-09-12 11:24:56 +08:00 |
|
caoqianming
|
7a8bee5e59
|
feat: wmaterial增加count_working proptey
|
2024-09-12 11:19:00 +08:00 |
|
caoqianming
|
1caba24321
|
feat: ftestwork belong_dept默认test_user 所在部门
|
2024-09-11 16:20:34 +08:00 |
|
caoqianming
|
ca2103db8e
|
fix: handover增加dept查询条件
|
2024-09-10 17:38:35 +08:00 |
|
caoqianming
|
082619070e
|
feat: handover增加dept查询条件
|
2024-09-10 17:06:56 +08:00 |
|
caoqianming
|
18fe346661
|
fix: tran_time_to_mstate
|
2024-09-10 15:12:14 +08:00 |
|
caoqianming
|
f3c31a5b39
|
feat: 投产分析接口
|
2024-09-10 08:50:30 +08:00 |
|
caoqianming
|
1490a35a32
|
feat: 投产分析
|
2024-09-09 16:44:25 +08:00 |
|
caoqianming
|
9a26529e0a
|
feat: 完善equip_last_mlog5
|
2024-09-09 15:03:38 +08:00 |
|
caoqianming
|
1b6e947492
|
feat: 完善equip_last_mlog4
|
2024-09-09 14:01:57 +08:00 |
|
caoqianming
|
4d5195308f
|
feat: 完善equip_last_mlog3
|
2024-09-09 13:52:51 +08:00 |
|
caoqianming
|
9ffe025ef7
|
feat: 完善equip_last_mlog2
|
2024-09-09 13:49:35 +08:00 |
|
caoqianming
|
768f7a9a22
|
feat: 完善equip_last_mlog
|
2024-09-09 13:33:48 +08:00 |
|
caoqianming
|
d940c82e34
|
fix: tran_time_to_mstate
|
2024-09-09 13:21:42 +08:00 |