 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 |
|
caoqianming
|
1f8bdd0461
|
feat: 增加wpm 数据分析
|
2024-09-09 10:48:53 +08:00 |
|
caoqianming
|
01cff014ff
|
feat: 增加wpm datax
|
2024-09-08 14:33:09 +08:00 |
|
caoqianming
|
c07d0666c0
|
fix: handoverb返回更多信息
|
2024-09-06 11:30:43 +08:00 |
|
caoqianming
|
4e5d16f7f6
|
feat: handoverb返回更多信息
|
2024-09-06 11:26:31 +08:00 |
|
caoqianming
|
aab98fba62
|
fix: mlog update 错误
|
2024-09-06 11:16:23 +08:00 |
|
caoqianming
|
7510b2fc31
|
feat: 报废提交不需要限制接收人
|
2024-09-06 10:11:44 +08:00 |
|
caoqianming
|
b6b72b2826
|
fix: handover submit need_add
|
2024-09-06 10:01:47 +08:00 |
|
caoqianming
|
ee89b0bded
|
feat: handover 报废处理
|
2024-09-06 09:31:00 +08:00 |
|
caoqianming
|
fbaf4b5767
|
feat: mlog 12 支持update
|
2024-09-05 19:08:51 +08:00 |
|
caoqianming
|
ba8bc4fb72
|
fix: handover_submit
|
2024-09-05 17:50:04 +08:00 |
|
caoqianming
|
789ffe53d3
|
fix: handoverb支持编辑
|
2024-09-05 17:02:06 +08:00 |
|
caoqianming
|
ee7b7a526c
|
fix: handoverb 校验
|
2024-09-05 16:38:39 +08:00 |
|
caoqianming
|
38ba04cc80
|
fix: handoverserializer mgroup 处理
|
2024-09-05 15:52:22 +08:00 |
|
caoqianming
|
2ce99bc842
|
fix: handoverbserializer handoverb
|
2024-09-05 15:41:24 +08:00 |
|
caoqianming
|
e51960d5ba
|
fix: handover_submit bug
|
2024-09-05 15:17:58 +08:00 |
|
caoqianming
|
4b44b40c77
|
fix: handoverb validate错误
|
2024-09-05 15:13:50 +08:00 |
|
caoqianming
|
beb6b79709
|
fix: mlog view select related
|
2024-09-05 15:00:40 +08:00 |
|
caoqianming
|
ec441d770b
|
feat: handover create 对handoverb进行处理
|
2024-09-05 14:56:55 +08:00 |
|
caoqianming
|
51a649c864
|
feat: mlog返回routepack_name2
|
2024-09-05 14:17:54 +08:00 |
|
caoqianming
|
1243a50463
|
feat: mlog返回routepack_name
|
2024-09-05 14:17:21 +08:00 |
|
caoqianming
|
97dae72617
|
feat: 增加mloginit的可用字段
|
2024-09-05 13:57:46 +08:00 |
|
caoqianming
|
a1871a3763
|
feat: mloginit 可填end_time及test_user_name 返回
|
2024-09-05 13:14:12 +08:00 |
|
caoqianming
|
0baec25a8b
|
feat: handover count可不填写
|
2024-09-05 12:50:51 +08:00 |
|
caoqianming
|
e2f4cd1612
|
feat: handover_submit优化
|
2024-09-05 12:44:40 +08:00 |
|
caoqianming
|
e5ac627834
|
feat: wmaterial filter_queryset默认返回非报废品
|
2024-09-05 12:29:36 +08:00 |
|
caoqianming
|
308fa4c7ad
|
feat: 报废交接时固定recive
|
2024-09-05 11:37:40 +08:00 |
|
caoqianming
|
2b9ec6d01c
|
feat: 增加handoverb
|
2024-09-05 10:58:09 +08:00 |
|
caoqianming
|
d6e3657298
|
fix: count_pn_jgqbl的扣减bug
|
2024-09-05 10:50:32 +08:00 |
|
caoqianming
|
0de377ddc4
|
feat: 去除 handle_date的日期校验
|
2024-09-05 09:35:54 +08:00 |
|
caoqianming
|
00853f395d
|
feat: handle_date 根据work_time自动处理
|
2024-09-05 09:29:49 +08:00 |
|
caoqianming
|
982247ee70
|
feat: count_n_jgqbl 改为count_pn_jgqbl
|
2024-09-05 09:11:48 +08:00 |
|
caoqianming
|
eb5a8df7e0
|
feat: mlog create 时校验
|
2024-09-04 18:21:32 +08:00 |
|
caoqianming
|
8c56523285
|
feat: mlog 增加fmlog筛选条件
|
2024-09-04 17:01:08 +08:00 |
|
caoqianming
|
22052d1d82
|
fix: fmlog validate 未返回attrs
|
2024-09-04 16:21:00 +08:00 |
|
caoqianming
|
c2649ec963
|
feat: mtask增加mtaskb的返回并在日志填写时校验
|
2024-09-04 16:13:50 +08:00 |
|
caoqianming
|
463390691a
|
feat: wpm 添加mtaskb等字段
|
2024-09-04 15:53:04 +08:00 |
|
caoqianming
|
bae2b7b8f5
|
feat: mlogb 校验
|
2024-09-04 15:50:07 +08:00 |
|
caoqianming
|
6e7e6c584e
|
feat: 一二级日志录入
|
2024-09-04 15:25:14 +08:00 |
|
caoqianming
|
233591728a
|
feat: fmlog创建时校验
|
2024-09-04 09:13:26 +08:00 |
|
caoqianming
|
170f3db824
|
feat: 添加fmlog
|
2024-09-04 09:04:37 +08:00 |
|
caoqianming
|
044819815e
|
fix: cal_mlog_count_from_mlogb 统计bug
|
2024-09-03 17:57:23 +08:00 |
|
caoqianming
|
bb311999e8
|
feat: mlogb 添加字段以记录分层检验信息
|
2024-09-03 14:16:18 +08:00 |
|
caoqianming
|
0148efba62
|
feat: process添加中间状态
|
2024-09-03 10:58:33 +08:00 |
|
caoqianming
|
31f8f002aa
|
feat: mlog 增加ticket查询条件
|
2024-09-03 10:25:59 +08:00 |
|
caoqianming
|
6a573dd4dd
|
feat: mlog经审批后提交
|
2024-09-03 09:10:28 +08:00 |
|
caoqianming
|
b3e527e5a6
|
fix: count_n_jgqbl 字符错误
|
2024-09-02 16:58:16 +08:00 |
|
caoqianming
|
65c1c8aa40
|
fix: mlogb update serializer
|
2024-09-02 15:51:34 +08:00 |
|
caoqianming
|
40b012b962
|
feat: 加工前不良的日志提交和撤回
|
2024-09-02 15:27:38 +08:00 |
|
caoqianming
|
91add9ec1d
|
feat: 增加加工前不良的不合格项
|
2024-09-02 14:17:52 +08:00 |
|
caoqianming
|
78dc923305
|
fix: 日志提交的校验
|
2024-08-30 13:31:37 +08:00 |
|
caoqianming
|
5289e71280
|
feat: wmaterial添加外协字段及相关调整
|
2024-08-30 09:21:29 +08:00 |