 zty
|
cc5b521f5d
|
feat: 煤粉热值校正
|
2024-09-30 16:21:44 +08:00 |
|
zty
|
9c6e8f5992
|
fix: 电表水表0值处理
|
2024-09-30 16:21:18 +08:00 |
|
zty
|
956500d3aa
|
fix :enm/serializer round
|
2024-09-26 15:56:18 +08:00 |
|
zty
|
9a3e15f926
|
feat: 优化mgroup_run_change
|
2024-09-26 11:51:36 +08:00 |
|
zty
|
9f90d84244
|
fix: em/bug
|
2024-09-26 11:02:59 +08:00 |
|
zty
|
7517da3e92
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-25 16:04:03 +08:00 |
|
zty
|
008219e9ba
|
fix : em enm wpm 修改更新设备运行状态
|
2024-09-25 16:03:59 +08:00 |
 caoqianming
|
c0cb51a5b5
|
feat: utask生产任务提交
|
2024-09-25 13:24:48 +08:00 |
|
caoqianming
|
73aa186293
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-24 10:24:53 +08:00 |
|
caoqianming
|
49712b8211
|
feat: mio添加mgroup查询条件
|
2024-09-24 10:24:51 +08:00 |
|
zty
|
dd3c0d6f6b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-23 10:04:46 +08:00 |
|
zty
|
d5e48c1ab8
|
fix: enm、fim 修改费用过滤和能源加入班组开始结束时间
|
2024-09-23 10:04:43 +08:00 |
|
caoqianming
|
8273a96597
|
fix: FtestWork 检验数据设置为非负整数
|
2024-09-20 09:16:03 +08:00 |
|
caoqianming
|
5628a1ff83
|
feat: ftestwork增加校验
|
2024-09-19 15:08:54 +08:00 |
|
caoqianming
|
305fda44c2
|
feat: wmaterialserializer 增加count_cando返回
|
2024-09-18 09:34:55 +08:00 |
|
zty
|
6c6a6ce440
|
fix: mtm/service note
|
2024-09-13 15:21:26 +08:00 |
|
zty
|
0453499ee5
|
add: new migrations file
|
2024-09-13 15:08:42 +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
|
2753c78997
|
feat: bi查询报错后打日志
|
2024-09-12 15:23:38 +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
|
bc92e90765
|
feat: ftestwork 增加shift字段
|
2024-09-11 16:39:09 +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
|
bb270d7105
|
feat: inm mio相关增加inout_date校验
|
2024-09-08 14:32:49 +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
|
c2e2465439
|
feat: 优化mtask list
|
2024-09-05 13:09:11 +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
|
f4f44be101
|
feat: add_mtaskb 增加校验
|
2024-09-04 17:52:37 +08:00 |
|
caoqianming
|
668fff3f2d
|
fix: add_mtaskb用错序列化器了4
|
2024-09-04 17:40:57 +08:00 |
|
caoqianming
|
fc855d2830
|
fix: add_mtaskb用错序列化器了3
|
2024-09-04 17:31:51 +08:00 |
|
caoqianming
|
4c57c6e9ee
|
feat: mtaskb 删除校验
|
2024-09-04 17:19:30 +08:00 |
|
caoqianming
|
8c56523285
|
feat: mlog 增加fmlog筛选条件
|
2024-09-04 17:01:08 +08:00 |
|
caoqianming
|
ea83d57129
|
fix: add_mtaskb用错序列化器了2
|
2024-09-04 16:55:55 +08:00 |
|
caoqianming
|
afa55df750
|
fix: add_mtaskb用错序列化器了
|
2024-09-04 16:52:23 +08:00 |
|
caoqianming
|
e12a1042b9
|
feat: 优化add_mtaskb
|
2024-09-04 16:40:37 +08:00 |
|
caoqianming
|
09b3f17025
|
fix: add_mtaskb perm错误
|
2024-09-04 16:38:55 +08:00 |
|
caoqianming
|
7afa494803
|
feat: mtask增加mtaskb接口
|
2024-09-04 16:38:21 +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
|
6694820dcd
|
fix: mtaskb查询条件错误
|
2024-09-04 16:00:00 +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
|
e77f3159f5
|
feat: mtaskb增加筛选条件
|
2024-09-04 10:34:45 +08:00 |
|
caoqianming
|
9ca66782b9
|
fix: FtestWorkCreateUpdate 缺少count_sampling_ok
|
2024-09-04 10:22:38 +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
|
9fee0b52d5
|
feat: 增加mtaskb
|
2024-09-03 16:41:51 +08:00 |
|
caoqianming
|
bc9a098cc8
|
feat: mtask_submit 校验是否有日志
|
2024-09-03 14:51: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
|
89af31a383
|
feat: 增加check_test_when_do_out配置参数
|
2024-09-03 09:48:10 +08:00 |
|
caoqianming
|
6a573dd4dd
|
feat: mlog经审批后提交
|
2024-09-03 09:10:28 +08:00 |
|
caoqianming
|
2a8254b581
|
feat: process添加mlog_need_ticket字段
|
2024-09-02 17:04:59 +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
|
fc2195eba1
|
feat: ftestwork增加是否更新库存字段
|
2024-09-02 15:29:41 +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
|
cff14fa042
|
feat: ftestwork添加抽检合格数
|
2024-08-30 13:36:53 +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 |
|
caoqianming
|
b8994b94c1
|
feat: ftestwork增加filter
|
2024-08-29 15:43:12 +08:00 |
|
caoqianming
|
301535813b
|
feat: mlogbout 校验不合格字段
|
2024-08-29 15:13:08 +08:00 |
|
caoqianming
|
ab759a76c9
|
feat: mog submit时产出为0
|
2024-08-29 15:05:53 +08:00 |
|
caoqianming
|
54c7c65fe0
|
feat: 产出物为0时跳过revert
|
2024-08-29 14:52:30 +08:00 |
|
caoqianming
|
81a90f31cd
|
feat: 计算测点可不指定物料2
|
2024-08-29 13:47:16 +08:00 |
|
caoqianming
|
1855e3ae67
|
feat: bind_routepack 时校验产出是否一致
|
2024-08-29 10:51:44 +08:00 |
|
caoqianming
|
0f0bc9bd37
|
feat: 计算测点可不指定物料
|
2024-08-29 10:28:59 +08:00 |
|
caoqianming
|
e94996471f
|
feat: 优化enstat2
|
2024-08-29 09:28:39 +08:00 |
|
caoqianming
|
cf10f02829
|
fix: xscript change_data 变更
|
2024-08-28 17:14:49 +08:00 |
|
caoqianming
|
da3b0f62e5
|
feat: 增加change_data字段
|
2024-08-28 17:09:24 +08:00 |
|
caoqianming
|
4ac5d1f1f7
|
feat: xscript添加logger
|
2024-08-28 16:27:35 +08:00 |
|
caoqianming
|
43d0d90e41
|
fix: tag_update 先判断是否本地时间
|
2024-08-28 16:17:14 +08:00 |
|
caoqianming
|
730aa68966
|
feat: tag_update 先判断是否本地时间
|
2024-08-28 16:12:31 +08:00 |
|
caoqianming
|
038e7f86cd
|
feat: xscript相关调整
|
2024-08-28 14:11:42 +08:00 |
|
caoqianming
|
42cf64e9f7
|
feat: mlog 添加不合格项
|
2024-08-28 10:58:46 +08:00 |
|
caoqianming
|
4bfa8a5460
|
feat: insert_mplogx_from_xscript 修改
|
2024-08-27 18:42:18 +08:00 |
|
caoqianming
|
417dae76fd
|
fix: xscript update bug
|
2024-08-27 17:40:05 +08:00 |
|
caoqianming
|
2be34d3caa
|
feat: enm添加xscript
|
2024-08-27 17:28:30 +08:00 |
|
caoqianming
|
e6e80f5d52
|
feat: base 增加code分析工具类
|
2024-08-27 17:26:29 +08:00 |
|
caoqianming
|
8828625346
|
feat: base dbconnection支持pg
|
2024-08-27 17:26:05 +08:00 |
|
caoqianming
|
1b19c02754
|
feat: base ptaskresult 更多filter
|
2024-08-27 17:25:46 +08:00 |
|
caoqianming
|
b57fd16d5a
|
fix: base basemodel handle_parent 处理bug
|
2024-08-26 15:28:13 +08:00 |
|
caoqianming
|
ac6fd28aba
|
feat: 增加棕圈作为不合格项
|
2024-08-26 14:25:26 +08:00 |
|
caoqianming
|
cdd879c583
|
feat: 添加不合格品小崩边
|
2024-08-26 14:15:01 +08:00 |
|
caoqianming
|
d83b5ec0d2
|
feat: myschedule createserializer 优化2
|
2024-08-26 13:49:27 +08:00 |
|
caoqianming
|
4739124cc8
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-26 13:28:40 +08:00 |
|
caoqianming
|
ba00580fec
|
feat: myschedule createserializer 优化
|
2024-08-26 13:27:09 +08:00 |
|
zty
|
c5e180944d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-23 17:21:16 +08:00 |
|
zty
|
28834f88cd
|
fix ： 煤磨
|
2024-08-23 17:20:57 +08:00 |
|
caoqianming
|
6205ba682c
|
feat: gascheck增加字段
|
2024-08-22 15:08:45 +08:00 |
|
caoqianming
|
26172b767f
|
feat: utask mtask 增加筛选条件
|
2024-08-22 12:45:53 +08:00 |
|
zty
|
4960ee7fac
|
feat: 增加水泥包装
|
2024-08-21 17:55:23 +08:00 |
|
caoqianming
|
33a7e7320b
|
fix: daoru_material 增加校验
|
2024-08-21 14:12:52 +08:00 |
|
caoqianming
|
a48ee63679
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-21 09:27:40 +08:00 |
|
caoqianming
|
4a277eb954
|
feat: base 可使用跳板机转发错误邮件
|
2024-08-21 09:27:37 +08:00 |
|
zty
|
5a35ea6028
|
feat: 增加出厂水泥 和 计算
|
2024-08-21 08:59:24 +08:00 |
|
zty
|
bc38196f68
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-20 14:43:55 +08:00 |
|
zty
|
206e33d091
|
fix ：apps\enm filter
|
2024-08-20 14:43:53 +08:00 |
|
caoqianming
|
1e667e69ac
|
feat: daoru_material 增加校验
|
2024-08-20 14:39:38 +08:00 |
|
caoqianming
|
561c2a0c31
|
feat: materialbatch也不进行物理删除
|
2024-08-20 14:25:01 +08:00 |
|
caoqianming
|
592e34c07e
|
refector: mgroup_on_change时创建stlog优化
|
2024-08-20 08:56:08 +08:00 |
|
caoqianming
|
d102f01c26
|
feat: 增加check_opl_work_imgs
|
2024-08-19 16:51:46 +08:00 |
|
caoqianming
|
e2d652f9ef
|
fix: get_area_from_point 获取cache bug
|
2024-08-19 16:17:33 +08:00 |
|
caoqianming
|
28958b405c
|
fix: check_opl_audit_imgs bug
|
2024-08-19 13:41:47 +08:00 |
|
caoqianming
|
9ce56d3f34
|
feat: ftestwork增加关联仓库库存字段
|
2024-08-19 11:35:36 +08:00 |
|
caoqianming
|
c00f59f8d9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-19 08:59:26 +08:00 |
|
caoqianming
|
808a1c825d
|
feat: check_opl_audit_imgs raise
|
2024-08-19 08:59:24 +08:00 |
|
zty
|
c3b62f1831
|
fix: equip_elec_data 计算
|
2024-08-16 18:45:31 +08:00 |
|
zty
|
62fb5aa54c
|
feat: sflog teamchange cal_quastat_sflog
|
2024-08-16 18:45:11 +08:00 |
|
zty
|
7a780ebd0d
|
fix: set coefficient
|
2024-08-16 18:44:50 +08:00 |
|
zty
|
cbce4998d9
|
feat: mpoint stat添加筛选条件
|
2024-08-16 18:44:30 +08:00 |
|
zty
|
a09343322e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-16 18:44:02 +08:00 |
|
zty
|
4cdc48e549
|
fix: equip_elec_data 计算
|
2024-08-16 18:44:00 +08:00 |
|
caoqianming
|
c8db1ad29b
|
feat: base handle_parent报错调整
|
2024-08-15 15:53:42 +08:00 |
|
caoqianming
|
0aa0b051e9
|
fix: em ecate serializer 优化
|
2024-08-15 15:53:17 +08:00 |
|
caoqianming
|
c71624def0
|
fix: em serializer 优化
|
2024-08-15 11:36:38 +08:00 |
|
caoqianming
|
3976e3834e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-15 11:17:51 +08:00 |
|
caoqianming
|
cb46d9bfc6
|
fix: ecate code 必填校验
|
2024-08-15 11:17:48 +08:00 |
|
zty
|
71dd916dbf
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-15 10:47:47 +08:00 |
|
zty
|
13fb91e83a
|
fix：enm/service 修改稿last_val
|
2024-08-15 10:47:43 +08:00 |
|
caoqianming
|
7028fd31ee
|
feat: wmaterial增加state字段并进行相应处理2
|
2024-08-15 10:43:45 +08:00 |
|
caoqianming
|
ba6c30a745
|
feat: wmaterial增加state字段并进行相应处理
|
2024-08-15 10:41:36 +08:00 |
|
caoqianming
|
824dacf78d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-15 09:47:06 +08:00 |
|
caoqianming
|
bcafe94e71
|
fix: base validate_password支持.号
|
2024-08-15 09:47:04 +08:00 |
|
zty
|
f52b501aa1
|
feat : enm/service 增加测点采集系数
|
2024-08-15 09:19:19 +08:00 |
|
zty
|
29ba9647b4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-14 18:33:05 +08:00 |
|
zty
|
6a20445ddd
|
fix : em/service 修改update_time
|
2024-08-14 18:33:01 +08:00 |
|
caoqianming
|
42769e3abe
|
fix: mioitempurin bug
|
2024-08-14 18:17:31 +08:00 |
|
caoqianming
|
db792a2de5
|
feat: ftestwork增加检验人及不合格项
|
2024-08-14 18:07:12 +08:00 |
|
caoqianming
|
a9acf6d187
|
feat: 物料导入模板增加编号列
|
2024-08-14 17:42:27 +08:00 |
|
caoqianming
|
27c60ff973
|
feat: mio pur test 支持count_sampling自填
|
2024-08-13 17:28:39 +08:00 |
|
caoqianming
|
3bb3834c04
|
fix: miolist pu_order_number
|
2024-08-13 17:11:22 +08:00 |
|
caoqianming
|
cc5dcc9685
|
fix: gen_material_out bug
|
2024-08-13 16:29:59 +08:00 |
|
caoqianming
|
58ddc8dd0b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-13 15:06:10 +08:00 |
|
caoqianming
|
ad1d0680b1
|
feat: mlogbupdate 校验
|
2024-08-13 15:06:07 +08:00 |
|
zty
|
779bd763a1
|
fix : em/service 修改运行设备更新状态 根据最后一次时间修改
|
2024-08-13 15:00:09 +08:00 |
|
caoqianming
|
bbac19c791
|
feat: notok option 其他
|
2024-08-13 14:47:26 +08:00 |
|
caoqianming
|
bfad89bf2f
|
feat: ftestwork_submit增加抽检逻辑
|
2024-08-13 14:31:38 +08:00 |
|
caoqianming
|
23dd745192
|
feat: ftestwork增加查询条件
|
2024-08-13 13:59:58 +08:00 |
|
caoqianming
|
0a0b6b72ba
|
feat: ftestworkcreate type2处理
|
2024-08-13 13:42:00 +08:00 |
|
caoqianming
|
8e7e60c600
|
fix: ftestwork_submit bug2
|
2024-08-12 17:36:12 +08:00 |
|
caoqianming
|
e6e4a61289
|
fix: ftestwork_submit bug
|
2024-08-12 17:31:19 +08:00 |
|
caoqianming
|
096ad540d4
|
feat: qm batch增加长度
|
2024-08-12 17:21:17 +08:00 |
|
caoqianming
|
f6f84533d1
|
fix: notokoption 修改3
|
2024-08-12 17:18:09 +08:00 |
|
caoqianming
|
38f052c015
|
fix: notokoption 修改2
|
2024-08-12 17:15:23 +08:00 |
|
caoqianming
|
cfbd79a206
|
fix: notokoption 修改
|
2024-08-12 17:12:22 +08:00 |
|
caoqianming
|
274a0df0eb
|
feat: 检验工作增加查询条件
|
2024-08-12 16:57:22 +08:00 |
|
caoqianming
|
b9dc211df3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-12 16:46:14 +08:00 |
|
caoqianming
|
5fc38eabaa
|
fix: notokoption values
|
2024-08-12 16:46:12 +08:00 |
|
zty
|
7664dfefa4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-12 16:04:57 +08:00 |
|
zty
|
47acf9ceb4
|
fix: enm/service 修改service
|
2024-08-12 16:04:55 +08:00 |
|
caoqianming
|
ba2368f59b
|
feat: handover增加筛选条件
|
2024-08-12 15:05:47 +08:00 |
|
caoqianming
|
c5dfb325dc
|
feat: handover 增加查询条件
|
2024-08-12 14:39:44 +08:00 |
|
caoqianming
|
2108b1c33a
|
feat: wmaterial增加查询条件
|
2024-08-12 14:35:33 +08:00 |
|
caoqianming
|
50c3efe39b
|
feat: ftestwork提交并更新车间库存
|
2024-08-12 12:58:27 +08:00 |
|
caoqianming
|
5821b6b7df
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-12 11:07:31 +08:00 |
|
caoqianming
|
562372b0b9
|
feat: mlog添加不合格项目
|
2024-08-12 11:07:29 +08:00 |
|
zty
|
345588b611
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-12 10:32:39 +08:00 |
|
zty
|
a6d5604acb
|
fix: em.service.py 更改状态变动
|
2024-08-12 10:32:34 +08:00 |
|
caoqianming
|
ae1099cbec
|
fix: base wf 工段的字段获取处理人时没找到返回0
|
2024-08-09 15:19:21 +08:00 |
|
caoqianming
|
1a42cf34f0
|
feat: wmaterial增加count_xtest/handover增加检验交接
|
2024-08-09 15:09:26 +08:00 |
|
caoqianming
|
a2b52e95a5
|
doc: drain view swagger 变动3
|
2024-08-08 15:07:05 +08:00 |
|
caoqianming
|
fff6c76cc6
|
doc: drain view swagger 变动2
|
2024-08-08 15:03:15 +08:00 |
|
caoqianming
|
758d403f5d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-08 14:55:28 +08:00 |
|
caoqianming
|
f1aa402383
|
doc: drain view swagger 变动
|
2024-08-08 14:55:26 +08:00 |
|
zty
|
169a31da5a
|
fix : apps/em /enm 更改缓存存储
|
2024-08-08 14:52:36 +08:00 |
|
caoqianming
|
e2c44f06c4
|
feat: drain serializer增加返回序列化
|
2024-08-08 14:45:40 +08:00 |
|
caoqianming
|
3f32390fb2
|
feat: 自动生成物料时延续cate
|
2024-08-08 09:12:46 +08:00 |
|
caoqianming
|
1781dba630
|
feat: 更改testitem field type
|
2024-08-07 15:43:28 +08:00 |
|
caoqianming
|
c64387e5bc
|
Merge branch 'erp1'
|
2024-08-07 15:26:49 +08:00 |
|
caoqianming
|
1418141a67
|
feat: ftestwork返回material_cate
|
2024-08-07 15:25:48 +08:00 |
|
caoqianming
|
fe61081ec7
|
feat: ftestworkcreateupdate 支持更改
|
2024-08-07 14:52:53 +08:00 |
|
caoqianming
|
9136f7e87f
|
feat: 增加material cate 接口
|
2024-08-07 14:52:10 +08:00 |
|
caoqianming
|
ab9b1b7f27
|
feat: 增加testitem筛选条件
|
2024-08-07 14:51:57 +08:00 |
|
caoqianming
|
239f01a4ca
|
feat: qm添加字段2
|
2024-08-07 14:51:42 +08:00 |
|
caoqianming
|
b8dceb03a3
|
feat: qm添加字段
|
2024-08-07 14:51:30 +08:00 |
|
caoqianming
|
15043bbb49
|
feat: ftestworkcreateupdate 支持更改
|
2024-08-07 11:07:48 +08:00 |
|
caoqianming
|
211fd1ac77
|
feat: 增加material cate 接口
|
2024-08-07 10:54:00 +08:00 |
|
caoqianming
|
cf7007f8b8
|
feat: 增加testitem筛选条件
|
2024-08-07 10:18:11 +08:00 |
|
caoqianming
|
be8fbec24e
|
feat: edu添加字段
|
2024-08-07 10:01:41 +08:00 |
|
caoqianming
|
632c36edd0
|
feat: qm添加字段2
|
2024-08-07 10:01:22 +08:00 |
|
caoqianming
|
8aabf1fca0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-07 09:46:20 +08:00 |
|
caoqianming
|
549ef24c70
|
feat: qm添加字段
|
2024-08-07 09:46:17 +08:00 |
|
zty
|
6bdc5a04aa
|
fix :enm service.py 修改缓存不存在直接返回
|
2024-08-07 09:30:56 +08:00 |
|
zty
|
314b614c53
|
fix: cal_exp_duration_sec 还需要更新时间为None3
|
2024-08-06 19:00:38 +08:00 |
|
zty
|
1fe8c7ae76
|
feat: cal_exp_duration_sec 还需要更新时间为None2
|
2024-08-06 18:43:20 +08:00 |
|
zty
|
5461fb5f55
|
feat: cal_exp_duration_sec 还需要更新时间为None的
|
2024-08-06 18:40:34 +08:00 |
|
zty
|
f97c99bf8a
|
fix: cal_mpointstat_hour对于is_unit的计算错误
|
2024-08-06 17:52:21 +08:00 |
|
zty
|
91e9ac38f6
|
fix: db_insert_mplogx_batch bug
|
2024-08-06 17:22:28 +08:00 |
|
zty
|
679165cbd0
|
feat: db_insert_mplogx 添加限制参数
|
2024-08-06 17:12:58 +08:00 |
|
zty
|
a24666b795
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-06 16:11:32 +08:00 |
|
zty
|
4d498f99a3
|
fix: enm/task 水泥批号插入
|
2024-08-06 16:11:27 +08:00 |
|
caoqianming
|
b2abf0128a
|
feat: pum sam 增加检索条件
|
2024-08-06 12:24:21 +08:00 |
|
caoqianming
|
06d2c5a096
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-06 12:21:11 +08:00 |
|
caoqianming
|
abccaf4c78
|
feat: pum sam 增加检索条件
|
2024-08-06 12:21:08 +08:00 |
|
zty
|
50cdbf9428
|
fix :enm/task 修改数据库连接
|
2024-08-06 10:53:01 +08:00 |
|
zty
|
f09a8fe4cd
|
add : db_ins_mplogx 增加测点插入数据库
|
2024-08-06 10:01:21 +08:00 |
|
zty
|
341a681d00
|
fix: get_sflog 提前起始时间
|
2024-08-06 09:54:34 +08:00 |
|
zty
|
f1a76cba74
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-06 09:45:10 +08:00 |
|
zty
|
73176847e0
|
feat: make_sflogs_simple 扩大范围
|
2024-08-06 09:44:24 +08:00 |
|
caoqianming
|
42c1386efd
|
feat: sflogexp增加返回信息
|
2024-08-06 08:29:21 +08:00 |
|
caoqianming
|
6931c49b3b
|
feat: oplserializer 添加返回信息
|
2024-08-04 20:28:18 +08:00 |
|
caoqianming
|
fe97d36f54
|
feat: opl添加字段
|
2024-08-04 18:50:42 +08:00 |
|
caoqianming
|
1003e0aea7
|
feat: route添加filter
|
2024-08-02 21:13:15 +08:00 |
|
caoqianming
|
c58e34a7fd
|
feat: route添加filter
|
2024-08-02 21:00:13 +08:00 |
|
caoqianming
|
fa56d61ffc
|
feat: 修改nowx使用aware
|
2024-08-02 16:39:07 +08:00 |
|
caoqianming
|
4604809bf4
|
feat: bind_routepack 时取消第一步的批次校验
|
2024-08-02 13:52:14 +08:00 |
|
caoqianming
|
dc7e6f9d03
|
fix: get_total_sec_now及cal_exp_duration_sec 添加now参数
|
2024-08-02 13:50:05 +08:00 |
|
caoqianming
|
313e9ed1cd
|
fix: routeserializer优化routepack process校验3
|
2024-08-02 11:14:45 +08:00 |
|
caoqianming
|
f5482285f2
|
fix: routeserializer优化routepack process校验2
|
2024-08-02 11:11:08 +08:00 |
|
caoqianming
|
757bf89d71
|
fix: enstat hour_s查询时按真实事件查询
|
2024-08-02 10:50:22 +08:00 |
|
caoqianming
|
adffac48ad
|
fix: routeserializer优化routepack process校验
|
2024-08-02 09:13:00 +08:00 |
|
caoqianming
|
aa42ba6e3f
|
feat: submit时校验消耗和产出是否已经填写
|
2024-08-01 18:12:30 +08:00 |
|
caoqianming
|
071558af8d
|
feat: mlogbin 校验记录已存在
|
2024-08-01 17:32:48 +08:00 |
|
caoqianming
|
cbedb81b0e
|
fix: mlogbin 不合格物料校验去除
|
2024-08-01 16:54:09 +08:00 |
|
zty
|
c293dd068f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-01 15:55:22 +08:00 |
|
zty
|
261ed40d94
|
fix: fim.py cost_unit 字段
|
2024-08-01 15:55:19 +08:00 |
|
caoqianming
|
cbe516ccf5
|
fix: handover submit时更新bug
|
2024-08-01 15:25:16 +08:00 |
|
caoqianming
|
6efcf19716
|
fix: mlog_revert bug
|
2024-08-01 15:15:00 +08:00 |
|
caoqianming
|
f3f0ea132c
|
fix: find_material_can_change 只可返工到半成品
|
2024-08-01 10:30:55 +08:00 |
|
caoqianming
|
9ff4f21f9a
|
fix: mlogbin create时生成编号变更3
|
2024-08-01 09:59:39 +08:00 |
|
caoqianming
|
99ab4e1957
|
feat: mlogbin create时生成编号变更2
|
2024-08-01 09:20:15 +08:00 |
|
caoqianming
|
3f62e8709f
|
feat: 采购计划和订单增加单价和总价
|
2024-07-31 19:18:51 +08:00 |
|
caoqianming
|
9e26f416a5
|
feat: 变更物料单价字段为小数
|
2024-07-31 19:18:24 +08:00 |
|
caoqianming
|
a589fec67e
|
feat: enstat2添加统计字段
|
2024-07-31 16:53:23 +08:00 |
|
caoqianming
|
0813a3b568
|
feat: mlogbin create时生成编号变更
|
2024-07-31 16:33:32 +08:00 |
|
caoqianming
|
9dcc4c0910
|
feat: 工序增加字段batch_append_equip
|
2024-07-31 16:30:00 +08:00 |
|
caoqianming
|
93b1a80cfb
|
feat: 供应商增加字段number
|
2024-07-31 16:29:11 +08:00 |
|
caoqianming
|
821d7613d1
|
fix: get_sflog 增加 sflog创建范围
|
2024-07-31 15:55:34 +08:00 |
|
caoqianming
|
19167887d5
|
fix: mgroup_run_change bug
|
2024-07-31 15:34:50 +08:00 |
|
caoqianming
|
bea83f93d5
|
fix: 批次号追加设备编号
|
2024-07-31 14:30:53 +08:00 |
|
caoqianming
|
9ad0cf6498
|
feat: 批次号追加number
|
2024-07-31 14:27:15 +08:00 |
|
caoqianming
|
166ae8b12c
|
feat: base user增加筛选条件
|
2024-07-31 13:43:32 +08:00 |
|
caoqianming
|
321be50323
|
feat: MaterialBatchSerializer 改变material_name
|
2024-07-30 17:06:28 +08:00 |
|
caoqianming
|
e3a276c634
|
feat: MaterialBatchSerializer 改变material_name
|
2024-07-30 17:05:55 +08:00 |
|
zty
|
181a4e3a5f
|
fix: HandoverSerializer recive_mgroup 校验bug
|
2024-07-30 15:11:23 +08:00 |
|
zty
|
ebf6f739ca
|
feat: 出入库添加工段逻辑
|
2024-07-30 13:24:21 +08:00 |
|
zty
|
a587e570f0
|
feat: mio 添加 mgroup字段
|
2024-07-30 11:40:18 +08:00 |
|
caoqianming
|
893781ec7f
|
feat: db_insert_mplogx不用thread
|
2024-07-30 10:01:42 +08:00 |
|
caoqianming
|
f5c22d460b
|
Merge branch 'erp1'
|
2024-07-29 17:24:42 +08:00 |
|
caoqianming
|
e853fe33b1
|
feat: gen_material_out 优化并变更物料信息
|
2024-07-29 17:24:25 +08:00 |
|
caoqianming
|
93d26ec100
|
Merge branch 'erp1'
|
2024-07-29 16:21:22 +08:00 |
|
caoqianming
|
a4417e7a4f
|
fix: gen_material_out bug
|
2024-07-29 16:20:43 +08:00 |
|
caoqianming
|
ebfb96b12e
|
feat: material delete 时 update 子物料
|
2024-07-29 16:16:20 +08:00 |
|
caoqianming
|
76c14460f5
|
fix: base handle_parent 错误
|
2024-07-29 11:12:53 +08:00 |
|
caoqianming
|
effffe34bf
|
fix: base handle_parent 错误
|
2024-07-29 11:12:13 +08:00 |
|
caoqianming
|
92c6939a9c
|
refactor: base 更新permission 描述
|
2024-07-29 10:32:36 +08:00 |
|
caoqianming
|
38eaefe3bb
|
refactor: base 更新permission 描述
|
2024-07-29 10:31:46 +08:00 |
|
caoqianming
|
05b46b5351
|
fix: EnvData get_or_create 避免报错
|
2024-07-29 08:38:57 +08:00 |
|
caoqianming
|
b428f36014
|
Merge branch 'erp1'
|
2024-07-26 17:41:09 +08:00 |
|
caoqianming
|
7f935dbf57
|
fix: datarecordviewset 继承错误
|
2024-07-26 17:40:54 +08:00 |
|
caoqianming
|
e78cdca9ae
|
Merge branch 'erp1'
|
2024-07-26 17:33:26 +08:00 |
|
caoqianming
|
02a9445596
|
feat: 添加dataset接口
|
2024-07-26 17:32:08 +08:00 |
|
caoqianming
|
ae55a62ced
|
Merge branch 'erp1'
|
2024-07-26 17:19:00 +08:00 |
|
caoqianming
|
2a225bdc86
|
feat: 添加定时执行bi的task和记录表
|
2024-07-26 17:18:42 +08:00 |
|
caoqianming
|
e5cd203e04
|
Merge branch 'erp1'
|
2024-07-26 16:57:04 +08:00 |
|
caoqianming
|
9c27ffd7dd
|
feat: testitem 增删改查
|
2024-07-26 16:56:29 +08:00 |
|
caoqianming
|
23d452fe2c
|
fix: mgroup_run_change 再从开到停时再查询一次last_stlog
|
2024-07-26 10:06:31 +08:00 |
|
caoqianming
|
b6d4b38103
|
fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误2
|
2024-07-26 09:07:59 +08:00 |
|
caoqianming
|
7df2cbba1e
|
feat: base 处理父级引用parent_link bug
|
2024-07-26 09:04:46 +08:00 |
|
caoqianming
|
cab46ea229
|
fix: base handle_parent时要处理所有相关的父子关系
|
2024-07-26 09:03:54 +08:00 |
|
caoqianming
|
eb81c2db2d
|
fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误
|
2024-07-26 09:03:35 +08:00 |
|
caoqianming
|
370cda6a41
|
feat: base permission增加搜索字段
|
2024-07-26 09:03:08 +08:00 |
|
caoqianming
|
52ce49a9f3
|
feat: base 处理父级引用parent_link bug
|
2024-07-26 08:52:24 +08:00 |
|
caoqianming
|
f4c04cdf90
|
fix: base handle_parent时要处理所有相关的父子关系
|
2024-07-25 18:40:55 +08:00 |
|
caoqianming
|
db95b27b5c
|
fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误2
|
2024-07-25 16:00:11 +08:00 |
|
caoqianming
|
7fe59518c1
|
fix: routepack destory bug
|
2024-07-25 15:40:19 +08:00 |
|
caoqianming
|
6a43dcfd0d
|
fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误
|
2024-07-25 15:38:25 +08:00 |
|
caoqianming
|
51e6cc041e
|
fix: bind_routepack bug
|
2024-07-25 15:25:37 +08:00 |
|
caoqianming
|
3a5d6cac55
|
feat: route update做限制
|
2024-07-25 13:34:09 +08:00 |
|
caoqianming
|
6759ea76bf
|
feat: material增加into_wm字段控制与车间库存交互
|
2024-07-25 13:27:44 +08:00 |
|
caoqianming
|
c125652de4
|
feat: material添加单价字段
|
2024-07-25 13:11:01 +08:00 |
|
caoqianming
|
c31bd32fb5
|
feat: bind_routepack 添加 t_create_by 字段
|
2024-07-25 13:06:57 +08:00 |
|
caoqianming
|
71dbd6c572
|
feat: handover 添加返回信息
|
2024-07-25 11:31:39 +08:00 |
|
caoqianming
|
b0004ba12e
|
feat: mpointcache 存库时若测点不存在删除缓存
|
2024-07-25 10:51:54 +08:00 |
|
caoqianming
|
391d9b137d
|
feat: handover filter增加筛选条件
|
2024-07-25 08:34:50 +08:00 |
|
caoqianming
|
47f4222f03
|
fix: mlog submit wm belong_dept 缺失
|
2024-07-24 16:43:30 +08:00 |
|
caoqianming
|
3b489fdd52
|
feat: base permission增加搜索字段
|
2024-07-24 14:28:29 +08:00 |
|
caoqianming
|
da2e880d66
|
Merge branch 'erp1'
|
2024-07-24 13:50:22 +08:00 |
|
caoqianming
|
b98227b032
|
feat: FtestWorkCreateUpdate 可更新抽检和合格数量
|
2024-07-24 13:50:05 +08:00 |
|
caoqianming
|
7af77c484b
|
fix: order destory bug
|
2024-07-24 13:44:10 +08:00 |
|
caoqianming
|
34c0f82ed1
|
fix: gen_material_out 优化
|
2024-07-24 11:20:30 +08:00 |
|
caoqianming
|
e3f32932d8
|
Merge branch 'erp1'
|
2024-07-24 10:55:08 +08:00 |
|
caoqianming
|
94c492166d
|
fix: orderviewset filter属性错误
|
2024-07-24 10:54:56 +08:00 |
|
caoqianming
|
4bbe973071
|
Merge branch 'erp1'
|
2024-07-24 10:52:35 +08:00 |
|
caoqianming
|
2e1f94b24c
|
feat: order增加filter/miosale增加校验
|
2024-07-24 10:51:42 +08:00 |
|
caoqianming
|
0a1679d8a2
|
Merge branch 'erp1'
|
2024-07-23 13:02:20 +08:00 |
|
caoqianming
|
0e26b2188e
|
feat: 增加ftestwork count_ok 字段
|
2024-07-23 12:56:11 +08:00 |
|
caoqianming
|
c068c47bc7
|
feat: 增加外协生产日志功能
|
2024-07-23 10:11:31 +08:00 |
|
caoqianming
|
caf83b7e0f
|
feat: 供应商里增加外协字段
|
2024-07-23 09:42:36 +08:00 |
|
caoqianming
|
da8e381b3f
|
doc: 添加NotokOption注释
|
2024-07-23 08:39:36 +08:00 |
|
caoqianming
|
0ab6e0bc72
|
feat: 增加不合格项接口
|
2024-07-22 17:58:21 +08:00 |
|
caoqianming
|
ec0df66542
|
feat: 完成返工交接2
|
2024-07-22 15:32:23 +08:00 |
|
caoqianming
|
9c67675ca7
|
feat: 完成返工交接
|
2024-07-22 15:26:45 +08:00 |
|
caoqianming
|
19cac7729a
|
feat: handoverserializer type设置为非必填
|
2024-07-19 10:24:13 +08:00 |
|
caoqianming
|
92fc1e9e0a
|
feat: 添加返修交接支持
|
2024-07-19 10:04:02 +08:00 |
|
caoqianming
|
cb5ede39f0
|
feat: process admin 字段展示
|
2024-07-18 16:46:49 +08:00 |
|
caoqianming
|
a3e51a84db
|
refector: HandoverSerializer validate 优化
|
2024-07-18 16:32:31 +08:00 |
|
caoqianming
|
30be6dc291
|
fix: mlogchange 改 mlogupdate
|
2024-07-18 15:58:53 +08:00 |
|
caoqianming
|
6fd2f2a009
|
fix: MyThread 调用错误
|
2024-07-18 15:36:23 +08:00 |
|
caoqianming
|
950b017073
|
feat: mlog_submit 时校验handle_date
|
2024-07-18 14:48:55 +08:00 |
|
caoqianming
|
9b3cbe75ae
|
feat: submit时校验mlogbout
|
2024-07-18 14:48:36 +08:00 |
|
caoqianming
|
6778af3f07
|
fix: 增加mlogb.update权限标识
|
2024-07-18 14:31:34 +08:00 |
|
caoqianming
|
8d75f3f251
|
feat: 增加mlogb.update权限标识
|
2024-07-18 14:26:39 +08:00 |
|
caoqianming
|
6a51fd1177
|
feat: 添加筛选条件和mlogbin 校验
|
2024-07-18 13:46:16 +08:00 |
|
caoqianming
|
d561a0d24b
|
feat: 日志提交时不合格品存储到车间库存
|
2024-07-18 11:30:10 +08:00 |
|
caoqianming
|
ee65658145
|
fix: MlogbInSerializer bug
|
2024-07-17 17:08:42 +08:00 |
|
caoqianming
|
c058fe9338
|
feat: 支持不合格品处理/添加不合格品存储字段
|
2024-07-17 16:58:28 +08:00 |
|
caoqianming
|
83ec822f9d
|
fix: db_insert_mplogx bug
|
2024-07-16 15:36:40 +08:00 |
|
caoqianming
|
d31cf4d143
|
feat: 从数据库转存到超表做count限制
|
2024-07-16 14:50:50 +08:00 |
|
caoqianming
|
bf98ea8a48
|
feat: 从数据库转存到超表
|
2024-07-16 14:06:46 +08:00 |
|
caoqianming
|
ab413eed81
|
feat: 停机记录在小于60s可删除
|
2024-07-16 10:58:33 +08:00 |
|
caoqianming
|
061a291889
|
feat: 增加handover和mio的查询条件
|
2024-07-15 17:57:39 +08:00 |
|
caoqianming
|
876c18149e
|
feat: route增加返回字段
|
2024-07-15 17:32:45 +08:00 |
|
caoqianming
|
79900462ff
|
feat: 交接记录receive_dept非必填
|
2024-07-15 17:05:13 +08:00 |
|
caoqianming
|
07680704ec
|
feat: cal_mtask_progress_from_mlog
|
2024-07-15 16:57:09 +08:00 |
|
caoqianming
|
6e904f083a
|
fix: gen_material_out 优化
|
2024-07-12 10:58:48 +08:00 |
|
caoqianming
|
af80e3ce5b
|
fix: mlogb type filter bug
|
2024-07-12 10:50:41 +08:00 |
|
caoqianming
|
4934327808
|
feat: mlogbout url register
|
2024-07-11 17:44:18 +08:00 |
|
caoqianming
|
d38e91667e
|
fix: mlogb init serializer bug
|
2024-07-11 17:04:01 +08:00 |
|
caoqianming
|
b33c86fd6e
|
feat: mlogb in update 接口
|
2024-07-11 15:58:08 +08:00 |
|
caoqianming
|
ac1b4b6c3e
|
feat: mlogb增加筛选条件
|
2024-07-11 15:57:49 +08:00 |
|
caoqianming
|
debc268c88
|
feat: mlog增加不合格项目字段=
|
2024-07-11 15:57:18 +08:00 |
|
caoqianming
|
deeda736b9
|
feat: mlog增加不合格项目字段
|
2024-07-11 15:55:44 +08:00 |
|
caoqianming
|
12fb18205d
|
feat: 增加route和routepack查询条件
|
2024-07-11 13:28:30 +08:00 |
|
caoqianming
|
4177ba93f8
|
feat: wmaterial增加mgroupx 查询条件
|
2024-07-11 13:13:39 +08:00 |
|
caoqianming
|
5ad15c0a9e
|
feat: MlogbIn create时同步创建out
|
2024-07-11 13:06:48 +08:00 |
|
caoqianming
|
2d522a1fd4
|
feat: route增加batch_bind字段/mlogbin接口
|
2024-07-11 11:26:18 +08:00 |
|
caoqianming
|
2f08b9ce81
|
feat: mtask 添加route查询条件
|
2024-07-11 11:24:37 +08:00 |
|
caoqianming
|
2e60cb7eaf
|
feat: mlog change接口
|
2024-07-11 08:44:40 +08:00 |
|
caoqianming
|
2f5edc041c
|
feat: mlog init
|
2024-07-10 15:32:33 +08:00 |
|
caoqianming
|
4c93bb98de
|
fix: daoru_mb cal_material bug
|
2024-07-09 16:16:32 +08:00 |
|
caoqianming
|
6754b668bc
|
fix: handover serializer validate bug
|
2024-07-09 14:03:44 +08:00 |
|
caoqianming
|
8872d63aae
|
fix: 优化cal_material_count
|
2024-07-08 08:57:38 +08:00 |
|
caoqianming
|
b18f39d95d
|
fix: routepack serializer validate bug
|
2024-07-08 08:25:45 +08:00 |
|
caoqianming
|
56e40e6dd3
|
fix: 更改mythread的使用
|
2024-07-05 10:49:17 +08:00 |
|
caoqianming
|
b9f2264ff4
|
fix: base thread添加日志
|
2024-07-05 10:46:33 +08:00 |
|
caoqianming
|
24b2a98440
|
refecor: 一些处理
|
2024-07-05 08:49:36 +08:00 |
|
caoqianming
|
df2db0ddd9
|
fix: schedue_mtasks serializer用错
|
2024-07-04 17:26:13 +08:00 |
|
caoqianming
|
e4f9fd34f0
|
fix: schedule_type 单词错误
|
2024-07-04 17:20:20 +08:00 |
|
caoqianming
|
92903e7014
|
feat: cal_material_count 重构
|
2024-07-04 16:23:28 +08:00 |
|
caoqianming
|
511b149290
|
feat: 增加routepack返回信息
|
2024-07-04 10:25:22 +08:00 |
|
caoqianming
|
7381a65c24
|
feat: 重新梳理计算物料总数量
|
2024-07-04 10:04:49 +08:00 |
|
caoqianming
|
ffc9f0ee4d
|
feat: base 增加自定义的thread以记录日志或发送邮件
|
2024-07-04 09:45:19 +08:00 |
|
caoqianming
|
436719d9ff
|
feat: 依据routepack进行任务派发
|
2024-07-03 16:46:01 +08:00 |
|
caoqianming
|
14994b424a
|
fix: enp添加设备权限bug
|
2024-07-03 15:56:52 +08:00 |
|
caoqianming
|
a0dae66cf7
|
feat: 根据光芯需求对wpm做兼容性处理2
|
2024-07-03 13:19:21 +08:00 |
|
caoqianming
|
439c8a0f88
|
feat: routepack增加返回信息
|
2024-07-03 13:02:39 +08:00 |
|
caoqianming
|
59b8634d3e
|
fix: handover serializer bug2
|
2024-07-02 23:25:14 +08:00 |
|
caoqianming
|
67ca07bb35
|
fix: handover serializer bug
|
2024-07-02 23:04:16 +08:00 |
|
caoqianming
|
bad338ba67
|
feat: 增加routepack_ticket_change方法
|
2024-07-02 17:09:15 +08:00 |
|
caoqianming
|
c1161c4391
|
feat: routepack bind ticket
|
2024-07-02 16:40:43 +08:00 |
|
caoqianming
|
b2664ca81b
|
feat: 修改route serializer
|
2024-07-02 15:44:48 +08:00 |
|
caoqianming
|
15c4e195f3
|
feat: 添加routepack表
|
2024-07-02 14:12:13 +08:00 |
|
caoqianming
|
427bf31d50
|
fix: mlogb 取material bug
|
2024-07-02 12:09:08 +08:00 |
|
caoqianming
|
a6a3dcf33c
|
fix: handover validate bug
|
2024-07-01 16:21:52 +08:00 |
|
caoqianming
|
d579a7358d
|
feat: 根据光芯需求对wpm做兼容性处理
|
2024-07-01 10:07:57 +08:00 |
|
caoqianming
|
3c52125440
|
feat: wm,handover,mlog增加检索条件
|
2024-06-28 15:29:39 +08:00 |
|
caoqianming
|
9572614b02
|
fix: enstat to_repre时若使用query时的bug
|
2024-06-27 09:05:45 +08:00 |
|
caoqianming
|
85bbdd6cd9
|
feat: 优化transfer_mpoint_val_to_ep_running_state
|
2024-06-26 10:11:43 +08:00 |
|
caoqianming
|
02d672a39d
|
feat: 增加mpoint查询条件
|
2024-06-26 10:11:21 +08:00 |
|
caoqianming
|
450fe06093
|
fix: schedue_mtasks schedue_type bug
|
2024-06-25 15:50:30 +08:00 |
|
caoqianming
|
d766d880e7
|
feat: utask支持恢复任务/排产支持传入to_day
|
2024-06-24 18:23:51 +08:00 |
|
caoqianming
|
643efa448e
|
fix: mpointserializer获取last_data优化
|
2024-06-24 16:45:05 +08:00 |
|
caoqianming
|
499e5732aa
|
fix: 更新所监测设备测点的total_production忽略必须指定设备
|
2024-06-24 10:02:54 +08:00 |
|
caoqianming
|
ac7e0a84ea
|
feat: pm 添加工时字段
|
2024-06-21 15:48:14 +08:00 |
|
caoqianming
|
2bb860f8dd
|
feat: 添加工时字段
|
2024-06-21 14:31:31 +08:00 |
|
caoqianming
|
5efd9888dd
|
feat: 交接记录提交只要是同部门的就可以2
|
2024-06-21 13:27:47 +08:00 |
|
caoqianming
|
7c0df5f804
|
fix: raise 工艺路线未配置
|
2024-06-21 11:15:35 +08:00 |
|
caoqianming
|
966821fad6
|
feat: 交接记录提交只要是同部门的就可以
|
2024-06-21 10:40:07 +08:00 |
|
caoqianming
|
96e96ef8cc
|
fix: KingClient 添加日志4
|
2024-06-20 09:21:13 +08:00 |
|
caoqianming
|
1d4239c28a
|
fix: KingClient 添加日志3
|
2024-06-19 18:23:04 +08:00 |
|
caoqianming
|
98d10405e4
|
fix: KingClient 添加日志2
|
2024-06-19 18:13:48 +08:00 |
|
caoqianming
|
c42dafcb44
|
fix: KingClient 添加日志
|
2024-06-19 17:45:11 +08:00 |
|
caoqianming
|
97f8a1e143
|
fix: kingclient set token bug
|
2024-06-19 15:54:45 +08:00 |
|
caoqianming
|
b0dfb020ce
|
fix: 添加亚控通用调用接口 bug2
|
2024-06-19 15:38:26 +08:00 |
|
caoqianming
|
d78c8b10dc
|
fix: 添加亚控通用调用接口 bug
|
2024-06-19 15:35:15 +08:00 |
|
caoqianming
|
7867fe0e67
|
feat: 添加亚控通用调用接口
|
2024-06-19 15:23:40 +08:00 |
|
caoqianming
|
f612c8e662
|
fix: dispath_checkwork_task bug2
|
2024-06-18 17:58:58 +08:00 |
|
caoqianming
|
51e32f24b1
|
fix: dispath_checkwork_task bug
|
2024-06-18 17:55:07 +08:00 |
|
caoqianming
|
de6c57b5c9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-06-18 17:54:53 +08:00 |
|
caoqianming
|
1d7babafe7
|
feat: 添加hazard路由
|
2024-06-18 17:54:50 +08:00 |
|
zty
|
ab358abf80
|
fix: edu.url edu.view
|
2024-06-12 18:07:17 +08:00 |
|
zty
|
d8f9dbfcfb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-06-12 10:47:09 +08:00 |
|
zty
|
5f4884e83d
|
fix: edu/model 、serializers、view 删减参与部门
|
2024-06-12 10:46:58 +08:00 |
|
caoqianming
|
5778381189
|
feat: dpm checkwork增加字段2
|
2024-06-12 10:45:29 +08:00 |
|
caoqianming
|
dc5be36e78
|
feat: dpm checkwork增加字段
|
2024-06-12 10:45:12 +08:00 |
|
caoqianming
|
63dbc00a12
|
fix: dispatch_checkwork_task自动添加time_end
|
2024-06-12 10:13:59 +08:00 |
|
caoqianming
|
7f3da29560
|
fix: 注册dpm task
|
2024-06-11 17:11:20 +08:00 |
|
caoqianming
|
e95b7b73bc
|
feat: 注册dpm task
|
2024-06-11 16:38:19 +08:00 |
|
caoqianming
|
f596a6ab1a
|
feat: 注释掉reload_web_git
|
2024-06-11 16:19:46 +08:00 |
|
caoqianming
|
388b28133f
|
fix: checktaskset create bug
|
2024-06-11 16:08:21 +08:00 |
|
caoqianming
|
a9cbd846cd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-06-11 16:01:02 +08:00 |
|
caoqianming
|
b913928ac6
|
feat: 风险管控表精简
|
2024-06-11 16:01:00 +08:00 |
|
zty
|
423eca445e
|
fix: edu/ExamRecordSerializer
|
2024-06-11 14:17:07 +08:00 |
|
zty
|
f4e003b9f0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
修改edu/examrecord
|
2024-06-11 14:04:39 +08:00 |
|
zty
|
5178cb0daa
|
fix: edu/Examrecord
|
2024-06-11 14:03:58 +08:00 |
|
caoqianming
|
6851dd3f94
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-06-11 11:29:00 +08:00 |
|
caoqianming
|
af879ca01b
|
fix: myschedule 保存时的bug
|
2024-06-11 11:28:58 +08:00 |
|
zty
|
18b0429044
|
fix: edu/submit
|
2024-06-11 09:11:32 +08:00 |
|
zty
|
71e7d4d187
|
feat: base send_mail_task支持发送多人
|
2024-06-07 17:08:50 +08:00 |
|
zty
|
7258d2e0ca
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-06-07 16:51:02 +08:00 |
|
zty
|
87311668f5
|
fix: exam attend bulk_create bug
|
2024-06-07 16:50:58 +08:00 |
|
caoqianming
|
c55005994b
|
feat: base myschedule加入url
|
2024-06-07 16:01:16 +08:00 |
|
caoqianming
|
255867b2d3
|
fix: myscheduleserializer 返回字段bug
|
2024-06-07 15:46:37 +08:00 |
|
caoqianming
|
108e40bb3d
|
feat: base 去除MySchedule的权限控制
|
2024-06-07 13:41:35 +08:00 |
|
caoqianming
|
6eccfb67cb
|
feat: 增加riskpoint返回信息
|
2024-06-07 09:50:32 +08:00 |
|
caoqianming
|
fe40facfa2
|
fix: base 对循环引用抛出异常
|
2024-06-07 09:49:17 +08:00 |
|
caoqianming
|
a14c411795
|
fix: base 调整handle_parent
|
2024-06-06 14:50:43 +08:00 |
|
caoqianming
|
d36de5bc00
|
feat: 正式添加dpm模块
|
2024-06-06 14:50:14 +08:00 |
|
caoqianming
|
9e0241f209
|
fix: 改变培训级别以与风险点一致
|
2024-06-06 09:13:11 +08:00 |
|
caoqianming
|
917f3ff52b
|
feat: 增加edu 线下培训表
|
2024-06-05 14:43:39 +08:00 |
|
caoqianming
|
16ead75d3b
|
feat: 获取子集的性能优化2
|
2024-06-05 14:07:50 +08:00 |
|
caoqianming
|
a54030e9c0
|
feat: 获取子集的性能优化及删除提示
|
2024-06-05 12:50:47 +08:00 |
|
caoqianming
|
7b1013ea64
|
fix: 完善父子关系parent_link处理
|
2024-06-05 12:49:52 +08:00 |
|
caoqianming
|
a590eb298b
|
feat: base 增加parentmodel
|
2024-06-05 10:24:38 +08:00 |
|
caoqianming
|
2d7f1152ff
|
fix: 只继承CustomGenericViewSet的设置perms_map为{}2
|
2024-06-05 10:24:18 +08:00 |
|
caoqianming
|
9c8d58c35c
|
fix: 解决swagger显示错误
|
2024-06-05 09:31:51 +08:00 |
|
caoqianming
|
14e421dd5b
|
fix: 只继承CustomGenericViewSet的设置perms_map为{}
|
2024-06-05 09:31:29 +08:00 |
|
caoqianming
|
5b8b262e42
|
feat: base 在第一次实例化时添加权限标识
|
2024-06-05 09:27:33 +08:00 |
|
caoqianming
|
e656f3e542
|
feat: edu接口完善
|
2024-06-05 08:36:30 +08:00 |
|
caoqianming
|
8548004690
|
fix: 用于混料的原料不与车间库存交互
|
2024-06-04 09:11:06 +08:00 |
|
caoqianming
|
4f6610c821
|
feat: 添加questioncat_name字段
|
2024-06-03 17:42:08 +08:00 |
|
caoqianming
|
db39aa6519
|
feat: 添加examlist can_attend返回
|
2024-06-03 17:41:46 +08:00 |
|
caoqianming
|
57acaa2e06
|
feat: examserializer增加返回数据
|
2024-06-03 10:08:25 +08:00 |
|
caoqianming
|
f5428febf3
|
feat: 增加examdetail serializer
|
2024-06-03 08:40:28 +08:00 |
|
caoqianming
|
62b012b690
|
feat: base 增加get_queryset_custom
|
2024-06-03 08:36:02 +08:00 |
|
caoqianming
|
e695543932
|
doc: CustomListmixin添加注释
|
2024-05-31 18:59:32 +08:00 |
|
caoqianming
|
ac49088efa
|
feat: 暂时去除多余的paper_json字段
|
2024-05-31 18:26:47 +08:00 |
|
caoqianming
|
84eaf31fff
|
feat: examserializer添加字段
|
2024-05-31 18:26:24 +08:00 |
|
caoqianming
|
bbee8defa8
|
feat: 修改drain字段属性
|
2024-05-31 16:39:25 +08:00 |
|
caoqianming
|
49f3341a01
|
feat: 添加edu模块
|
2024-05-31 15:42:15 +08:00 |
|
caoqianming
|
0fcecf9a64
|
feat: base 增加了baseserializermixin
|
2024-05-31 14:12:08 +08:00 |
|
caoqianming
|
0473be4d30
|
feat: 检验撤回test_date在count_notok时直接置空
|
2024-05-30 10:55:13 +08:00 |
|
caoqianming
|
458385c0f6
|
feat: material增加count_mb字段
|
2024-05-28 14:29:20 +08:00 |
|
caoqianming
|
2ac4f5b04f
|
refector: get_analyse_data_mgroups_duration 增加run_hour返回
|
2024-05-22 17:11:46 +08:00 |
|
caoqianming
|
8627d5f9dc
|
feat: 增加工段数据按任意时间范围分析
|
2024-05-22 17:04:51 +08:00 |
|
caoqianming
|
bf5df19a59
|
feat: mlog添加两个不合格项目
|
2024-05-22 14:53:46 +08:00 |
|
caoqianming
|
7819aa5b5e
|
feat: stlog的sflog的cascad改一下
|
2024-05-21 18:18:13 +08:00 |
|
caoqianming
|
dd5b88e300
|
feat: 增加吨熟料电耗计算功能
|
2024-05-21 18:17:51 +08:00 |
|
caoqianming
|
138d202a28
|
fix: 监测工段是否运行的bug2去除多余逻辑
|
2024-05-21 17:59:11 +08:00 |
|
caoqianming
|
34386ae26d
|
fix: 监测工段是否运行的bug去除多余逻辑
|
2024-05-21 17:47:18 +08:00 |
|
caoqianming
|
5e8bdcf1a8
|
fix: 监测工段是否运行的bug
|
2024-05-21 17:44:03 +08:00 |
|
caoqianming
|
f66cd0f277
|
feat: base 优化邮件报错频率过高自动屏蔽else未处理
|
2024-05-21 15:07:13 +08:00 |
|
caoqianming
|
a7d7a312f8
|
feat: base 优化邮件报错频率过高自动屏蔽
|
2024-05-21 15:00:13 +08:00 |
|
caoqianming
|
e8ced88547
|
feat: 邮件报错频率过高自动屏蔽2
|
2024-05-21 14:48:28 +08:00 |
|
caoqianming
|
5e905519bf
|
feat: 邮件报错频率过高自动屏蔽
|
2024-05-21 14:46:06 +08:00 |
|
caoqianming
|
2ed77b9f0f
|
feat: base task_error携带self.name
|
2024-05-21 13:49:38 +08:00 |
|
caoqianming
|
cdfa35851d
|
feat: 算总煤耗时month_s以day_s相加
|
2024-05-21 11:34:23 +08:00 |
|
caoqianming
|
617013f299
|
fix: sflog展示run_hour
|
2024-05-17 09:16:45 +08:00 |
|
caoqianming
|
32c1647b9b
|
feat: sflog展示run_hour
|
2024-05-17 09:13:10 +08:00 |
|
caoqianming
|
bd33a33ed6
|
fix: get_pcoal_heat 逻辑严谨
|
2024-05-16 17:18:17 +08:00 |
|
caoqianming
|
a90396099b
|
fix: 更新煤粉热值触发计算的bug3
|
2024-05-16 16:57:00 +08:00 |
|
caoqianming
|
9a1074caf8
|
fix: 更新煤粉热值触发计算的bug
|
2024-05-16 16:48:42 +08:00 |
|
caoqianming
|
5093eb7b29
|
feat: 更新煤粉热值触发计算的bug
|
2024-05-16 16:26:33 +08:00 |
|
caoqianming
|
e81cfbe10d
|
fix: month_st 需提前返回
|
2024-05-16 14:18:12 +08:00 |
|
caoqianming
|
9e15b34ed7
|
fix: month_st 需提前返回
|
2024-05-16 13:15:13 +08:00 |
|
caoqianming
|
924c5d09b1
|
fix: 计算month_st时必须有sflog
|
2024-05-16 12:34:26 +08:00 |
|
caoqianming
|
f836def404
|
fix: mpoitstat correct 时除0错误
|
2024-05-16 11:34:06 +08:00 |
|
caoqianming
|
f10cf8d67d
|
fix: mpoitstat correct 时save 出错
|
2024-05-16 11:29:57 +08:00 |
|
caoqianming
|
1574499874
|
fix: mpoitstat correct 时调用错误3
|
2024-05-16 11:27:27 +08:00 |
|
caoqianming
|
ee77a60d32
|
fix: mpoitstat correct 时调用错误2
|
2024-05-16 11:21:20 +08:00 |
|
caoqianming
|
4d65407e39
|
fix: mpoitstat correct 时调用错误
|
2024-05-16 11:21:07 +08:00 |
|
caoqianming
|
6bb6a2d2d7
|
fix: mpointstat correct功能传参错误
|
2024-05-16 10:50:15 +08:00 |
|
caoqianming
|
413ac262af
|
feat: mpointstat 增加correct功能
|
2024-05-16 10:24:33 +08:00 |
|
caoqianming
|
e1172c2fcf
|
feat: SfLogExp添加约束及cal_exp_duration_sec优化
|
2024-05-15 12:59:12 +08:00 |
|
caoqianming
|
5a07b6f889
|
fix: set_eq_rs 逻辑缺陷2
|
2024-05-15 11:18:02 +08:00 |
|
caoqianming
|
ff05151ce2
|
fix: set_eq_rs 逻辑缺陷
|
2024-05-15 11:04:47 +08:00 |
|
caoqianming
|
ff4984831e
|
doc: 注释修改
|
2024-05-15 10:41:39 +08:00 |
|
caoqianming
|
3d6adedb8c
|
feat: hour计数改为sec计数 步骤3移除字段
|
2024-05-15 10:40:46 +08:00 |
|
caoqianming
|
b4b3d6eadc
|
feat: hour计数改为sec计数 步骤2
|
2024-05-15 10:31:17 +08:00 |
|
caoqianming
|
8753994468
|
fix: hour计数改为sec计数 make_sflogs 的bug
|
2024-05-15 10:14:57 +08:00 |
|
caoqianming
|
a3f5e48b8c
|
feat: hour计数改为sec计数
|
2024-05-15 10:06:49 +08:00 |
|
caoqianming
|
e6fb2c8c72
|
feat: base 增加is_close函数
|
2024-05-15 08:30:10 +08:00 |
|
caoqianming
|
5aee3282aa
|
fix: set_eq_rs 优先ep_monitored_id
|
2024-05-14 15:45:42 +08:00 |
|
caoqianming
|
6ba99f119a
|
fix: 更新所监测设备测点的total_production筛选条件错误
|
2024-05-14 13:53:23 +08:00 |
|
caoqianming
|
7f1dbda3b0
|
feat: mpointstat增加查询条件
|
2024-05-14 13:26:11 +08:00 |
|
caoqianming
|
3fc8e17266
|
feat: stlog添加约束
|
2024-05-13 23:06:47 +08:00 |
|
caoqianming
|
da444f720d
|
fix: 设备运行状态set_eq_rs先belong后mointored 2
|
2024-05-13 22:33:14 +08:00 |
|
caoqianming
|
c434e94205
|
fix: 设备运行状态set_eq_rs先belong后mointored
|
2024-05-13 22:19:27 +08:00 |
|
caoqianming
|
41370ee971
|
fix: 更新所监测设备测点的total_production的除0问题2
|
2024-05-13 18:25:23 +08:00 |
|
caoqianming
|
c2933a795a
|
fix: 更新所监测设备测点的total_production的除0问题
|
2024-05-13 18:10:34 +08:00 |
|
caoqianming
|
a2ff2c0a2c
|
fix: 去除所有exception只保留zerodi
|
2024-05-13 16:37:39 +08:00 |
|
caoqianming
|
89d9ac84d8
|
fix: ['sum']时要注意none值
|
2024-05-13 16:30:15 +08:00 |
|
caoqianming
|
c68feb4c8b
|
fix: 更新所监测设备测点的total_production
|
2024-05-13 16:08:41 +08:00 |
|
caoqianming
|
52d9407346
|
feat: 班次表增加排序
|
2024-05-13 09:39:15 +08:00 |
|
caoqianming
|
9fe86eeb63
|
feat: envdata create时忽略IntegrityError
|
2024-05-11 16:35:52 +08:00 |
|
caoqianming
|
77434b0ec8
|
feat: envdata create时忽略IntegrityError
|
2024-05-11 16:34:02 +08:00 |
|
caoqianming
|
2647992b42
|
feat: envdata增加氨逃逸字段
|
2024-05-11 15:40:50 +08:00 |
|
caoqianming
|
829e0b59f3
|
fix: cal_mpointstat_manual sum 获取bug
|
2024-05-11 12:33:46 +08:00 |
|
caoqianming
|
2c6d586d85
|
fix: 测点更新设备状态修复
|
2024-05-11 11:23:24 +08:00 |
|
caoqianming
|
99ef705529
|
fix: insert_mplogx_from_king_rest_chunk envdata save
|
2024-05-11 11:01:32 +08:00 |
|
caoqianming
|
f6f342e552
|
feat: mpointview增加查询条件
|
2024-05-11 10:18:27 +08:00 |
|
caoqianming
|
69e75cc1d7
|
feat: mpointstat手动录入在create时校验唯一
|
2024-05-10 16:38:42 +08:00 |
|
caoqianming
|
d5b5014bf9
|
fix: cal_mpointstat_manual传参错误
|
2024-05-10 16:25:01 +08:00 |
|
caoqianming
|
978b939ea1
|
feat: cal_mpointstats指定测点的优化
|
2024-05-10 16:11:37 +08:00 |
|
caoqianming
|
20e9ac451a
|
fix: 标煤耗计算修改3
|
2024-05-10 15:51:13 +08:00 |
|
caoqianming
|
489d4bb6e5
|
fix: 标煤耗计算修改2
|
2024-05-10 15:45:58 +08:00 |
|
caoqianming
|
5b4742f181
|
fix: 标煤耗计算修改
|
2024-05-10 15:41:09 +08:00 |
|
caoqianming
|
0e273a35c6
|
fix: 一些调整
|
2024-05-10 13:52:34 +08:00 |
|
caoqianming
|
295a971000
|
fix: ZeroDivisionError 时要把属性值反设为0
|
2024-05-10 13:33:47 +08:00 |
|
caoqianming
|
7c087024c9
|
feat: cal_mpointstats可指定cal_attrs
|
2024-05-10 13:17:02 +08:00 |
|
caoqianming
|
4e4e923476
|
feat: cal_mpointstats支持传入指定测点集
|
2024-05-10 13:04:52 +08:00 |
|
caoqianming
|
10024f0d05
|
feat: 增加吨熟料发电量及计算
|
2024-05-10 11:17:15 +08:00 |
|
caoqianming
|
43aa4c83a8
|
feat: 增加吨熟料发电量及计算
|
2024-05-10 11:17:05 +08:00 |
|
caoqianming
|
ebccaa2a50
|
feat: customlist替代listmixin
|
2024-05-10 09:13:08 +08:00 |
|
caoqianming
|
ac524778e3
|
feat: base 使用custommodelmixin替代listmodelmixin以定制返回数据
|
2024-05-10 09:11:33 +08:00 |
|
caoqianming
|
a9b2d67302
|
feat: mpointview增加查询条件
|
2024-05-10 08:52:12 +08:00 |
|
caoqianming
|
72e8129619
|
feat: mpointstat增加查询条件
|
2024-05-09 15:22:11 +08:00 |
|
caoqianming
|
bc4bc5b132
|
fix: enm 班统计错误处理
|
2024-05-09 14:41:40 +08:00 |
|
caoqianming
|
186c7ebf7c
|
fix: 清零处理时的逻辑bug
|
2024-05-09 11:37:24 +08:00 |
|
caoqianming
|
d01f12aa3f
|
fix: production_hour 计算错误
|
2024-05-09 10:09:23 +08:00 |
|
caoqianming
|
972b460a9f
|
feat: cal_mpointstat增加cal_exp_duration_hour 的前置处理
|
2024-05-08 16:34:25 +08:00 |
|
caoqianming
|
2e67f7c468
|
fix: cal_exp_duration_hour 默认一个参数值
|
2024-05-08 16:32:00 +08:00 |
|
caoqianming
|
b22058d0bb
|
feat: cal_exp_duration_hour 添加参数以做测试
|
2024-05-08 16:07:03 +08:00 |
|
caoqianming
|
035b9b392a
|
fix: get_pcoal_heat 时以work_date为准
|
2024-05-08 16:06:08 +08:00 |
|
caoqianming
|
757c3f4ad8
|
fix: get_total_hour_now_and_shut_hour查询条件用work_date替换
|
2024-05-08 15:58:08 +08:00 |
|
caoqianming
|
30974d90b0
|
feat: 移除mgroups_allocate字段
|
2024-05-08 12:09:21 +08:00 |
|
caoqianming
|
895b8c1810
|
fix: mpointcache set时更新设备状态的优化
|
2024-05-08 09:11:42 +08:00 |
|
caoqianming
|
8321a3272e
|
refector: 去除set_eq_rs打的日志
|
2024-05-07 18:21:03 +08:00 |
|
caoqianming
|
451e1e7eae
|
feat: 先打一个日志看看啥情况
|
2024-05-07 18:08:28 +08:00 |
|
caoqianming
|
1cb9b3495a
|
feat: mpoitstatserializer增加mpoint_nickname返回
|
2024-05-07 13:50:13 +08:00 |
|
caoqianming
|
ec9260f353
|
feat: mpointstat增加排序条件
|
2024-05-07 13:37:10 +08:00 |
|
caoqianming
|
03e073e00a
|
feat: mpointstat增加查询条件
|
2024-05-07 13:19:59 +08:00 |
|
caoqianming
|
25965c7072
|
fix: transfer_mpoint_val_to_ep_running_state 对expr_str的replace
|
2024-05-07 13:07:52 +08:00 |
|
caoqianming
|
52fc0c6bd3
|
fix: translate_eval_formula enm_lhxs的处理
|
2024-05-07 11:09:19 +08:00 |
|
caoqianming
|
ce38c3e338
|
fix: get_total_hour_now exclude 错误
|
2024-05-07 10:16:22 +08:00 |
|
caoqianming
|
6ee42a6993
|
fix: get_total_hour_now默认参数为空
|
2024-05-07 10:00:24 +08:00 |
|
caoqianming
|
02a8693a65
|
fix: cal_enstat前调用一下get_total_hour_now
|
2024-05-07 09:58:32 +08:00 |
|
caoqianming
|
35d6d7beb9
|
feat: 监控测点掉线函数优化
|
2024-05-06 18:33:16 +08:00 |
|
caoqianming
|
cb1576b797
|
fix: 尝试修改信号量计算测点
|
2024-05-06 18:13:32 +08:00 |
|
caoqianming
|
d73cc1af5b
|
feat: 料耗系数可用于测点
|
2024-05-06 16:14:35 +08:00 |
|
caoqianming
|
6ae849150f
|
fix: cache_key mpoint保留
|
2024-05-06 00:10:47 +08:00 |
|
caoqianming
|
6cd255173f
|
refector: 改mpoint的处理逻辑添加mpoint_affect支持并重构部分代码
|
2024-05-06 00:06:08 +08:00 |
|
caoqianming
|
a46cfe59ed
|
feat: 添加mpoint_affect字段
|
2024-05-06 00:05:24 +08:00 |
|
caoqianming
|
a1999fb53d
|
fix: 上个改动没有必要现在回退
|
2024-05-02 00:33:57 +08:00 |
|
caoqianming
|
ca15092c5c
|
feat: shutdown_or_startup 如果不是工段不用关心其开停
|
2024-05-02 00:25:37 +08:00 |
|
caoqianming
|
634884f336
|
doc: 增加注释
|
2024-05-02 00:02:41 +08:00 |
|
caoqianming
|
6ea5e0b5d7
|
fix: make_sflogs当天班生成缺少的bug
|
2024-05-02 00:01:47 +08:00 |
|
caoqianming
|
2263c0decb
|
fix: 如果结束时间为0点则取开始时间来返回年月日2
|
2024-04-30 19:00:19 +08:00 |
|
caoqianming
|
a6914413f7
|
fix: 如果结束时间为0点则取开始时间来返回年月日
|
2024-04-30 18:20:31 +08:00 |
|
caoqianming
|
69db9db180
|
fix: 全厂电量计算enstat2.elec_consume拿不到默认0,3
|
2024-04-30 18:01:15 +08:00 |
|
caoqianming
|
a7d03321d8
|
fix: 全厂电量计算enstat2.elec_consume拿不到默认0,2
|
2024-04-30 17:49:53 +08:00 |
|
caoqianming
|
94c34480ec
|
fix: 全厂电量计算enstat2.elec_consume拿不到默认0
|
2024-04-30 17:39:57 +08:00 |
|
caoqianming
|
59c000670a
|
fix: 全厂电量计算bug
|
2024-04-30 16:53:06 +08:00 |
|
caoqianming
|
cb766247b0
|
fix: water_consume
|
2024-04-30 16:23:57 +08:00 |
|
caoqianming
|
5f20247818
|
feat: 添加一个log排查逻辑错误
|
2024-04-30 14:21:09 +08:00 |
|
caoqianming
|
dddab37c63
|
fix: get_sflog 取的时候与happen_time对比错误
|
2024-04-30 12:59:38 +08:00 |
|
caoqianming
|
90ed2927e6
|
feat: cal_mpointstat_hour 添加一个日志
|
2024-04-30 12:39:43 +08:00 |
|
caoqianming
|
1e8e4c6f70
|
refector: formular无需用$符号
|
2024-04-30 11:01:56 +08:00 |
|
caoqianming
|
5f67673c45
|
feat: base 完整的task on_failure日志记录和邮件推送
|
2024-04-29 21:46:49 +08:00 |
|
caoqianming
|
513d37e9ac
|
feat: base 完整的task on_failure日志记录和邮件推送
|
2024-04-29 21:45:35 +08:00 |
|
caoqianming
|
3a0d229ec0
|
feat: mpoint view增加查询条件
|
2024-04-29 21:31:28 +08:00 |
|
caoqianming
|
9c9164b176
|
fix: translate_eval_formula 执行时不try
|
2024-04-29 21:28:29 +08:00 |
|
caoqianming
|
836c2a2baf
|
fix: translate_eval_formula bug2
|
2024-04-29 17:29:04 +08:00 |
|
caoqianming
|
2e4f6f0445
|
fix: translate_eval_formula bug
|
2024-04-29 16:52:01 +08:00 |
|
caoqianming
|
48c6ad53b9
|
fix: 计算统计测点的时候按顺序计算
|
2024-04-29 16:15:11 +08:00 |
|
caoqianming
|
3fcb015fdd
|
feat: 添加多个函数来监测测点、设备、工段的运行或离线状态
|
2024-04-29 14:45:11 +08:00 |
|
caoqianming
|
408bb37b67
|
fix: is_runing字段错误
|
2024-04-29 14:43:45 +08:00 |
|
caoqianming
|
a26656109c
|
feat: 优化mpointstat计算点选择
|
2024-04-29 12:53:55 +08:00 |
|
caoqianming
|
32a1cd08d0
|
feat: check offline 关于mgroup更完善
|
2024-04-29 10:21:22 +08:00 |
|
caoqianming
|
d720dc9c9b
|
fix: mgroup is_running字段更改2
|
2024-04-29 10:17:42 +08:00 |
|
caoqianming
|
fa6d6da1d2
|
fix: mgroup is_running字段更改
|
2024-04-29 10:17:31 +08:00 |
|
caoqianming
|
1f227c7645
|
feat: 优化shutdown_or_startup导致的并发存库问题
|
2024-04-28 18:22:25 +08:00 |
|
caoqianming
|
61e84bd302
|
feat: mpoint增加查询条件need_display
|
2024-04-28 17:52:12 +08:00 |
|
caoqianming
|
df5a6d5d96
|
feat: 生成值班记录只对工段
|
2024-04-28 17:50:44 +08:00 |
|
caoqianming
|
5b1575bca0
|
fix: update_mpoint_cache 更新设备信号的bug
|
2024-04-28 15:25:08 +08:00 |
|
caoqianming
|
13adb0d4ea
|
feat: 添加一处log以定位问题
|
2024-04-28 15:19:32 +08:00 |
|
caoqianming
|
107f0fc61d
|
fix: 监控掉线的bug
|
2024-04-28 15:07:17 +08:00 |
|
caoqianming
|
85fce01834
|
fix: shutdown_or_startup 启动
|
2024-04-28 14:56:27 +08:00 |
|
caoqianming
|
601bb0ae60
|
fix: set_eq_rs 更新设备状态忘记传参数
|
2024-04-28 14:45:28 +08:00 |
|
caoqianming
|
ece11699f8
|
feat: sflogexp返回更多信息
|
2024-04-28 13:32:53 +08:00 |
|
caoqianming
|
acad9c6acf
|
fix: stlog create时validate3
|
2024-04-28 13:10:01 +08:00 |
|
caoqianming
|
8375345e56
|
fix: stlog create时validate2
|
2024-04-28 11:30:05 +08:00 |
|
caoqianming
|
05f675f610
|
fix: stlog create时validate
|
2024-04-28 11:26:55 +08:00 |
|
caoqianming
|
b803cac69f
|
fix: 测点orderingbug
|
2024-04-28 10:10:49 +08:00 |
|
caoqianming
|
6f98d9dfb3
|
fix: stlog validate total_secondsbug
|
2024-04-28 10:04:30 +08:00 |
|
caoqianming
|
d01bb012b9
|
fix: 异常值班处理的权限
|
2024-04-28 09:35:16 +08:00 |
|
caoqianming
|
c179d91ebd
|
feat: 采集逻辑优化
|
2024-04-28 09:34:33 +08:00 |
|
caoqianming
|
9805b471d4
|
feat: 添加料耗系数
|
2024-04-26 15:24:42 +08:00 |
|
caoqianming
|
7642f23423
|
fix: return self.request
|
2024-04-26 10:47:55 +08:00 |
|
caoqianming
|
070ccd72f4
|
fix: insert_mplogx_item忽略唯一性插入错误
|
2024-04-26 10:31:55 +08:00 |
|
caoqianming
|
a4cecb86cb
|
fix: king request 6
|
2024-04-25 21:46:18 +08:00 |
|
caoqianming
|
932ef2d2c8
|
fix: king request 6
|
2024-04-25 21:37:58 +08:00 |
|
caoqianming
|
dd61b1ba01
|
fix: king request 5
|
2024-04-25 20:54:35 +08:00 |
|
caoqianming
|
4004278f31
|
fix: kingClient get_token request 4
|
2024-04-25 18:43:44 +08:00 |
|
caoqianming
|
1a2baa82d9
|
fix: kingClient get_token request 3
|
2024-04-25 18:35:33 +08:00 |
|
caoqianming
|
41c79c1fdd
|
fix: kingClient get_token request 2
|
2024-04-25 18:25:38 +08:00 |
|
caoqianming
|
facecacc38
|
fix: kingClient get_token request
|
2024-04-25 18:05:02 +08:00 |
|
caoqianming
|
00e3129751
|
feat: 设备运行状态的缓存优化
|
2024-04-25 15:12:39 +08:00 |
|
caoqianming
|
7d8585856d
|
feat: kingclient优化
|
2024-04-25 14:59:46 +08:00 |
|
caoqianming
|
9600e95272
|
fix: check_equipment_offline后需更新缓存
|
2024-04-25 13:45:07 +08:00 |
|
caoqianming
|
8b8b65c8ba
|
fix: kingclient err_detail记录错误
|
2024-04-25 13:01:53 +08:00 |
|
caoqianming
|
bf3b61413a
|
fix: kingclient logout不抛出异常只记录日志
|
2024-04-25 12:50:02 +08:00 |
|
caoqianming
|
f1e1ae5dc6
|
feat: kingClient登录优化
|
2024-04-25 12:34:56 +08:00 |
|
caoqianming
|
0c6fe5e37c
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-04-25 12:24:36 +08:00 |
|
caoqianming
|
9164464b10
|
fix: kingclient get_token问题
|
2024-04-25 12:24:34 +08:00 |
|
caoqianming
|
8cb9cfb849
|
feat: set_equip_rs
|
2024-04-25 00:02:20 +08:00 |
|
caoqianming
|
53b1ceafa0
|
feat: ctask_run delay执行及相应优化
|
2024-04-24 23:54:35 +08:00 |
|
caoqianming
|
c834f996f5
|
fix: 获取val_mrs错误
|
2024-04-24 18:32:30 +08:00 |
|
caoqianming
|
4ff503f1b0
|
fix: update_mpoint_cache state变动或超时更新设备运行状态2
|
2024-04-24 18:20:39 +08:00 |
|
caoqianming
|
ecb95da787
|
fix: update_mpoint_cache state变动或超时更新设备运行状态
|
2024-04-24 18:13:21 +08:00 |
|
caoqianming
|
4c3fa8acac
|
fix: update_mpoint_cache 更新错误
|
2024-04-24 18:07:45 +08:00 |
|
caoqianming
|
14bcf0833f
|
feat: 通过restful获取测点值
|
2024-04-24 17:57:31 +08:00 |
|
caoqianming
|
53ce0ea0f7
|
feat: runningstate统一修改
|
2024-04-24 16:23:13 +08:00 |
|
caoqianming
|
7b83cd1095
|
refector: 检验撤回根据count_notok进行update_mb
|
2024-04-24 16:22:36 +08:00 |
|
caoqianming
|
e33b4e5902
|
fix: dahua_enabled通过getattr获取
|
2024-04-24 15:55:58 +08:00 |
|
caoqianming
|
f3c5698283
|
feat: 优化cal_mpointstat_hour支持float int
|
2024-04-24 15:00:08 +08:00 |
|
caoqianming
|
86053bed93
|
feat: mpoint增加是否可手动录入的字段
|
2024-04-24 14:59:37 +08:00 |
|
caoqianming
|
54fc93de73
|
feat: 根据测点采集监测设备是否掉线使用celery
|
2024-04-23 16:56:08 +08:00 |
|
caoqianming
|
c1d55ce618
|
fix: rename mplogx to val_mrs
|
2024-04-23 16:28:26 +08:00 |
|
caoqianming
|
339fc639e8
|
fix: king insert mplogx 参数1获取
|
2024-04-23 16:18:50 +08:00 |
|
caoqianming
|
41cd2f343d
|
fix: king self._get_token bug
|
2024-04-23 16:13:04 +08:00 |
|
caoqianming
|
1a80031d6e
|
fix: 亚控请求修改2
|
2024-04-23 15:03:35 +08:00 |
|
caoqianming
|
8fe2069948
|
fix: 亚控请求修改
|
2024-04-23 15:00:49 +08:00 |
|
caoqianming
|
22e5ff6180
|
refector: 检验撤回的优化
|
2024-04-23 09:13:21 +08:00 |
|
caoqianming
|
aecec48002
|
fix: mpoint_last_timex 处理的优化
|
2024-04-22 15:30:42 +08:00 |
|
caoqianming
|
45fda773ab
|
fix: mqtt插入数据时需校验enabled
|
2024-04-22 15:23:24 +08:00 |
|
caoqianming
|
6f8ab25b5c
|
feat: 增加半成品检验撤回功能
|
2024-04-22 11:14:53 +08:00 |
|
caoqianming
|
e0d4c4beff
|
feat: base wxmp, wx无需显示在conf指定
|
2024-04-19 16:28:05 +08:00 |
|
caoqianming
|
3e56fa7390
|
feat: 物料删除时进行校验和相应的数据矫正
|
2024-04-19 14:32:06 +08:00 |
|
caoqianming
|
196209d60c
|
feat: 支持多种开停信号联动
|
2024-04-19 13:03:30 +08:00 |
|
caoqianming
|
a8fb69d747
|
fix: 去除mpoint无用字段及相应逻辑变动
|
2024-04-18 15:01:18 +08:00 |
|
caoqianming
|
aee63ef771
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-04-18 13:46:59 +08:00 |
|
caoqianming
|
17953a42aa
|
style: 代码格式化
|
2024-04-18 13:46:58 +08:00 |
|
caoqianming
|
f7d5375a5f
|
fix: 优化物料批次导入
|
2024-04-17 22:46:05 +08:00 |
|
caoqianming
|
92bf0ac29e
|
fix: enp drain2serializer sql查询优化
|
2024-04-17 11:18:15 +08:00 |
|
caoqianming
|
fdc7ceff8d
|
fix: 优化模拟数据生成generate_envdata
|
2024-04-16 15:23:27 +08:00 |
|
caoqianming
|
ff035096e5
|
feat: update mplogx表结构
|
2024-04-16 15:11:40 +08:00 |
|
caoqianming
|
dfaed5e5e5
|
feat: 采集逻辑整体重构
|
2024-04-16 15:03:59 +08:00 |
|
caoqianming
|
10632d9cae
|
fix: 启动时无需缓存测点
|
2024-04-16 15:02:53 +08:00 |
|
caoqianming
|
f9fc6f9d96
|
feat: equipment字段增加
|
2024-04-16 15:02:27 +08:00 |
|
caoqianming
|
86e9bf6776
|
feat: 设备运行状态改变触发函数
|
2024-04-16 15:02:07 +08:00 |
|
caoqianming
|
e78511b556
|
style: 格式调整
|
2024-04-16 15:01:33 +08:00 |
|
caoqianming
|
640d1a1bce
|
fix: 去除is_online字段引发的变动
|
2024-04-16 14:59:07 +08:00 |
|
caoqianming
|
6e84e70852
|
fix: 生成envdata数据2
|
2024-04-16 14:47:05 +08:00 |
|
caoqianming
|
67c0777fc9
|
fix: 生成envdata数据
|
2024-04-16 14:41:15 +08:00 |
|
caoqianming
|
153fca308e
|
feat: base systemuser增加筛选条件
|
2024-04-12 16:43:48 +08:00 |
|
caoqianming
|
35387a8333
|
fix: envdata list filter bug
|
2024-04-12 16:38:24 +08:00 |
|
caoqianming
|
13c63a7aff
|
feat: 调整独立运行的scripts的文件位置
|
2024-04-12 10:40:05 +08:00 |
|
caoqianming
|
2ea048cc53
|
fix: mqtt 包引入调整
|
2024-04-11 21:31:49 +08:00 |
|
caoqianming
|
3e75683ee1
|
fix: EnvDataSerializer round处理2
|
2024-04-11 16:59:18 +08:00 |
|
caoqianming
|
68933e3e16
|
fix: EnvDataSerializer round处理
|
2024-04-11 16:57:47 +08:00 |
|
caoqianming
|
99e4079c52
|
fix: equipment evdata add_info_for_list2
|
2024-04-11 16:38:24 +08:00 |
|
caoqianming
|
d191a18f7b
|
fix: equipment evdata add_info_for_list
|
2024-04-11 16:32:52 +08:00 |
|
caoqianming
|
0061285355
|
feat: 变更一下envdata表结构
|
2024-04-11 15:49:44 +08:00 |
|
caoqianming
|
74cbaa8497
|
refector: 修改函数名
|
2024-04-11 15:01:23 +08:00 |
|
caoqianming
|
bd1897f6f6
|
feat: correct_material_cate
|
2024-04-11 11:29:21 +08:00 |
|
caoqianming
|
16417e0016
|
feat: 优化亚控测点批量存库及相应enm逻辑更改
|
2024-04-11 11:08:32 +08:00 |
|
caoqianming
|
6fde78574b
|
fix: base period_dict错误修改
|
2024-04-11 10:59:13 +08:00 |
|
caoqianming
|
0fdb230822
|
feat: mplog视图层转mplogx
|
2024-04-11 10:58:33 +08:00 |
|
caoqianming
|
1139bb6119
|
feat: 优化make_sflog/get_sflog
|
2024-04-11 10:56:32 +08:00 |
|
caoqianming
|
d8de59c3f2
|
feat: base 增加ctask_run将普通函数转celery执行
|
2024-04-11 10:53:39 +08:00 |
|
caoqianming
|
813301e7e1
|
feat: 变更mpoint字段
|
2024-04-11 10:52:13 +08:00 |
|
caoqianming
|
23eac91491
|
feat: enm启动时缓存测点
|
2024-04-11 10:47:06 +08:00 |
|
caoqianming
|
19f6e18154
|
feat: material的count改为对所有库存进行统计
|
2024-04-09 08:40:28 +08:00 |
|
caoqianming
|
9b2dbb8a01
|
feat: 增加矫正correct_material_count的task
|
2024-04-08 18:34:04 +08:00 |
|
caoqianming
|
8c798984f3
|
fix: correct_mb_count_notok
|
2024-04-08 17:08:08 +08:00 |
|
caoqianming
|
fa3452088f
|
fix: correct_mb_count_notok
|
2024-04-08 17:03:48 +08:00 |
|
caoqianming
|
e8802c09b2
|
fix: 矫正mioitem count_notok错误的数据
|
2024-04-08 16:30:28 +08:00 |
|
caoqianming
|
fe19847458
|
feat: mioitem增加扁不合格项字段
|
2024-04-08 13:53:12 +08:00 |
|
caoqianming
|
4f0ef8b4ac
|
feat: kingclient兼容处理
|
2024-04-07 19:15:34 +08:00 |
|
caoqianming
|
3c1319d48f
|
feat: material增加search字段
|
2024-04-07 19:15:10 +08:00 |
|
caoqianming
|
93022f7c40
|
feat: king_sync以d做name
|
2024-04-07 18:34:47 +08:00 |
|
caoqianming
|
c6222c65f6
|
feat: 半成品检验有关库存消耗完的逻辑处理
|
2024-04-07 18:33:40 +08:00 |
|
caoqianming
|
29f085253c
|
fix: MIOPurSerializer添加supplier
|
2024-04-07 15:18:41 +08:00 |
|
caoqianming
|
0cf9f14a5c
|
fix: generate_envdata 优化
|
2024-04-04 01:03:06 +08:00 |
|
caoqianming
|
76f5d12b34
|
feat: envdata生成模拟数据
|
2024-04-03 16:45:33 +08:00 |
|
caoqianming
|
68fc7f4217
|
feat: 生产领料校验优化
|
2024-04-03 09:23:27 +08:00 |
|
caoqianming
|
0b193c6950
|
fix: correct_mb优化
|
2024-04-02 22:39:24 +08:00 |
|
caoqianming
|
2982bccf7f
|
fix: 多了一次save调用
|
2024-04-02 17:22:56 +08:00 |
|
caoqianming
|
759bd3e149
|
feat: mio支持从明细批次号查询
|
2024-04-02 17:19:07 +08:00 |
|
caoqianming
|
c5ae117436
|
feat: mioitem增加划伤字段
|
2024-04-02 17:11:02 +08:00 |
|
caoqianming
|
6254e251d3
|
feat: 生产领料半成品时需校验是否经过检验
|
2024-04-02 17:07:22 +08:00 |
|
caoqianming
|
462a25bb9a
|
feat: 生产入库update_mb时记录production_dept
|
2024-04-02 16:46:13 +08:00 |
|
caoqianming
|
aaa5545c30
|
feat: 增加correct_material_batch以矫正mb
|
2024-04-02 16:14:33 +08:00 |
|
caoqianming
|
3eb7b76095
|
fix: material create指定所到工序校验
|
2024-04-02 16:12:14 +08:00 |
|
caoqianming
|
5078a516d2
|
feat: mlog增加退火后碎字段
|
2024-04-02 15:44:19 +08:00 |
|
caoqianming
|
c8bcbc62c3
|
feat: inm支持小数点后3位
|
2024-04-02 12:27:19 +08:00 |
|
caoqianming
|
bec6644138
|
feat: enm mpoint增加third_info字段
|
2024-04-02 12:07:53 +08:00 |
|
caoqianming
|
2d8f546104
|
fix: cache_mpoints 标注错误
|
2024-04-02 11:40:46 +08:00 |
|
caoqianming
|
7d5b1223d5
|
feat: inm mioitem同步数据库
|
2024-04-02 11:40:07 +08:00 |
|
caoqianming
|
7e18ea572a
|
feat: mioitem添加检验备注等字段
|
2024-04-02 10:21:22 +08:00 |
|
caoqianming
|
567c40e962
|
feat: 完善mqtt获取数据
|
2024-04-02 10:19:17 +08:00 |
|
caoqianming
|
a104191341
|
feat: 从kioserver中获取数据
|
2024-04-02 10:18:42 +08:00 |
|
caoqianming
|
76ccb4dc55
|
feat: 性能测试提供search字段
|
2024-04-01 14:43:22 +08:00 |
|
caoqianming
|
7604ee9af3
|
feat: 更改供应商部分字段可不填
|
2024-03-29 09:44:47 +08:00 |
|
caoqianming
|
356ef262de
|
feat: mpoint增加interval字段
|
2024-03-22 18:22:06 +08:00 |
|
caoqianming
|
4d524e3bf8
|
refector: mqtt优化
|
2024-03-22 18:21:41 +08:00 |
|
caoqianming
|
33dba0a30e
|
refector: 重构一点third中的三方client代码
|
2024-03-22 15:30:00 +08:00 |
|
caoqianming
|
0e0262d170
|
feat: mioitem添加js,qx字段
|
2024-03-22 14:57:06 +08:00 |
|
caoqianming
|
a737343d3a
|
feat: 添加亚控restful接口
|
2024-03-21 18:44:02 +08:00 |
|
caoqianming
|
6e4298873f
|
feat: 增加周预估消耗量字段
|
2024-03-20 17:39:44 +08:00 |
|
caoqianming
|
fd8040b20e
|
feat: bi exec 默认raise_exception
|
2024-03-20 15:24:22 +08:00 |
|
caoqianming
|
de0b1ade8d
|
refector: dataset list 排序
|
2024-03-19 17:13:02 +08:00 |
|
caoqianming
|
bff47cbac3
|
feat: 优化dataset exec
|
2024-03-19 13:23:10 +08:00 |
|
caoqianming
|
f548785014
|
fix: dataset exec query update逻辑变化
|
2024-03-19 13:15:41 +08:00 |
|
caoqianming
|
d05ee1595c
|
feat: bi dataset 表增加字段
|
2024-03-19 11:30:20 +08:00 |
|
caoqianming
|
eaf1a5671f
|
fix: 用于correct utask错误数据
|
2024-03-18 16:29:53 +08:00 |
|
caoqianming
|
f456c7cbc8
|
fix: mtask_submit后不更改utask状态的bug
|
2024-03-18 16:13:04 +08:00 |
|
caoqianming
|
37d8baa875
|
fix: opeation filter暂不支持cates多对多in
|
2024-03-18 10:43:17 +08:00 |
|
caoqianming
|
370ae64299
|
feat: 添加mqtt脚本并增加require
|
2024-03-17 22:14:23 +08:00 |
|
caoqianming
|
077707f493
|
fix: celeryinfo取值错误
|
2024-03-15 16:41:13 +08:00 |
|
caoqianming
|
c0567f5a55
|
feat: 返回redis和celery的一些监控数据
|
2024-03-15 16:01:26 +08:00 |
|
caoqianming
|
966edbacd4
|
feat: 添加celery监控信息2
|
2024-03-13 17:41:16 +08:00 |
|
caoqianming
|
0af253fb0b
|
feat: 添加celery监控信息
|
2024-03-13 17:39:45 +08:00 |
|
caoqianming
|
718f594a4b
|
feat: 添加是否新能源字段
|
2024-03-13 17:39:23 +08:00 |
|
caoqianming
|
38b7d0c586
|
feat: time_20_y 改为6点半
|
2024-03-11 15:38:09 +08:00 |
|
caoqianming
|
a32cefb939
|
feat: operationlist增加筛选条件
|
2024-03-11 09:04:10 +08:00 |
|
caoqianming
|
7eba5a8e13
|
feat: base 从request.data获取page和size
|
2024-03-11 08:45:21 +08:00 |
|
caoqianming
|
779488589a
|
fix: handover_submit针对混料特殊处理的bug3
|
2024-03-06 22:24:11 +08:00 |
|
caoqianming
|
2addfc8433
|
fix: handover_submit针对混料特殊处理的bug2
|
2024-03-06 21:52:55 +08:00 |
|
caoqianming
|
3ddb050330
|
fix: handover_submit针对混料特殊处理的bug
|
2024-03-06 21:45:17 +08:00 |
|
caoqianming
|
b429ad9059
|
fix: 废弃一些接口
|
2024-03-06 18:01:24 +08:00 |
|
caoqianming
|
8a32690395
|
feat: handoverserializer返回更多数据
|
2024-03-06 17:44:50 +08:00 |
|
caoqianming
|
abdee3d2d5
|
feat: 增加wmaterial查询条件
|
2024-03-06 17:21:48 +08:00 |
|
caoqianming
|
4c3610ac25
|
feat: 混料支持车间库存
|
2024-03-06 17:07:51 +08:00 |
|
caoqianming
|
f6db92f815
|
feat: 增加wmaterial查询条件
|
2024-03-06 15:50:29 +08:00 |
|
caoqianming
|
02344da862
|
feat: 增加equipment设备类型
|
2024-03-06 09:53:16 +08:00 |
|
caoqianming
|
0de0489272
|
feat: 增加箱中破不合格字段
|
2024-03-05 10:11:33 +08:00 |
|
caoqianming
|
5c0c016872
|
fix: correct_tuihuo_log矫正退火日志2
|
2024-03-04 15:50:49 +08:00 |
|
caoqianming
|
c1d5ef86f1
|
fix: correct_tuihuo_log矫正退火日志
|
2024-03-04 14:58:36 +08:00 |
|
caoqianming
|
5aab22e9d9
|
fix: 工段删除同时更新route
|
2024-03-04 14:22:22 +08:00 |
|
caoqianming
|
e99854b56f
|
fix: mlog填写时进行更进一步校验
|
2024-03-04 13:54:31 +08:00 |
|
caoqianming
|
eecda9e5a6
|
fix: material导入可更改count_safe
|
2024-03-04 10:44:42 +08:00 |
|
caoqianming
|
70b5a4d87e
|
fix: material unit 忽略大小写2
|
2024-03-04 10:37:33 +08:00 |
|
caoqianming
|
9cd5bfc8f9
|
fix: material unit 忽略大小写
|
2024-03-04 10:25:58 +08:00 |
|
caoqianming
|
fcc613170e
|
feat: 物料信息导入功能
|
2024-03-04 09:58:09 +08:00 |
|
caoqianming
|
1c802eafb1
|
fix: check_same_allow_minute_and_raise_event 判断错误
|
2024-03-02 09:47:53 +08:00 |
|
caoqianming
|
652ee31f6f
|
fix: check_same_allow_minute_and_raise_event 判断错误
|
2024-03-02 09:41:47 +08:00 |
|
caoqianming
|
641c4cefc6
|
fix: snap_and_analyse ecs为空就不创建事件
|
2024-03-02 08:59:47 +08:00 |
|
caoqianming
|
39d69952f1
|
fix: check_same_allow_minute_and_raise_event bug
|
2024-03-01 18:56:49 +08:00 |
|
caoqianming
|
61c8e6ab98
|
feat: ecm提出check_same_allow_minute_and_raise_event方法
|
2024-03-01 18:49:40 +08:00 |
|
caoqianming
|
f51075e1ef
|
feat: 采购入库和销售出库订单可为空
|
2024-03-01 17:36:43 +08:00 |
|
caoqianming
|
373a4999c3
|
fix: materialcreateserializer bug
|
2024-03-01 15:58:04 +08:00 |
|
caoqianming
|
d3ae9d4a79
|
fix: mgroup筛选bug
|
2024-03-01 15:57:19 +08:00 |
|
caoqianming
|
3c87e157de
|
fix: puorder update bug
|
2024-03-01 15:50:50 +08:00 |
|
caoqianming
|
2a3bcc1b33
|
fix: ftest中type设置为必填
|
2024-03-01 15:34:56 +08:00 |
|
caoqianming
|
ab3bcee0f8
|
fix: 生产领料反向操作bug
|
2024-03-01 15:16:19 +08:00 |
|
caoqianming
|
4c75328e67
|
feat: materialbatch默认按update_time倒序排列
|
2024-03-01 15:09:41 +08:00 |
|
caoqianming
|
eef99ed624
|
feat: 出入库操作支持提交后可撤销功能
|
2024-02-29 17:10:50 +08:00 |
|
caoqianming
|
33e661b1dc
|
fix: 调整envdata的字段格式
|
2024-02-28 17:20:49 +08:00 |
|
caoqianming
|
4ddfbb266c
|
fix: em可返回envdata
|
2024-02-28 17:20:28 +08:00 |
|
caoqianming
|
820f316511
|
fix: envdata因未配置ordering触发bug
|
2024-02-28 16:34:48 +08:00 |
|
caoqianming
|
1b6c58e7c8
|
feat: jsonfield默认blank=True
|
2024-02-28 16:19:10 +08:00 |
|
caoqianming
|
983e11af74
|
fix: jsonfield 默认blank=True
|
2024-02-28 16:18:50 +08:00 |
|
caoqianming
|
2e15c8ff31
|
feat: em返回数据可携带环保数据信息
|
2024-02-28 15:02:19 +08:00 |
|
caoqianming
|
d4bf7a7e19
|
perf: 一些性能优化
|
2024-02-28 15:01:52 +08:00 |
|
caoqianming
|
2c2e5bc4cd
|
feat: base 可给list返回数据添加额外信息
|
2024-02-28 15:00:53 +08:00 |
|
caoqianming
|
080c14b5f8
|
feat: 增加drain查询条件
|
2024-02-27 17:41:46 +08:00 |
|
caoqianming
|
7f93c453e6
|
feat: 修改drain2serializer返回数据
|
2024-02-27 15:50:46 +08:00 |
|
caoqianming
|
44c4a34c69
|
feat: 增加drain2serializer返回数据
|
2024-02-27 14:46:28 +08:00 |
|
caoqianming
|
666d317f01
|
feat: carwash增加返回记录
|
2024-02-27 14:31:35 +08:00 |
|
caoqianming
|
bb05ba8c5c
|
feat: 增加DrainEquipEnvSerializer返回数据
|
2024-02-27 10:40:04 +08:00 |
|
caoqianming
|
096650e592
|
feat: emserializer增加返回cate信息
|
2024-02-27 09:20:47 +08:00 |
|
caoqianming
|
31b4af5fbb
|
doc: 增加config查询文档
|
2024-02-27 09:20:27 +08:00 |
|
caoqianming
|
34aaf22650
|
feat: base viewset增加query定制返回参数
|
2024-02-27 09:14:27 +08:00 |
|
caoqianming
|
9d48575be4
|
feat: enp count_cate接口
|
2024-02-26 15:22:36 +08:00 |
|
caoqianming
|
826cb8c8b1
|
feat: count_state统计数据增加
|
2024-02-26 15:22:14 +08:00 |
|
caoqianming
|
b71a8921c3
|
feat: 设备运行状态count统计接口
|
2024-02-26 14:22:43 +08:00 |
|
caoqianming
|
53193650f6
|
feat: 增加ecate筛选条件
|
2024-02-26 10:48:47 +08:00 |
|
caoqianming
|
d2a503c482
|
feat: 增加ecate表
|
2024-02-26 10:31:12 +08:00 |
|
caoqianming
|
e7f8086f23
|
feat: base 提供查询子集数据方法
|
2024-02-26 08:08:47 +08:00 |
|
caoqianming
|
a1ef065e8c
|
feat: base 优化utils queryset查询
|
2024-02-25 21:12:46 +08:00 |
|
caoqianming
|
f252f206ac
|
fix: access_time 错误
|
2024-02-23 13:51:28 +08:00 |
|
caoqianming
|
a00a02bde6
|
feat: 模拟车辆出入厂数据
|
2024-02-23 13:47:11 +08:00 |
|
caoqianming
|
dcaf7b1ca1
|
fix: ftest test_group可以为空
|
2024-02-22 09:41:56 +08:00 |
|
caoqianming
|
2e0f2ec263
|
feat: 设备表增加字段
|
2024-02-22 09:37:11 +08:00 |
|
caoqianming
|
af5a6c3d55
|
feat: 添加drain2serializer
|
2024-02-21 09:54:42 +08:00 |
|
caoqianming
|
46d8bd7ef6
|
feat: 增加设备tags查询
|
2024-02-21 09:54:00 +08:00 |
|
caoqianming
|
c265295159
|
feat: base 增加MyJsonListFilter
|
2024-02-21 09:53:41 +08:00 |
|
caoqianming
|
00dfebd0c9
|
feat: carwash模拟数据
|
2024-02-21 08:56:00 +08:00 |
|
caoqianming
|
8916349240
|
feat: abc!000增加default password
|
2024-02-19 16:36:02 +08:00 |
|
caoqianming
|
1934768b88
|
feat: base 增加DEFAULT_PWD
|
2024-02-19 16:35:22 +08:00 |
|
caoqianming
|
113a8c501f
|
feat: 增加洗车记录
|
2024-02-05 11:05:02 +08:00 |
|
caoqianming
|
4c774399b4
|
fix: 增加drainequip返回数据
|
2024-02-04 16:13:42 +08:00 |
|
caoqianming
|
b8a9ca3782
|
feat: 增加drainequip返回数据
|
2024-02-04 16:10:42 +08:00 |
|
caoqianming
|
dc453433a0
|
fix: drain mrgoup_name
|
2024-02-04 09:25:37 +08:00 |
|
caoqianming
|
887d549e7d
|
fix: enp_envdata migrations
|
2024-02-04 09:20:42 +08:00 |
|
caoqianming
|
ff99772f94
|
feat: drainserializer mgroup_name
|
2024-02-01 18:09:17 +08:00 |
|
caoqianming
|
c2e087acf0
|
feat: EnvDataExportSerializer固定typechoice
|
2024-02-01 14:00:28 +08:00 |
|
caoqianming
|
34f487064b
|
feat: 初步添加envdata数据导出功能
|
2024-02-01 13:57:54 +08:00 |
|
caoqianming
|
0d79685b1e
|
feat: 优化drainequip查询
|
2024-01-31 17:10:31 +08:00 |
|
caoqianming
|
11d7438cb8
|
feat: 优化drainequip查询
|
2024-01-31 17:09:06 +08:00 |
|
caoqianming
|
803affa7ce
|
fix: DrainEquipEnvSerializer增加更完整的返回
|
2024-01-31 16:59:36 +08:00 |
|
caoqianming
|
24020ea122
|
feat: DrainEquipEnvSerializer增加更完整的返回
|
2024-01-31 16:53:40 +08:00 |
|
caoqianming
|
635e9df408
|
feat: 取消attendance联合约束
|
2024-01-31 11:25:59 +08:00 |
|
caoqianming
|
19527f9736
|
feat: 变更attendance查询和排序条件
|
2024-01-31 10:24:40 +08:00 |
|
caoqianming
|
8b2761b027
|
feat: 增加attendance查询和排序条件
|
2024-01-31 10:18:24 +08:00 |
|
caoqianming
|
d6618ce25d
|
fix: 修复可能的attendancecreatebug
|
2024-01-31 10:07:53 +08:00 |
|
caoqianming
|
986e9265d2
|
feat: bi报错信息完善2
|
2024-01-31 09:37:36 +08:00 |
|
caoqianming
|
f050a335cc
|
feat: bi报错信息完善
|
2024-01-30 17:45:53 +08:00 |
|
caoqianming
|
83da22160f
|
fix: enp增加设备编号返回bug
|
2024-01-30 17:03:33 +08:00 |
|
caoqianming
|
17c12cba85
|
feat: enp增加设备编号返回
|
2024-01-30 17:01:02 +08:00 |
|
caoqianming
|
e089a02a32
|
feat: Material create校验是否存在
|
2024-01-29 18:25:10 +08:00 |
|
caoqianming
|
e1fae87bcb
|
feat: 更改物料排序
|
2024-01-29 18:15:57 +08:00 |
|
caoqianming
|
32733e9800
|
fix: materialserializer count只读
|
2024-01-29 18:10:07 +08:00 |
|
caoqianming
|
22978de879
|
feat: enp增加车辆出入记录
|
2024-01-29 16:38:00 +08:00 |
|
caoqianming
|
9ff3ee2040
|
feat: 修改物料清单默认排序
|
2024-01-29 16:00:00 +08:00 |
|
caoqianming
|
1a65e95127
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-01-29 15:57:41 +08:00 |
|
caoqianming
|
c8cc3469e1
|
feat: 物料批次导入功能
|
2024-01-29 15:57:40 +08:00 |
|
caoqianming
|
51893d23e0
|
fix: 去除不必要的print
|
2024-01-28 00:20:17 +08:00 |
|
caoqianming
|
d483bb6b61
|
fix: mlog update时mlogb不更新
|
2024-01-28 00:18:10 +08:00 |
|
caoqianming
|
08f9fa106a
|
feat: ptest增加test_user_name
|
2024-01-25 09:52:29 +08:00 |
|
caoqianming
|
d0b13ac215
|
feat: do_in时增加更完整的提示信息
|
2024-01-25 09:49:37 +08:00 |
|
caoqianming
|
30dbeacdd0
|
fix: 修改mio查询条件以支持materials为空的情况
|
2024-01-25 09:45:12 +08:00 |
|
caoqianming
|
1d2f9f09eb
|
feat: mioviewset prefetch_related_fields优化
|
2024-01-24 12:35:50 +08:00 |
|
caoqianming
|
6cb22744c2
|
fix: 增加materials__type__in筛选
|
2024-01-24 12:31:36 +08:00 |
|
caoqianming
|
4a0f73c783
|
feat: 增加materials 筛选
|
2024-01-24 11:48:33 +08:00 |
|
caoqianming
|
20e209ced2
|
fix: update_mb更新物料库存的bug
|
2024-01-23 18:03:05 +08:00 |
|
caoqianming
|
e81acb7aa7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-01-22 08:27:28 +08:00 |
|
caoqianming
|
ddd0d2a6df
|
feat: enp调整
|
2024-01-22 08:27:27 +08:00 |
|
caoqianming
|
6827b72231
|
feat: base 增加最大获取列表数
|
2024-01-21 00:23:49 +08:00 |
|
caoqianming
|
e193a663c6
|
feat: 取消dataset exec 日志记录及可直接抛出错误
|
2024-01-21 00:06:19 +08:00 |
|
caoqianming
|
6f8c7c0567
|
feat: mlog validate时计算count_notok
|
2024-01-20 23:30:09 +08:00 |
|
caoqianming
|
c88f33ad4d
|
feat: 增加material name查询条件
|
2024-01-19 14:56:48 +08:00 |
|
caoqianming
|
679e6bac4f
|
feat: 增加物料导入功能
|
2024-01-19 14:36:08 +08:00 |
|
caoqianming
|
61801784fc
|
feat: equip增加tags字段
|
2024-01-19 11:37:57 +08:00 |
|
caoqianming
|
318a39c948
|
fix: 成品检验 perform_create的bug
|
2024-01-19 09:57:44 +08:00 |
|
caoqianming
|
387bb66914
|
feat: 增加equip的name contains查询条件
|
2024-01-19 09:45:25 +08:00 |
|
caoqianming
|
ec70aceb76
|
feat: count_sampling 默认为0
|
2024-01-18 15:14:48 +08:00 |
|
caoqianming
|
78fd0c9721
|
feat: 日志撤回后修改任务状态
|
2024-01-18 10:55:41 +08:00 |
|
caoqianming
|
a4d23f534a
|
fix: mlog validate bug
|
2024-01-18 10:27:38 +08:00 |
|
caoqianming
|
67d8ede2a4
|
feat: 计算count_sampling
|
2024-01-17 16:56:07 +08:00 |
|
caoqianming
|
e5ba779b00
|
feat: 增加产品检验
|
2024-01-17 15:55:42 +08:00 |
|
caoqianming
|
c11132e38f
|
feat: 添加drainequip及其返回envdata信息
|
2024-01-15 17:30:29 +08:00 |
|
caoqianming
|
4a6aabd860
|
fix: do_in new_count为0时wm.delete
|
2024-01-12 16:45:07 +08:00 |
|
caoqianming
|
c84ea3bdef
|
feat: 增加timescaledb的支持
|
2024-01-12 14:32:08 +08:00 |
|
caoqianming
|
7ca12228e2
|
feat: 库存减到0时删除该记录
|
2024-01-11 17:56:00 +08:00 |
|
caoqianming
|
90e0513db6
|
refector: 取消未填写mlog的校验，由前端来做
|
2024-01-10 15:46:11 +08:00 |
|
caoqianming
|
c61507c7dd
|
feat: 增加Drain cate help_text
|
2024-01-10 15:35:23 +08:00 |
|
caoqianming
|
4a7a8f98ae
|
feat: 添加enp模块
|
2024-01-10 15:30:02 +08:00 |
|
caoqianming
|
da087ebace
|
fix: base- put config 时update_dict的bug
|
2024-01-10 10:54:58 +08:00 |
|
caoqianming
|
1eec1c24b4
|
feat: base- 基于项目code返回或更改配置信息
|
2024-01-10 10:11:43 +08:00 |
|
caoqianming
|
a905118bdf
|
feat: develop增加项目管理
|
2024-01-10 10:10:31 +08:00 |
|
caoqianming
|
7078aee577
|
feat: 短信发送异常时的返回格式
|
2024-01-04 09:18:24 +08:00 |
|
caoqianming
|
89215d4752
|
feat: 任务停止后日志不可再提交
|
2024-01-04 09:11:53 +08:00 |
|
caoqianming
|
e5bbb48ceb
|
fix: 停止任务的bug
|
2024-01-04 09:07:58 +08:00 |
|
caoqianming
|
ae0832010f
|
feat: MtaskSerializer 返回submit_user_name
|
2023-12-28 18:37:46 +08:00 |
|
caoqianming
|
6165af7c47
|
feat: mlog_submit返回更详细的报错
|
2023-12-28 17:28:46 +08:00 |
|
caoqianming
|
1330b732c0
|
fix: base user phone校验可为空
|
2023-12-28 10:31:19 +08:00 |
|
caoqianming
|
059aee0acf
|
feat: material增加筛选条件
|
2023-12-28 09:55:24 +08:00 |
|
caoqianming
|
a09ae16fa0
|
fix: mtask_submit bug
|
2023-12-27 15:13:18 +08:00 |
|
caoqianming
|
1134fc3809
|
feat: equip增加工段等筛选条件
|
2023-12-27 11:06:05 +08:00 |
|
caoqianming
|
c91533a328
|
feat: mlog增加equipments字段
|
2023-12-27 09:51:04 +08:00 |
|
caoqianming
|
03d6a6c99f
|
fix: mtask_submit时导致重复计算
|
2023-12-27 09:03:12 +08:00 |
|
caoqianming
|
4697f30ef1
|
feat: mioitem返回inout_date
|
2023-12-26 17:18:31 +08:00 |
|
caoqianming
|
48fbcb5e9c
|
feat: mioitem增加inout_date筛选
|
2023-12-26 13:10:42 +08:00 |
|
caoqianming
|
d131741f4b
|
feat: handover返回material_name
|
2023-12-25 13:04:37 +08:00 |
|
caoqianming
|
4f318d823a
|
feat: mio增加item_mio__material__type查询条件
|
2023-12-25 10:18:35 +08:00 |
|
caoqianming
|
ca7dc5c2ba
|
feat: mtask增加查询条件
|
2023-12-25 10:06:35 +08:00 |
|
caoqianming
|
90c7d0e5a1
|
feat: gen_material_out 优化
|
2023-12-23 20:58:31 +08:00 |
|
caoqianming
|
9d3f006017
|
feat: MIOItemerializer返回物料全名
|
2023-12-22 13:58:45 +08:00 |
|
caoqianming
|
93de5ea879
|
feat: wmaterialserializer返回全名
|
2023-12-22 13:47:59 +08:00 |
|
caoqianming
|
c80b486a00
|
feat: equipment_name 返回—的为__str__数据
|
2023-12-22 10:19:25 +08:00 |
|
caoqianming
|
eb4238b1ae
|
feat: 设备返回full_name
|
2023-12-22 10:15:04 +08:00 |
|
caoqianming
|
ecea592a2b
|
feat: 设备增加筛选条件
|
2023-12-21 21:41:09 +08:00 |
|
caoqianming
|
279be7fe9f
|
fix: 矫正员工信息3
|
2023-12-21 12:02:57 +08:00 |
|
caoqianming
|
94e0d006f1
|
fix: 矫正员工信息2
|
2023-12-21 12:00:52 +08:00 |
|
caoqianming
|
dc7cd3844d
|
feat: 矫正员工信息
|
2023-12-21 11:45:18 +08:00 |
|
caoqianming
|
6bfd5ea9c4
|
fix: send_sms因httperror不处理
|
2023-12-21 11:13:48 +08:00 |
|
caoqianming
|
0b20386fcc
|
fix: 取消带-中字样的
|
2023-12-21 09:41:10 +08:00 |
|
caoqianming
|
00c860b001
|
fix: mlog update时mtask, mgroup不可变
|
2023-12-21 08:49:07 +08:00 |
|
caoqianming
|
5c24465a41
|
feat: mtask utask增加返回信息
|
2023-12-21 00:37:34 +08:00 |
|
caoqianming
|
ef2975d05d
|
feat: wmaterial增加筛选条件
|
2023-12-21 00:14:13 +08:00 |
|
caoqianming
|
ec3014d5ee
|
feat: mlog增加返回数据
|
2023-12-20 23:30:27 +08:00 |
|
caoqianming
|
354b76af75
|
fix: equipment的导入的bug
|
2023-12-20 20:51:07 +08:00 |
|
caoqianming
|
b765e87517
|
feat: equipment的导入3
|
2023-12-20 17:17:46 +08:00 |
|
caoqianming
|
6dddf17980
|
feat: equipment的导入2
|
2023-12-20 17:09:35 +08:00 |
|
caoqianming
|
873dda9296
|
feat: equipment的导入
|
2023-12-20 17:02:18 +08:00 |
|
caoqianming
|
0f2d2dbee9
|
feat: 其他生产记录增加查询handle_date
|
2023-12-20 15:17:31 +08:00 |
|
caoqianming
|
85a49c4b0f
|
feat: material 返回 __str__修改
|
2023-12-20 15:05:22 +08:00 |
|
caoqianming
|
570570b517
|
feat: materialserializer 也返回full_name
|
2023-12-20 14:47:11 +08:00 |
|
caoqianming
|
1e6faad79b
|
feat: material_simple_serializer full_name完整信息
|
2023-12-20 14:41:28 +08:00 |
|
caoqianming
|
ea8465cb2e
|
feat: route serializer增加返回数据
|
2023-12-20 14:31:26 +08:00 |
|
caoqianming
|
4ac4da7959
|
fix: get_file_list 默认返回空列表
|
2023-12-19 20:50:20 +08:00 |
|
caoqianming
|
7bfe74b97f
|
feat: pu_orderitem权限修改
|
2023-12-19 17:20:58 +08:00 |
|
caoqianming
|
a9b81849b2
|
fix: opencv在启动时不import
|
2023-12-19 12:40:42 +08:00 |
|
caoqianming
|
0870b13ea3
|
feat: mioitem增加入厂检验
|
2023-12-18 15:52:54 +08:00 |
|
caoqianming
|
043869e828
|
feat: mlog增加不合格原因字段
|
2023-12-18 14:21:56 +08:00 |
|
caoqianming
|
1de76ffc33
|
fix: create_auditlog update不记录的bug
|
2023-12-18 13:24:49 +08:00 |
|
caoqianming
|
0a3e434a7e
|
fix: create_auditlog bug
|
2023-12-18 13:07:49 +08:00 |
|
caoqianming
|
a1e2f12df7
|
fix: compare_lists_of_dicts的bug
|
2023-12-18 13:01:19 +08:00 |
|
caoqianming
|
bf5d62e99d
|
fix: mlog提交时如有mtask则handle_date为mtask日期2
|
2023-12-18 12:25:19 +08:00 |
|
caoqianming
|
6182ef3c58
|
feat: mlog提交时如有mtask则handle_date为mtask日期
|
2023-12-18 11:20:51 +08:00 |
|
caoqianming
|
a9c16c4a9d
|
feat: 日志提交和撤回返回序列化信息
|
2023-12-18 11:12:33 +08:00 |
|
caoqianming
|
94c026f23f
|
feat: create_auditlog bug
|
2023-12-18 10:25:48 +08:00 |
|
caoqianming
|
625074049e
|
feat: mlog日志撤回
|
2023-12-18 09:18:06 +08:00 |
|
caoqianming
|
845a510068
|
fix: mlog撤回1未完成
|
2023-12-18 08:08:42 +08:00 |
|
caoqianming
|
8c43f8ec62
|
fix: handover update validate更严谨一些
|
2023-12-17 19:55:45 +08:00 |
|
caoqianming
|
e954b37404
|
feat: 添加与任务相关的日志信息peifen_kg
|
2023-12-17 19:55:01 +08:00 |
|
caoqianming
|
1b5c910cf8
|
fix: 交接记录的提交bug
|
2023-12-16 13:00:56 +08:00 |
|
caoqianming
|
dff1e412b6
|
feat: 修改material __str__
|
2023-12-16 12:00:20 +08:00 |
|
caoqianming
|
aa2dc2e0fc
|
feat: 增加materialsimpleserializer的返回full_name
|
2023-12-16 11:56:51 +08:00 |
|
caoqianming
|
4f1ae6ddc6
|
fix: mlogsubmit bug
|
2023-12-16 11:46:57 +08:00 |
|
caoqianming
|
bd6b4a5f82
|
fix: gen_by_wm需提供send_mgroup
|
2023-12-16 11:42:38 +08:00 |
|
caoqianming
|
19a53931c4
|
fix: mtask update在已提交状态下只更改peifen_kg bug
|
2023-12-16 10:32:48 +08:00 |
|
caoqianming
|
e5d2d5ef84
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2023-12-16 09:56:48 +08:00 |
|
caoqianming
|
b8b106dc2e
|
feat: mtask update在已提交状态下只更改peifen_kg
|
2023-12-16 09:56:46 +08:00 |
|
caoqianming
|
eadf36c1d1
|
fix: mioitem修改字段名
|
2023-12-15 19:39:17 +08:00 |
|
caoqianming
|
128dc2a7e3
|
feat: utask mtask状态submit调整
|
2023-12-15 09:05:08 +08:00 |
|
caoqianming
|
4916ae5cff
|
feat: audit_log返回增加change_user_name
|
2023-12-14 17:14:29 +08:00 |
|
caoqianming
|
6b6ff7cd3c
|
feat: mlog更新时更新日志
|
2023-12-14 10:36:47 +08:00 |
|
caoqianming
|
768a07a39a
|
feat: mio增加筛选条件
|
2023-12-13 16:08:16 +08:00 |
|
caoqianming
|
ea63c29a69
|
feat: mlog有mtask时固定handle_date
|
2023-12-07 10:55:06 +08:00 |
|
caoqianming
|
179782c73b
|
feat: auditlog增加筛选条件
|
2023-12-07 09:40:13 +08:00 |
|
caoqianming
|
2d8169849f
|
feat: 将mlog添加审计日志
|
2023-12-07 09:39:52 +08:00 |
|
caoqianming
|
ba34b26928
|
feat: 添加审计日志auditlog表
|
2023-12-07 09:38:24 +08:00 |
|
caoqianming
|
d9ddefe5db
|
feat: base 添加了对比字典及其嵌套内容的方法
|
2023-12-07 09:37:54 +08:00 |
|
caoqianming
|
5dab6b0815
|
feat: base 增加了get_model_info
|
2023-12-07 09:37:12 +08:00 |
|
caoqianming
|
33ea769ad4
|
feat: 增加任务类型 mass
|
2023-12-05 17:25:09 +08:00 |
|
caoqianming
|
95f67b6543
|
feat: is_hidden的物料也需要进行车间库存管理
|
2023-12-05 13:02:14 +08:00 |
|
caoqianming
|
7bd8d0dd1f
|
fix: base permission去除数据库约束
|
2023-12-04 08:37:35 +08:00 |
|
caoqianming
|
ac323781eb
|
feat 增加wm查询条件
|
2023-12-01 15:51:32 +08:00 |
|
caoqianming
|
e3c0273e0d
|
feat: 增加material查询条件
|
2023-12-01 15:25:39 +08:00 |
|
caoqianming
|
e3d37c6dfa
|
feat: wm增加查询条件
|
2023-12-01 14:16:06 +08:00 |
|
caoqianming
|
9d847c8d87
|
feat: 采购计划和订单都增加提交人
|
2023-12-01 13:51:40 +08:00 |
|
caoqianming
|
dc8bab86cf
|
feat: puorder增加materials字段
|
2023-12-01 13:40:46 +08:00 |
|
caoqianming
|
dc47570a5b
|
feat: wm增加查询条件
|
2023-12-01 11:33:23 +08:00 |
|
caoqianming
|
c827c7d55d
|
fix: route创建时的校验
|
2023-12-01 10:28:34 +08:00 |
|
caoqianming
|
68c2891839
|
fix: route创建时的校验
|
2023-12-01 09:53:11 +08:00 |
|
caoqianming
|
6dfa2b1696
|
fix: route创建时的校验
|
2023-12-01 09:50:40 +08:00 |
|
caoqianming
|
6e8d78a5e9
|
doc: 增加注释
|
2023-11-30 17:10:42 +08:00 |
|
caoqianming
|
d94424131f
|
feat: materialbatch增加查询条件
|
2023-11-30 17:05:34 +08:00 |
|
caoqianming
|
cc0a2719de
|
feat: mtask增加submit_time
|
2023-11-30 16:30:07 +08:00 |
|
caoqianming
|
3e041ec93b
|
fix: 任务提交接口改为单个提交
|
2023-11-30 16:00:38 +08:00 |
|
caoqianming
|
81e97c4789
|
feat: 日志提交时间校验
|
2023-11-30 14:48:47 +08:00 |
|
caoqianming
|
9dc31b366b
|
fix: handover submit bug
|
2023-11-30 14:14:52 +08:00 |
|
caoqianming
|
73a463dd2f
|
feat: 增加mtask查询条件
|
2023-11-30 13:38:20 +08:00 |
|
caoqianming
|
abb3fef89f
|
feat: 交接记录修改
|
2023-11-30 10:47:38 +08:00 |
|
caoqianming
|
a7ff21bb80
|
fix: handover增加送料工段
|
2023-11-30 10:15:31 +08:00 |
|
caoqianming
|
3a24e6f858
|
feat: handover增加送料工段
|
2023-11-29 16:52:00 +08:00 |
|
caoqianming
|
eb665c7943
|
feat: mlog增加查询条件
|
2023-11-29 16:23:07 +08:00 |
|
caoqianming
|
e07034919d
|
feat: mgroup增加查询条件
|
2023-11-29 16:12:21 +08:00 |
|
caoqianming
|
ab0bc60c23
|
feat: utask增加返回数据
|
2023-11-29 10:57:28 +08:00 |
|
caoqianming
|
d9dcaf0d18
|
feat: 增加查询条件
|
2023-11-29 10:29:02 +08:00 |
|
caoqianming
|
429c0b6d5b
|
feat: 增加route查询条件
|
2023-11-29 09:47:25 +08:00 |
|
caoqianming
|
3ca0a3b533
|
feat: equipment description字段可不填
|
2023-11-28 15:32:10 +08:00 |
|
caoqianming
|
c8beedbcee
|
feat: 订单非创建中不可删除
|
2023-11-28 14:57:19 +08:00 |
|
caoqianming
|
e24a16b692
|
fix: mlog设置必填项目
|
2023-11-28 00:23:48 +08:00 |
|
caoqianming
|
ccc87a5a5c
|
fix: mioitem select_related bug
|
2023-11-27 23:29:24 +08:00 |
|
caoqianming
|
9ba83cc1fe
|
feat: 交接记录增加查询条件
|
2023-11-27 23:19:35 +08:00 |
|
caoqianming
|
64ac57d217
|
feat: handover material必填
|
2023-11-27 23:15:19 +08:00 |
|
caoqianming
|
d6e241fc49
|
feat: base 部门查询增加contains
|
2023-11-27 22:55:32 +08:00 |
|
caoqianming
|
014b21ba2b
|
feat: mlog增加筛选条件
|
2023-11-27 22:45:13 +08:00 |
|
caoqianming
|
4e3f6686c2
|
feat: 增加mlog返回数据
|
2023-11-27 17:39:59 +08:00 |
|
caoqianming
|
697daadb8a
|
feat: 增加mlog返回数据
|
2023-11-27 17:33:51 +08:00 |
|
caoqianming
|
ee3841cd52
|
feat: 去除mlog重复校验
|
2023-11-27 17:25:11 +08:00 |
|
caoqianming
|
741032f4e8
|
feat: 增加日均计划数
|
2023-11-27 15:38:38 +08:00 |
|
caoqianming
|
98c3584710
|
feat: mgroup增加筛选条件
|
2023-11-27 15:14:54 +08:00 |
|
caoqianming
|
555700793f
|
feat: otherlog路由注册
|
2023-11-27 13:21:14 +08:00 |
|
caoqianming
|
ec5c246bdc
|
feat: 其他生产日志
|
2023-11-27 11:33:15 +08:00 |
|
caoqianming
|
54afd73c8d
|
feat: em增加返回数据
|
2023-11-27 10:22:23 +08:00 |
|
caoqianming
|
eef925dc62
|
feat: 生产任务增加查询条件
|
2023-11-24 11:17:47 +08:00 |
|
caoqianming
|
9b3a983c27
|
feat: 到岗记录增加查询条件
|
2023-11-23 16:28:06 +08:00 |
|
caoqianming
|
e78f864666
|
feat: stlogserializer增加校验
|
2023-11-22 16:33:41 +08:00 |
|
caoqianming
|
2030812c18
|
fix: 能管的工段异常修改
|
2023-11-22 16:07:00 +08:00 |
|
caoqianming
|
6f058dc757
|
feat: equipment增加精度等级字段
|
2023-11-22 09:55:46 +08:00 |
|
caoqianming
|
6263960a7c
|
feat: em增加einspect, equipment增加mgroup字段
|
2023-11-21 18:55:49 +08:00 |
|
caoqianming
|
784d1a79dc
|
feat: 出入库明细筛选条件
|
2023-11-21 16:53:17 +08:00 |
|
caoqianming
|
fe032c8e1d
|
feat: attendance增加筛选日期
|
2023-11-21 09:08:59 +08:00 |
|
caoqianming
|
92c9a51967
|
feat: Attendance中team和post设置为必填
|
2023-11-21 08:45:25 +08:00 |
|
caoqianming
|
dd2189900f
|
feat: sflog增加total_hour字段
|
2023-11-20 19:09:40 +08:00 |
|
caoqianming
|
a7204ec897
|
doc: 添加注释
|
2023-11-20 19:08:10 +08:00 |
|
caoqianming
|
c20c0e5ae7
|
fix: 先注释掉
|
2023-11-20 19:07:30 +08:00 |
|
caoqianming
|
b90ea74e4b
|
fix: 创建mtask时先不make_sflogs
|
2023-11-20 18:48:26 +08:00 |
|
caoqianming
|
6b81f2a394
|
feat: hrm中的attendance
|
2023-11-20 18:47:36 +08:00 |
|
caoqianming
|
fddadfe30c
|
feat: wpm中增加到岗记录
|
2023-11-20 16:26:14 +08:00 |
|
caoqianming
|
cbce572350
|
fix: teammemberserializer 错误
|
2023-11-20 13:36:14 +08:00 |
|
caoqianming
|
5e3d88b84a
|
feat: 增加teammember字段
|
2023-11-20 11:40:58 +08:00 |
|
caoqianming
|
058e9ce5c3
|
feat: attendance增加返回字段
|
2023-11-17 19:11:42 +08:00 |
|
caoqianming
|
d1f183237d
|
feat: Attendance批量创建时执行覆盖操作
|
2023-11-17 17:25:46 +08:00 |
|
caoqianming
|
31814f2495
|
feat: 增加到岗记录表
|
2023-11-17 17:03:04 +08:00 |
|
caoqianming
|
f334618701
|
feat: 增加clock_time
|
2023-11-17 15:36:57 +08:00 |
|
caoqianming
|
bc8b6d8a7b
|
fix: 回退最后一次更新
|
2023-11-17 15:34:57 +08:00 |
|
caoqianming
|
58d5b06858
|
feat: 可手动创建打卡记录
|
2023-11-17 14:55:03 +08:00 |
|
caoqianming
|
286571d302
|
feat: 出入库明细增加筛选条件
|
2023-11-17 14:05:13 +08:00 |
|
caoqianming
|
cd40d7f899
|
feat: mio增加mio_user
|
2023-11-17 08:29:09 +08:00 |
|
caoqianming
|
3caf59f33d
|
feat: 增加规格型号字段
|
2023-11-16 14:17:18 +08:00 |
|
caoqianming
|
74ae25faf6
|
fix: sql查询可指定默认参数
|
2023-11-16 09:42:08 +08:00 |
|
caoqianming
|
272f2db00a
|
fix: materialsimple 缺少返回数据
|
2023-11-14 14:19:26 +08:00 |
|
caoqianming
|
2ae8913b25
|
feat: 一些统计分析接口可用bi替代
|
2023-11-14 13:48:07 +08:00 |
|
caoqianming
|
a591abab8a
|
feat: mtask serializer增加mlogs
|
2023-11-14 13:47:49 +08:00 |
|
caoqianming
|
53ca8f1742
|
feat: bidataset增加字段
|
2023-11-14 10:23:44 +08:00 |
|
caoqianming
|
f8c67d8759
|
feat: rcertificate增加筛选条件
|
2023-11-10 09:02:28 +08:00 |
|
caoqianming
|
f747cc817b
|
fix: testitem支持tag查询
|
2023-11-03 19:13:36 +08:00 |
|
caoqianming
|
1c94c4c5af
|
feat: testitem增加标签字段
|
2023-11-03 19:03:14 +08:00 |
|
caoqianming
|
ff94b3f7f4
|
feat: ftestitemserializer bug
|
2023-11-03 18:49:38 +08:00 |
|
caoqianming
|
ae62cff401
|
fix: ftest权限控制写错标识
|
2023-11-03 18:47:01 +08:00 |
|
caoqianming
|
1b85a7f88a
|
fix: 可不用隐式物料
|
2023-11-03 18:33:12 +08:00 |
|
caoqianming
|
a39e87c8f3
|
fix: MIOItemACreateSerializer bug
|
2023-11-03 18:25:22 +08:00 |
|
caoqianming
|
5f9c810502
|
feat: 棒管检验明细
|
2023-11-03 18:15:32 +08:00 |
|
caoqianming
|
297adfa3cd
|
feat: 增加性能测试接口
|
2023-11-03 16:21:56 +08:00 |
|
caoqianming
|
39fbf6d0f3
|
feat: mioitem增加查询条件
|
2023-11-03 14:06:33 +08:00 |
|
caoqianming
|
d9ef7548e4
|
feat: 出入库明细检验
|
2023-11-03 14:01:03 +08:00 |
|
caoqianming
|
9315efe6f4
|
perf: 一些调整
|
2023-11-03 09:07:33 +08:00 |
|
caoqianming
|
07c0bd93f4
|
feat: base select_rel和prefetch_rel放于filter之后
|
2023-11-03 09:07:10 +08:00 |
|
caoqianming
|
7def29d173
|
feat: 增加首件检验
|
2023-11-02 18:50:26 +08:00 |
|
caoqianming
|
b2c201877f
|
fix: receive user 返回错误
|
2023-11-02 18:50:02 +08:00 |
|
caoqianming
|
fd13551150
|
fix: mlogb update 只更新存在的
|
2023-11-02 17:42:19 +08:00 |
|
caoqianming
|
9c30d43dd0
|
feat: 增加碎料数字段
|
2023-11-02 16:20:09 +08:00 |
|
caoqianming
|
3b3434fcf1
|
feat: mlog增加material_in字段
|
2023-11-02 16:13:10 +08:00 |
|
caoqianming
|
4460d4af61
|
fix: mlogserializer material_outs_ bug修复
|
2023-11-02 15:20:14 +08:00 |
|
caoqianming
|
2cd4a68e23
|
fix: mlogserializer material_outs_ bug修复
|
2023-11-02 14:38:59 +08:00 |
|
caoqianming
|
6accd25620
|
feat: 增加route表字段以支持产出绑定功能
|
2023-11-02 11:29:05 +08:00 |
|
caoqianming
|
03f80ed99d
|
fix: mlog create bug
|
2023-11-02 09:05:55 +08:00 |
|
caoqianming
|
b742fecf50
|
fix: datetime引用出错2
|
2023-11-02 08:44:07 +08:00 |
|
caoqianming
|
1ae6c3fde7
|
fix: datetime引用出错
|
2023-11-02 08:42:46 +08:00 |
|
caoqianming
|
e544c1112d
|
feat: wmaterial 创建联合主键
|
2023-11-01 18:15:52 +08:00 |
|
caoqianming
|
03ae93f7e9
|
feat: 车间库存形成交接记录以及交接记录的提交
|
2023-11-01 18:11:26 +08:00 |
|
caoqianming
|
9f3300c04c
|
fix: get_total_hour_now bug
|
2023-11-01 17:57:06 +08:00 |
|
caoqianming
|
f8b3868467
|
fix: mlog增加handle_users的返回
|
2023-11-01 14:41:08 +08:00 |
|
caoqianming
|
ae629846ab
|
feat: 增加配粉料数字段
|
2023-11-01 14:37:14 +08:00 |
|
caoqianming
|
5b0fcd31c2
|
feat: 增加mlog查询条件
|
2023-11-01 14:18:14 +08:00 |
|
caoqianming
|
73186929a6
|
fix: mlogserializer bug
|
2023-11-01 14:10:02 +08:00 |
|
caoqianming
|
8abc008ddf
|
feat: 单个mlog submit
|
2023-11-01 13:59:51 +08:00 |
|
caoqianming
|
1a640d9a70
|
feat: mlog增加submit_time/submit_user及相应逻辑
|
2023-11-01 13:28:07 +08:00 |
|
caoqianming
|
03d7fbece8
|
fix: mtm cate默认为空字符串
|
2023-11-01 10:55:29 +08:00 |
|
caoqianming
|
3750ea0f2a
|
fix: mlogserializer bug
|
2023-11-01 09:35:09 +08:00 |
|
caoqianming
|
d65b88157c
|
fix: mlogbserializer bug修改
|
2023-11-01 09:17:14 +08:00 |
|
caoqianming
|
6f825546ac
|
feat: 有mloga之后的对应mlog_confirm修改
|
2023-11-01 09:14:12 +08:00 |
|
caoqianming
|
732a33f1f2
|
feat: 增加mlogb表以记录多个产出
|
2023-11-01 08:42:10 +08:00 |
|
caoqianming
|
c2a33de7f7
|
feat: material增加brothers字段
|
2023-11-01 08:39:36 +08:00 |
|
caoqianming
|
bd16bef47a
|
feat: 直接下任务时需设置is_count_utask
|
2023-10-31 16:59:30 +08:00 |
|
caoqianming
|
b67cdde9d3
|
feat: mlog增加班次及序列化
|
2023-10-31 15:47:13 +08:00 |
|
caoqianming
|
9427544cca
|
feat: mlog添加字段
|
2023-10-31 15:06:10 +08:00 |
|
caoqianming
|
da43690836
|
feat:mlog 备注修改
|
2023-10-31 14:19:29 +08:00 |
|
caoqianming
|
cb1f6444d9
|
feat: mlogserializer增加material_out_
|
2023-10-31 14:03:58 +08:00 |
|
caoqianming
|
78db88f368
|
fix: mlog create取消批次号校验
|
2023-10-31 13:54:11 +08:00 |
|
caoqianming
|
d072a01bf8
|
fix: mlog create 不带mtask时报错2
|
2023-10-31 13:39:17 +08:00 |
|
caoqianming
|
27e4022d9a
|
fix: mlog create 不带mtask时报错
|
2023-10-31 13:33:40 +08:00 |
|
caoqianming
|
c376cfb24a
|
fix: 设备出厂编号可为空
|
2023-10-31 11:16:50 +08:00 |
|
caoqianming
|
ebb35740fd
|
feat: handover添加进路由
|
2023-10-31 11:01:44 +08:00 |
|
caoqianming
|
2d20825716
|
feat: 增加交接记录表及相应接口
|
2023-10-31 10:50:36 +08:00 |
|
caoqianming
|
cdfe023172
|
feat: 增加materialsimpleserializer
|
2023-10-31 10:50:15 +08:00 |
|
caoqianming
|
a8020f7fad
|
feat: 增加dept筛选条件
|
2023-10-31 10:39:47 +08:00 |
|
caoqianming
|
b3cbdeaa70
|
feat: 获取指定车间指定日期的代表工序生产任务
|
2023-10-30 17:47:48 +08:00 |
|
caoqianming
|
b8bc753418
|
feat: mlog增加部分字段以便单独创建日志
|
2023-10-30 16:47:10 +08:00 |
|
caoqianming
|
9e3e6bd1c6
|
feat: material添加大类字段及相应过滤条件
|
2023-10-30 16:46:23 +08:00 |
|
caoqianming
|
6c14e8c8fd
|
feat: 日志添加不合格原因数字段
|
2023-10-30 12:44:28 +08:00 |
|
caoqianming
|
0017d8b729
|
feat: base 增加docxtpl导出函数
|
2023-10-30 09:50:02 +08:00 |
|
caoqianming
|
388ddd96ba
|
feat: 修改导出的文件夹地址
|
2023-10-30 08:36:00 +08:00 |
|
caoqianming
|
35052699da
|
feat: miodetail
|
2023-10-27 16:19:11 +08:00 |
|
caoqianming
|
cbc43fdb65
|
feat: 增加is_count_utask字段以确认同步utask
|
2023-10-26 18:20:04 +08:00 |
|
caoqianming
|
5ba3b4e07a
|
feat: 增加utask查询条件
|
2023-10-26 16:40:34 +08:00 |
|
caoqianming
|
4cea056955
|
feat: utask mtask增加状态以及相关逻辑
|
2023-10-26 16:25:04 +08:00 |
|
caoqianming
|
6b53b68e0c
|
fix: mtaskserializer material_out_ 错误
|
2023-10-26 13:35:30 +08:00 |
|
caoqianming
|
c459960128
|
fix: mtask day 逻辑不严谨
|
2023-10-26 11:34:31 +08:00 |
|
caoqianming
|
ef971c6501
|
fix: schedue_mtasks 修改utask状态
|
2023-10-26 10:12:53 +08:00 |
|
caoqianming
|
5eb4eaaaec
|
feat: utask指定mgroup也可以直接分解
|
2023-10-26 10:01:53 +08:00 |
|
caoqianming
|
add92c8daa
|
feat: schedue_mtasks 校验一下
|
2023-10-26 09:56:46 +08:00 |
|
caoqianming
|
5c5c3510aa
|
feat: 增加utask的状态已分解
|
2023-10-26 09:41:26 +08:00 |
|
caoqianming
|
6ec3530862
|
feat: utask增加查询条件
|
2023-10-26 09:07:39 +08:00 |
|
caoqianming
|
4869a2cb8a
|
fix: typing 取消
|
2023-10-26 08:59:00 +08:00 |
|
caoqianming
|
0aea02ffc9
|
feat: 订单排产时增加belong_dept参数
|
2023-10-26 08:57:26 +08:00 |
|
caoqianming
|
b1339f6d6b
|
feat: utask增加belong_dept字段及相应逻辑
|
2023-10-26 08:48:10 +08:00 |
|
caoqianming
|
bc57f49e6a
|
feat: 增加utask mgroup和material_in 字段
|
2023-10-25 18:49:53 +08:00 |
|
caoqianming
|
6f7f9d29e9
|
feat: 取消一个不必要的校验
|
2023-10-25 18:30:00 +08:00 |
|
caoqianming
|
e106bc1109
|
feat: material增加need_route字段
|
2023-10-25 17:49:54 +08:00 |
|
caoqianming
|
31f515a966
|
feat: user增加belong_dept_name查询条件
|
2023-10-25 17:23:16 +08:00 |
|
caoqianming
|
d76b0ca0e4
|
feat: 增加校验
|
2023-10-25 17:02:41 +08:00 |
|
caoqianming
|
143f045f11
|
fix: 字段名错误
|
2023-10-25 17:02:26 +08:00 |
|
caoqianming
|
b872726885
|
feat: 出入库编号唯一
|
2023-10-25 16:51:12 +08:00 |
|
caoqianming
|
b3a23ce9be
|
fix: mio_saleout bug
|
2023-10-25 16:50:40 +08:00 |
|
caoqianming
|
3f544ada2f
|
feat: 增加material 反向查询条件
|
2023-10-25 16:04:44 +08:00 |
|
caoqianming
|
e9845a246e
|
fix: 组合件出入库bug
|
2023-10-25 15:51:25 +08:00 |
|
caoqianming
|
3e77468ea5
|
fix: update_mtask bug
|
2023-10-25 13:48:58 +08:00 |
|
caoqianming
|
5649decd77
|
fix: 提交任务时的bug
|
2023-10-25 13:46:55 +08:00 |
|
caoqianming
|
2a384ea654
|
fix: mioitem返回warehouse name错误
|
2023-10-25 13:43:05 +08:00 |
|
caoqianming
|
3cbc6e3fef
|
feat: 增加mlog查询条件
|
2023-10-25 10:42:29 +08:00 |
|
caoqianming
|
c88575a617
|
feat: 增加puorder filter
|
2023-10-25 08:42:51 +08:00 |
|
caoqianming
|
4894f134c5
|
feat: mio权限控制
|
2023-10-25 08:41:25 +08:00 |
|
caoqianming
|
1f4107407b
|
feat: 增加返回数据
|
2023-10-24 11:11:00 +08:00 |
|
caoqianming
|
bc2a16a9a4
|
feat: 增加组合件出入库
|
2023-10-24 10:26:13 +08:00 |
|
caoqianming
|
fd4ccae448
|
feat: 返回可用的批次号
|
2023-10-23 15:03:09 +08:00 |
|
caoqianming
|
53b38d7cc4
|
feat: 获取相关任务的第一道工序日志
|
2023-10-23 10:30:49 +08:00 |
|
caoqianming
|
2725a97213
|
feat: handle_user也作为约束条件
|
2023-10-23 09:02:57 +08:00 |
|
caoqianming
|
a1c74a0fa6
|
feat: 增加多个友好接口
|
2023-10-23 09:02:37 +08:00 |
|
caoqianming
|
a69fa79de8
|
feat: 获取指定车间指定日期的最后工序生产任务
|
2023-10-20 16:55:20 +08:00 |
|
caoqianming
|
0843cf6ce3
|
fix: mtasks_submit 时未填写日志校验
|
2023-10-20 15:36:14 +08:00 |
|
caoqianming
|
d8be8665eb
|
fix: 提交任务submit_related_same_day
|
2023-10-20 14:51:31 +08:00 |
|
caoqianming
|
c142f00bf3
|
feat: 增加handle_date及相应的校验
|
2023-10-20 14:50:56 +08:00 |
|
caoqianming
|
f9b3a69552
|
fix: update_mtask bug
|
2023-10-20 14:49:54 +08:00 |
|
caoqianming
|
47895ac109
|
fix: 修改订单状态显示
|
2023-10-20 09:25:15 +08:00 |
|
caoqianming
|
3fd0347837
|
feat: 增加utask过滤条件
|
2023-10-20 09:24:56 +08:00 |
|
caoqianming
|
3d407795a9
|
feat: 增加utask
|
2023-10-20 09:08:14 +08:00 |
|
caoqianming
|
53d2276998
|
fix: mlog confirm bug
|
2023-10-19 14:07:09 +08:00 |
|
caoqianming
|
21f53dd3ef
|
fix: 采购入库创建与提交
|
2023-10-19 14:06:27 +08:00 |
|
caoqianming
|
4a1996c4e9
|
fix: 生产日志提交时逻辑bug
|
2023-10-19 14:05:16 +08:00 |
|
caoqianming
|
80b2685417
|
fix: 采购入库逻辑的bug
|
2023-10-19 14:04:41 +08:00 |
|
caoqianming
|
0965e6c68e
|
fix: 任务创建只是用create
|
2023-10-19 14:03:49 +08:00 |
|
caoqianming
|
c3afc248ab
|
feat: 增加sam返回字段
|
2023-10-18 16:29:06 +08:00 |
|
caoqianming
|
93d0c43b05
|
feat: 优化mtask创建
|
2023-10-18 16:28:47 +08:00 |
|
caoqianming
|
e8a8c1d078
|
feat: 增加字段和material查询条件
|
2023-10-18 16:27:54 +08:00 |
|
caoqianming
|
8b7f6395d4
|
feat: 增加字段和material查询条件
|
2023-10-18 16:27:44 +08:00 |
|
caoqianming
|
8fd6f82bc2
|
feat: 增加字段和material查询条件
|
2023-10-18 16:27:34 +08:00 |
|
caoqianming
|
84db42e7c4
|
refector: 更新物料总量用update
|
2023-10-18 16:26:45 +08:00 |
|
caoqianming
|
5e34558c02
|
feat: route增加主要输入和输出以及自动排产逻辑修改
|
2023-10-16 16:50:46 +08:00 |
|
caoqianming
|
ad84876712
|
feat: order, pu_order 返回更多信息
|
2023-10-16 10:43:41 +08:00 |
|
caoqianming
|
f3b43ab0ce
|
fix: mgroup 增加need_enm字段
|
2023-10-13 13:13:31 +08:00 |
|
caoqianming
|
ff58685cbc
|
fix: 订单明细添加权限
|
2023-10-12 10:49:00 +08:00 |
|
caoqianming
|
177aeb4bed
|
fix: update order submit_time ignore
|
2023-10-12 10:08:12 +08:00 |
|
caoqianming
|
450381d7fb
|
fix: puorder puplan submit_time不可更改
|
2023-10-12 08:39:18 +08:00 |
|
caoqianming
|
af920a66f7
|
fix: add_from_planitems bug
|
2023-10-12 08:34:07 +08:00 |
|
caoqianming
|
3a224eafec
|
feat: 增加filter_custom必要时可复写
|
2023-10-11 16:38:33 +08:00 |
|
caoqianming
|
56ed286eaf
|
feat: mio和mioitem的权限控制
|
2023-10-11 16:27:44 +08:00 |
|
caoqianming
|
1cc632b35b
|
feat: 添加has_perm方法typing
|
2023-10-11 15:35:15 +08:00 |
|
caoqianming
|
e41710e438
|
feat: 添加has_perm方法
|
2023-10-11 15:30:38 +08:00 |
|
caoqianming
|
65c6dab239
|
feat: 优化mio list请求
|
2023-10-11 15:23:50 +08:00 |
|
caoqianming
|
ae43296ab5
|
fix: puorderitem create bug
|
2023-10-11 15:19:26 +08:00 |
|
caoqianming
|
9461d57159
|
feat: 出入库记录新增分多个接口
|
2023-10-11 15:16:58 +08:00 |
|
caoqianming
|
aff046db88
|
fix: add_from_planitems bug
|
2023-10-11 10:29:01 +08:00 |
|
caoqianming
|
c6f9b749c7
|
feat: mlog增加handle_user
|
2023-10-10 16:43:05 +08:00 |
|
caoqianming
|
604b4abe21
|
feat: 增加mtask查询条件
|
2023-10-10 15:54:09 +08:00 |
|
caoqianming
|
f5067e3163
|
fix: clear_bgl_r 跳出循环
|
2023-10-10 12:08:01 +08:00 |
|
caoqianming
|
5d405dbe8d
|
fix: clear_bgl_r
|
2023-10-10 12:05:21 +08:00 |
|
caoqianming
|
702fe8f87e
|
fix: clear_bgl_r
|
2023-10-10 12:04:55 +08:00 |
|
caoqianming
|
3a07c2b47c
|
feat: 直接使用大华的门禁权限接口吧
|
2023-10-10 09:34:47 +08:00 |
|
caoqianming
|
9c0423d0dc
|
feat: 批量清空办公室打卡门禁的相关方权限
|
2023-10-09 17:29:28 +08:00 |
|
caoqianming
|
29e94f8546
|
fix: 删除门禁权限的bug
|
2023-10-09 17:22:13 +08:00 |
|
caoqianming
|
7f1f3df956
|
feat: 煤粉热值系数修改
|
2023-10-09 16:52:16 +08:00 |
|
caoqianming
|
4ca344a86a
|
feat: doorauth增加查询条件
|
2023-10-09 15:34:35 +08:00 |
|
caoqianming
|
3b0710626a
|
feat: employeeshort增加type
|
2023-10-09 14:20:52 +08:00 |
|
caoqianming
|
6b6175803c
|
fix: door_auth bulk_create id bug
|
2023-10-09 12:36:42 +08:00 |
|
caoqianming
|
af105384fe
|
feat: init_doorauth
|
2023-10-09 11:24:14 +08:00 |
|
caoqianming
|
b479db9f89
|
feat: 查看门禁权限并支持删除
|
2023-10-09 11:09:31 +08:00 |
|
caoqianming
|
b4cc887f79
|
feat: mtask增加已提交状态并在提交后不允许日志变动
|
2023-10-08 16:38:55 +08:00 |
|
caoqianming
|
b7ba095de7
|
feat: 增加生产日志表及创建逻辑
|
2023-10-08 11:27:41 +08:00 |
|
caoqianming
|
8a3c6150a0
|
fix: get_routes bug
|
2023-10-08 10:00:45 +08:00 |
|
caoqianming
|
c785409e37
|
feat: viewset中默认perms_map为{'get': '*'}
|
2023-09-28 11:57:01 +08:00 |
|
caoqianming
|
2597617a94
|
refector: 优化了do_in报错
|
2023-09-28 10:18:44 +08:00 |
|
caoqianming
|
8f90df0f32
|
perf: 优化了数据库查询
|
2023-09-28 10:18:14 +08:00 |
|
caoqianming
|
9ebf15b04f
|
feat: 生产入库后变更车间物料
|
2023-09-28 09:22:37 +08:00 |
|
caoqianming
|
f13de6b2c5
|
refector: 生产领料接口同时支持生产入库
|
2023-09-27 17:02:00 +08:00 |
|
caoqianming
|
9504b527cb
|
feat: 增加车间库存并完成生产领料
|
2023-09-27 15:41:36 +08:00 |
|
caoqianming
|
8934186460
|
feat: 排产后更新订单状态
|
2023-09-27 12:46:19 +08:00 |
|
caoqianming
|
611aa28eee
|
style: 格式调整
|
2023-09-27 09:54:15 +08:00 |
|
caoqianming
|
7ba27142e8
|
feat: process加入django admin
|
2023-09-27 09:49:11 +08:00 |
|
caoqianming
|
7de606b496
|
fix: mtask级联下达任务
|
2023-09-27 09:43:10 +08:00 |
|
caoqianming
|
0f6a7289b8
|
feat: mtask 工序更改为关联mgroup
|
2023-09-27 09:38:30 +08:00 |
|
caoqianming
|
0ac87f5c09
|
feat: mgroup 关联process
|
2023-09-27 09:37:57 +08:00 |
|
caoqianming
|
515d0b5c17
|
feat: 出入库明细接口
|
2023-09-26 11:24:52 +08:00 |
|
caoqianming
|
10aab0226d
|
feat: 从多个订单明细自动排产
|
2023-09-26 11:00:31 +08:00 |
|
caoqianming
|
aa79df55b5
|
feat: material增加是否隐藏字段
|
2023-09-26 10:59:57 +08:00 |
|
caoqianming
|
de749d4ee3
|
feat: 订单明细关联生产任务
|
2023-09-26 10:58:35 +08:00 |
|
caoqianming
|
312bf47b7b
|
refector: 添加api说明
|
2023-09-22 18:06:54 +08:00 |
|
caoqianming
|
5af44ee0de
|
feat: 增加pm app
|
2023-09-22 16:53:52 +08:00 |
|
caoqianming
|
37d3c29ab2
|
feat: material增加字段
|
2023-09-22 16:01:31 +08:00 |
|
caoqianming
|
0cd2802b04
|
feat: 更新material的count
|
2023-09-21 16:27:22 +08:00 |
|
caoqianming
|
095eaabbb9
|
feat: 添加process和route表
|
2023-09-21 16:26:58 +08:00 |
|
caoqianming
|
c89d787690
|
feat: puplanitem添加查询条件
|
2023-09-21 16:23:31 +08:00 |
|
caoqianming
|
14832a64a7
|
feat: mio_saleout
|
2023-09-21 10:46:12 +08:00 |
|
caoqianming
|
d39aa87dd5
|
feat: 修改sam部分字段
|
2023-09-21 10:23:09 +08:00 |
|
caoqianming
|
a4a96ce59e
|
feat: mio_purin
|
2023-09-21 10:20:47 +08:00 |
|
caoqianming
|
c6af3f7f62
|
feat: 增加出入库记录
|
2023-09-21 10:20:19 +08:00 |
|
caoqianming
|
85ac0d077f
|
fix: swagger bug
|
2023-09-19 15:35:06 +08:00 |
|
caoqianming
|
16e4d85f5d
|
feat: 添加sam模块
|
2023-09-18 14:06:39 +08:00 |
|
caoqianming
|
58aab32859
|
feat: 添加pum模块
|
2023-09-18 13:45:56 +08:00 |
|
caoqianming
|
5317c2c715
|
feat: 寻找距离最近的face index
|
2023-09-17 01:08:37 +08:00 |
|
caoqianming
|
8c58d3990e
|
feat: event_push 超过48h未处理也不再推送
|
2023-09-16 23:38:53 +08:00 |
|
caoqianming
|
0c2589c151
|
fix: 解决face缓存时的bug
|
2023-09-16 23:27:07 +08:00 |
|
caoqianming
|
72372c3215
|
feat: face_data中字典形式存储json数据
|
2023-09-16 22:52:44 +08:00 |
|
caoqianming
|
973c48bd7d
|
fix: update_all_facedata bug
|
2023-09-16 22:45:55 +08:00 |
|
caoqianming
|
e32933faa9
|
fix:get_facedata_from_img_x bug
|
2023-09-16 22:26:09 +08:00 |
|
caoqianming
|
beea6f3f54
|
fix: 还是使用face_recongnition2
|
2023-09-16 17:55:24 +08:00 |
|
caoqianming
|
96d83e0b49
|
fix: 还是使用face_recongnition
|
2023-09-16 17:49:35 +08:00 |
|
caoqianming
|
4d80d58554
|
feat: 打卡增加备注字段
|
2023-09-15 10:51:22 +08:00 |
|
caoqianming
|
225dcfddd6
|
fix: em filter_tag
|
2023-09-15 10:26:22 +08:00 |
|
caoqianming
|
6a369883d6
|
fix: 检定记录校验bug
|
2023-09-15 10:12:12 +08:00 |
|
caoqianming
|
c9d8a1e22f
|
fix: 人脸识别时捕获错误
|
2023-09-13 17:34:33 +08:00 |
|
caoqianming
|
a763cc00e6
|
feat: 更改为facenet模型
|
2023-09-12 09:20:04 +08:00 |
|
caoqianming
|
2d59864f65
|
feat: 清除不需要的数据
|
2023-09-12 08:49:37 +08:00 |
|
caoqianming
|
6e06a9ea1d
|
fix: 去除启动时cache_areas_info
|
2023-09-12 08:08:40 +08:00 |
|
caoqianming
|
42760f1501
|
feat: 尝试优化人脸识别速度
|
2023-09-12 07:42:18 +08:00 |
|
caoqianming
|
4448eb2a68
|
fix: 默认使用vgg face
|
2023-09-11 18:02:06 +08:00 |
|
caoqianming
|
741269be87
|
fix: hrm face_data 字段
|
2023-09-11 17:48:37 +08:00 |
|
caoqianming
|
6c10cb647f
|
fix: hrm face_data 字段
|
2023-09-11 17:41:30 +08:00 |
|
caoqianming
|
8fd85bed02
|
fix: hrm face_data 字段
|
2023-09-11 17:31:52 +08:00 |
|
caoqianming
|
81d53ce6b1
|
fix: update_global_face_pd bug
|
2023-09-11 17:28:48 +08:00 |
|
caoqianming
|
300433547e
|
fix: update_global_face_pd bug
|
2023-09-11 17:25:58 +08:00 |
|
caoqianming
|
c8a0bd06af
|
fix: face_find bug
|
2023-09-11 17:24:38 +08:00 |
|
caoqianming
|
1416b83b4e
|
feat: 改用vggface
|
2023-09-11 17:21:43 +08:00 |
|
caoqianming
|
a9cfeeb48e
|
feat: vgg识别成功
|
2023-09-11 17:08:51 +08:00 |
|
caoqianming
|
51f55258d6
|
fix: 人脸识别先这样
|
2023-09-11 16:40:54 +08:00 |
|
caoqianming
|
bfdc5d66ca
|
fix: 代码bug
|
2023-09-11 15:54:54 +08:00 |
|
caoqianming
|
e27f6631a0
|
fix: 用类代替全局变量
|
2023-09-11 15:52:31 +08:00 |
|
caoqianming
|
e97879811f
|
fix: 需要修改全局变量
|
2023-09-11 15:45:31 +08:00 |
|
caoqianming
|
3cc0134c5d
|
fix: django value_list用错了
|
2023-09-11 15:30:04 +08:00 |
|
caoqianming
|
96ac80361e
|
feat: 人脸数据保存在数据库中
|
2023-09-11 15:21:45 +08:00 |
|
caoqianming
|
5dded4d235
|
fix: face_find_from_base64 bug
|
2023-09-11 14:13:17 +08:00 |
|
caoqianming
|
19239c6b42
|
fix: 临时文件默认temp
|
2023-09-11 10:52:09 +08:00 |
|
caoqianming
|
e71d5af84a
|
feat: 增加人脸识别相关功能
|
2023-09-11 10:42:34 +08:00 |
|
caoqianming
|
addf8e771a
|
feat: 添加EXCLUDE_FIELDS_DEPT方便使用
|
2023-09-08 15:16:54 +08:00 |
|
caoqianming
|
d52a47839d
|
feat: 添加库存模块
|
2023-09-08 15:16:22 +08:00 |
|
caoqianming
|
b0455d9e13
|
refector: 优化event_push
|
2023-09-07 12:17:07 +08:00 |
|
caoqianming
|
fd6b5b5db7
|
feat: 完善enm_alarm保存的enm_data信息
|
2023-09-07 10:28:17 +08:00 |
|
caoqianming
|
72d5ae143f
|
fix: event_push后续接着推送的bug
|
2023-09-07 08:48:33 +08:00 |
|
caoqianming
|
95380fa826
|
fix: enm_alarm bug
|
2023-09-06 22:40:42 +08:00 |
|
caoqianming
|
e3449b9b89
|
fix: event_push bug
|
2023-09-06 18:16:50 +08:00 |
|
caoqianming
|
e4ff355853
|
fix: 权限代号单词拼写错误
|
2023-09-06 14:57:25 +08:00 |
|
caoqianming
|
94f87c9a34
|
feat: em增加字段
|
2023-09-06 14:31:46 +08:00 |
|
caoqianming
|
8a96755c22
|
refector: 优化echeckrecordserializer
|
2023-09-06 13:21:12 +08:00 |
|
caoqianming
|
700dbe5f1f
|
feat: 增加校准/检定记录接口描述
|
2023-09-06 12:59:48 +08:00 |
|
caoqianming
|
014b861ae2
|
feat: 校准检定记录表及接口
|
2023-09-06 11:19:30 +08:00 |
|
caoqianming
|
aed110afe9
|
feat: 未处理的event可持续ws推送
|
2023-09-06 09:23:42 +08:00 |
|
caoqianming
|
5835e2f6a0
|
feat: enm_alarm任务函数
|
2023-09-06 08:43:31 +08:00 |
|
caoqianming
|
ec8d416e80
|
feat: notify_event增加wspush以及一些优化
|
2023-09-06 08:42:46 +08:00 |
|
caoqianming
|
1048fb8d5c
|
feat: event_push更新last_ws_pushtime
|
2023-09-06 08:41:12 +08:00 |
|
caoqianming
|
4e06efdc78
|
refector: hrm serializer去除未使用的导入
|
2023-09-06 08:38:59 +08:00 |
|
caoqianming
|
9458276ad1
|
feat: 短信功能的全局开关
|
2023-09-06 08:30:53 +08:00 |
|
caoqianming
|
d6a9a683f1
|
feat: equipment增加启用日期
|
2023-09-06 08:29:43 +08:00 |
|
caoqianming
|
9ad37f41fd
|
feat: 增加last_ws_pushtime, enm_data字段
|
2023-09-05 17:43:49 +08:00 |
|
caoqianming
|
28313b0c33
|
feat: 优化ws event ticket remind三种方法
|
2023-09-05 11:12:13 +08:00 |
|
caoqianming
|
77e92062fb
|
feat: event 支持批量删除
|
2023-09-04 16:59:21 +08:00 |
|
caoqianming
|
75533d41ed
|
feat: sflogexp增加stlog_返回字段
|
2023-09-04 15:50:14 +08:00 |
|
caoqianming
|
f719702432
|
fix: shutdown_or_startup 优化
|
2023-09-04 15:36:16 +08:00 |
|
caoqianming
|
1ed7c846a3
|
fix:cal_shut_hour 的时区问题
|
2023-09-04 14:41:38 +08:00 |
|
caoqianming
|
e59bed611b
|
fix: get_tag_val bug
|
2023-09-04 14:17:03 +08:00 |
|
caoqianming
|
e6127864e7
|
fix: 执行测点函数的bug
|
2023-09-04 14:10:21 +08:00 |
|
caoqianming
|
a0955c401f
|
feat: shutdown_or_startup 优化
|
2023-09-01 17:32:24 +08:00 |
|
caoqianming
|
4fa33a7252
|
fix: cal_shut_hour bug
|
2023-09-01 16:58:58 +08:00 |
|
caoqianming
|
e4c49918ae
|
fix: shutdown_or_startup bug
|
2023-09-01 16:48:03 +08:00 |
|
caoqianming
|
a7b53bce2e
|
feat: shutdown_or_startup bug
|
2023-09-01 15:48:19 +08:00 |
|
caoqianming
|
b8fadbda35
|
feat: 工单ws推送
|
2023-09-01 11:24:47 +08:00 |
|
caoqianming
|
46d127758a
|
fix: roomconsumer bug修改
|
2023-09-01 10:16:36 +08:00 |
|
caoqianming
|
df6fbf500e
|
feat: 增加async def ticket
|
2023-09-01 09:39:03 +08:00 |
|
caoqianming
|
efa6651748
|
feat: remind_push
|
2023-09-01 09:38:07 +08:00 |
|
caoqianming
|
83957c8e9c
|
feat: 增加事件等级等字段并进行相应处理
|
2023-09-01 09:37:38 +08:00 |
|
caoqianming
|
8e0724bbec
|
feat: 添加websocket模块
|
2023-09-01 09:12:18 +08:00 |
|
caoqianming
|
d5386ccd84
|
feat: 优化ws 认证
|
2023-09-01 09:11:43 +08:00 |
|
caoqianming
|
16490c5907
|
feat: 增加serverservice
|
2023-09-01 09:11:18 +08:00 |
|
caoqianming
|
35d001e4e5
|
feat: 任务派发测试
|
2023-09-01 09:08:49 +08:00 |
|
caoqianming
|
64c2d86cd7
|
feat: enstat2增加查询条件
|
2023-08-31 14:14:00 +08:00 |
|
caoqianming
|
c71557b82b
|
feat: 允许修改身份证号
|
2023-08-30 16:16:24 +08:00 |
|
caoqianming
|
ed936082c7
|
feat: mpoint增加func_on_change以完成开停机处理需求
|
2023-08-30 15:19:28 +08:00 |
|
caoqianming
|
8b0733f1fc
|
feat: mgroup增加is_runing字段
|
2023-08-30 15:18:20 +08:00 |
|
caoqianming
|
13d9d6a752
|
feat: 短信服务连接不上时raise exception
|
2023-08-29 10:48:47 +08:00 |
|
caoqianming
|
c9fc726139
|
fix: recal bug修复
|
2023-08-28 10:22:20 +08:00 |
|
caoqianming
|
5ff0cf43a8
|
fix: send_mail_task 未获取config
|
2023-08-28 09:50:17 +08:00 |
|
caoqianming
|
f5f0675f91
|
feat: 增加recal接口
|
2023-08-28 09:42:27 +08:00 |
|
caoqianming
|
c0dd70982a
|
feat: enm增加重跑某一段时间的任务
|
2023-08-28 09:18:32 +08:00 |
|
caoqianming
|
620351c8bf
|
feat: send_mail_task优化
|
2023-08-28 09:18:09 +08:00 |
|
caoqianming
|
f89f56f02d
|
feat: mpoint增加查询条件
|
2023-08-25 17:02:32 +08:00 |
|
caoqianming
|
7bfea08a7d
|
feat: mpointstat增加elec_consume_unit及相应逻辑
|
2023-08-25 17:01:22 +08:00 |
|
caoqianming
|
ad30803836
|
feat: sflogExp增加查询条件
|
2023-08-24 10:52:06 +08:00 |
|
caoqianming
|
6e1ab8a967
|
feat: enstat2 返回时保留2位小数
|
2023-08-24 10:28:07 +08:00 |
|
caoqianming
|
909499fc44
|
feat: 默认密码设置复杂
|
2023-08-24 10:11:11 +08:00 |
|
caoqianming
|
4f6838423b
|
feat: 密码登录复杂度校验可选择
|
2023-08-24 09:14:39 +08:00 |
|
caoqianming
|
c424254670
|
feat: 增加get_day_s方法
|
2023-08-23 13:50:43 +08:00 |
|
caoqianming
|
e907b152f3
|
feat: enstat2增加筛选条件
|
2023-08-23 12:58:26 +08:00 |
|
caoqianming
|
beb9624548
|
feat: price change 时计算加锁
|
2023-08-23 12:45:14 +08:00 |
|
caoqianming
|
4fdddec6d6
|
fix: 先去除加锁功能
|
2023-08-23 08:52:55 +08:00 |
|
caoqianming
|
18942d57c9
|
fix: cal_enstat2 bug
|
2023-08-23 08:48:37 +08:00 |
|
caoqianming
|
50714225e5
|
fix: cal_enstat2 bug
|
2023-08-23 08:45:09 +08:00 |
|
caoqianming
|
cd5cf00fad
|
fix: cal_enstat bug
|
2023-08-23 08:39:49 +08:00 |
|
caoqianming
|
4cd2c0f85b
|
feat: enstat2增加day_s统计及相应的tasks改动
|
2023-08-23 08:33:45 +08:00 |
|
caoqianming
|
11ced96400
|
feat: ecm filter 查询
|
2023-08-22 14:28:00 +08:00 |
|
caoqianming
|
315f832ff2
|
fix: 先调整回来再处理
|
2023-08-22 14:10:00 +08:00 |
|
caoqianming
|
74e81e1a7c
|
feat: ecm filter 查询
|
2023-08-22 14:06:31 +08:00 |
|
caoqianming
|
a0135ec965
|
feat: compress img 默认40kb
|
2023-08-22 13:58:59 +08:00 |
|
caoqianming
|
31b0f33751
|
feat: 提高导出限制
|
2023-08-22 13:56:17 +08:00 |
|
caoqianming
|
c615d20a5c
|
feat: 提高导出限制
|
2023-08-22 13:55:19 +08:00 |
|
caoqianming
|
ab9b9d9804
|
fix: event 导出bug
|
2023-08-22 11:25:21 +08:00 |
|
caoqianming
|
563893efac
|
feat: event增加压缩图片字段
|
2023-08-22 11:13:09 +08:00 |
|
caoqianming
|
39a3001211
|
fix: 导出时用压缩图
|
2023-08-22 10:42:01 +08:00 |
|
caoqianming
|
9ba12d06da
|
feat: global img 压缩
|
2023-08-22 10:33:19 +08:00 |
|
caoqianming
|
0772be47de
|
fix: 导出时的bug
|
2023-08-22 09:20:29 +08:00 |
|
caoqianming
|
6f7a732618
|
feat: ecm 提高导出数据限制
|
2023-08-22 09:12:58 +08:00 |
|
caoqianming
|
a8160867ae
|
feat: 返回数据自动约成2位小数
|
2023-08-21 14:08:47 +08:00 |
|
caoqianming
|
b31d3937f8
|
feat: enstat2 增加水耗和压缩空气统计
|
2023-08-21 09:18:58 +08:00 |
|
caoqianming
|
ad9027d888
|
fix: 煤粉热值取白班值
|
2023-08-17 15:05:40 +08:00 |
|
caoqianming
|
fdf67b5dc5
|
fix: mpointstat增加查询条件
|
2023-08-15 16:00:23 +08:00 |
|
caoqianming
|
dbe1635788
|
feat: mpointstat增加查询条件
|
2023-08-15 15:56:56 +08:00 |
|
caoqianming
|
2c8a86d6f5
|
fix: if hour改为if hour is not None
|
2023-08-15 15:49:35 +08:00 |
|
caoqianming
|
fba349191c
|
feat: 作业未选证书时默认选择全部该成员全部证书
|
2023-08-10 17:12:42 +08:00 |
|
caoqianming
|
cdc53fd14f
|
fix: month_st计算bug
|
2023-08-09 15:07:25 +08:00 |
|
caoqianming
|
fef37ebcd7
|
feat: enstat list返回数据打平2
|
2023-08-09 14:20:00 +08:00 |
|
caoqianming
|
1ee3eb4db3
|
feat: mpintstat增加mgroup name查询条件
|
2023-08-09 13:27:59 +08:00 |
|
caoqianming
|
584e5dc5c3
|
feat: enstat list返回数据打平
|
2023-08-09 13:17:13 +08:00 |
|
caoqianming
|
ccfeb9d901
|
feat: sflogexp合并stlog
|
2023-08-08 14:41:50 +08:00 |
|
caoqianming
|
f4e3d43034
|
fix: 增加查询条件
|
2023-08-08 11:01:33 +08:00 |
|
caoqianming
|
959e3e3d8d
|
feat: enstat增加start_time和end_time的查询条件
|
2023-08-07 16:00:10 +08:00 |
|
caoqianming
|
2f42d8386e
|
feat: eval_formula测试通过
|
2023-08-04 16:57:12 +08:00 |
|
caoqianming
|
5cfb12113e
|
fix: mpointserializer validate 时不做mgroup绑定allocate处理2
|
2023-08-04 16:14:57 +08:00 |
|
caoqianming
|
4157fd95a8
|
fix: mpointserializer validate 时不做mgroup绑定allocate处理
|
2023-08-04 16:00:32 +08:00 |
|
caoqianming
|
039876349e
|
fix: mpointserializer validate 错误
|
2023-08-04 15:34:01 +08:00 |
|
caoqianming
|
866ad4d15d
|
feat: mpoint创建时校验问题
|
2023-08-04 15:17:51 +08:00 |
|
caoqianming
|
dcd338e5fa
|
feat: mpointstat增加返回内容
|
2023-08-04 14:53:51 +08:00 |
|
caoqianming
|
448285e3a1
|
feat: 增加enstat筛选条件
|
2023-08-04 14:35:00 +08:00 |
|
caoqianming
|
8808a14ef2
|
fix: translate_eval_formula bug
|
2023-08-04 14:34:39 +08:00 |
|
caoqianming
|
50a34a44bb
|
feat: 只更新必要的字段
|
2023-08-04 14:29:23 +08:00 |
|
caoqianming
|
ebe6ab9f3b
|
feat: 增加生产异常动态记录表
|
2023-08-04 14:26:53 +08:00 |
|
caoqianming
|
4e5adc6dc3
|
feat: 获取工段全年目标
|
2023-08-04 14:26:00 +08:00 |
|
caoqianming
|
2be3c43bef
|
feat: 添加enstat2路由
|
2023-08-04 14:25:10 +08:00 |
|
caoqianming
|
16971d9742
|
feat: 返回时携带ep_monitored_name
|
2023-08-04 09:55:26 +08:00 |
|
caoqianming
|
959fc60e24
|
feat: 获取工段全年目标值
|
2023-08-04 09:24:00 +08:00 |
|
caoqianming
|
c7b7d9cec4
|
fix: cal_enstat_when_pcoal_heat_change的qs获取bug
|
2023-08-03 14:09:47 +08:00 |
|
caoqianming
|
7fd10f3e51
|
fix: pcoal_coal_consume可能为None
|
2023-08-03 13:58:15 +08:00 |
|
caoqianming
|
cb60fe2728
|
feat: 其他成本数据忘记保存
|
2023-08-03 13:33:27 +08:00 |