Commit Graph

1967 Commits

Author SHA1 Message Date
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
caoqianming ac0908dc11 fix: month_st时equip_data计算失误 2023-08-03 11:16:04 +08:00
caoqianming 60ac9e6ac2 fix: except ZeroDivisionError 2023-08-03 10:37:03 +08:00
caoqianming a609b1db94 feat: cal_enstat_when_team_change 2023-08-03 10:31:38 +08:00
caoqianming 8ab973749d feat: goal增加查询条件 2023-08-02 17:42:19 +08:00
caoqianming 67d04a9a41 feat: 可以不用间隔运行get_total_hour_now 2023-08-02 17:25:07 +08:00
caoqianming 40ecd52fee feat: 可根据时间段生成排版记录 2023-08-02 15:54:09 +08:00
caoqianming e1e8d76ecf fix: formula 允许为空 2023-08-02 15:20:06 +08:00
caoqianming d1d427927e feat: 暂时先同步执行,后面再优化 2023-08-02 15:09:56 +08:00
caoqianming 25e49601a5 fix: task_chain group 2023-08-02 14:38:22 +08:00
caoqianming 5c3af36441 fix: 未注册为task 2023-08-02 14:28:13 +08:00
caoqianming 7619e5156c feat: cal_mpointstats分组执行 2023-08-02 14:12:46 +08:00
caoqianming ad2f903c89 fix: init_test bug 2023-08-02 10:51:48 +08:00
caoqianming 6fa1d379d3 feat: priceset feeset change触发enstat重新计算 2023-08-02 10:23:42 +08:00
caoqianming 3dc647272a feat: cal_enstat_when_pcoal_val_change 未完成 2023-08-02 10:22:51 +08:00
caoqianming 5402f2181c feat: 增加enstat 统计数据,优化task执行 2023-08-02 10:22:29 +08:00
caoqianming ab581f2851 fix: after_bulk_update执行后不用return 2023-08-02 10:19:38 +08:00
caoqianming 251e373d5b feat: get_total_hour_now 修改 2023-08-01 16:41:47 +08:00
caoqianming 80b61c9f8b fix: get_total_hour_now bug 2023-08-01 08:54:01 +08:00
caoqianming d2e4439b73 fix: get_total_hour_now bug 2023-08-01 08:50:06 +08:00
caoqianming a29ed1edc8 fix: get_total_hour_now sql查询bug 2023-07-31 17:46:56 +08:00
caoqianming 8e3802966e feat: enstat参数计算并新建enstat2表 2023-07-28 17:36:44 +08:00
caoqianming 6d5d2f84d4 feat: 停机记录分配到每一个班 2023-07-28 17:36:09 +08:00
caoqianming d487f0889f feat: 获取煤粉热值 2023-07-28 17:20:54 +08:00
caoqianming 56bc87c913 feat: 启动时重新加载系统配置json 2023-07-28 17:19:36 +08:00
caoqianming 1d0b43d75f feat: sflog增加total_hour_now以及pcoal_val 2023-07-28 17:18:59 +08:00
caoqianming a668ca0b2f feat: 返回数据增加belong_dept_name等 2023-07-25 14:24:21 +08:00
caoqianming 841815bbb6 fix: 班月质检数据统计错误 2023-07-25 13:58:31 +08:00
caoqianming e64ae3aebe feat: goal返回goal_cata_name和mgroup_name 2023-07-25 13:58:11 +08:00
caoqianming 437d4c923e fix: init_test 报错 2023-07-25 13:25:05 +08:00
caoqianming 887976363b fix: quastat update serializer 2023-07-25 13:21:02 +08:00
caoqianming 00677d100b feat: swagger显示问题 2023-07-25 11:33:33 +08:00
caoqianming b634bac616 feat: sflog获取年月日优化 2023-07-25 11:23:36 +08:00
caoqianming 13382171de refector: 初始化检测录入优化 2023-07-25 11:20:27 +08:00
caoqianming be9011f8f5 feat: sflog增加property以获取年月日 2023-07-25 11:19:51 +08:00
caoqianming 9f8cf21bf1 feat: 批量更新时after_bulk_update放在事务中处理 2023-07-25 11:17:34 +08:00
caoqianming 7fde7148bf feat: 质检数据重新统计并放入enstat表中 2023-07-25 11:16:38 +08:00
caoqianming 6c3cbf0c5e feat: 目标增加code查询条件 2023-07-25 11:14:32 +08:00
caoqianming e15cc2f9ce fix: enm以team做统计不是shift 2023-07-25 11:13:54 +08:00
caoqianming 6e98ec57ee feat: mpoint支持formular 2023-07-24 16:03:06 +08:00
caoqianming 27a2a20cbe feat: 值班记录增加运转时间和停机时间 2023-07-24 11:19:08 +08:00
caoqianming 0abade21b7 feat: 质检统计增加班月month_sf 2023-07-24 10:32:38 +08:00
caoqianming 6df6b75499 feat: 同步质检表 2023-07-24 10:22:41 +08:00
caoqianming f4f9cb0fae feat: 质检统计增加班月 2023-07-24 10:22:06 +08:00
caoqianming 2acd216d33 feat: eventcate code 不唯一 2023-07-19 17:24:45 +08:00
caoqianming 16f560adc0 feat: 大华订阅增加移动侦测 2023-07-19 15:30:44 +08:00
caoqianming 886843174d feat: tdevice 增加code查询条件 2023-07-19 10:20:07 +08:00
caoqianming 5ba9789de2 fix: 计算优化待完成 2023-07-19 09:18:03 +08:00
caoqianming a8afccdfca feat: 增加month_sf统计维度, 优化二次计算逻辑 2023-07-18 14:15:52 +08:00
caoqianming f8bc2294f0 feat: 初步统计能管相关数据产量和成本 2023-07-17 15:33:35 +08:00
caoqianming 3fbe3e7d0e fix: 保存last_tag_id以减少获取mplog 2023-07-11 14:52:39 +08:00
caoqianming c3d0fa1806 feat: mgroups_allocate保存时带mgroup_name 2023-07-11 14:29:32 +08:00
caoqianming c0e4b8a1b9 fix: 比例合计问题 2023-07-11 14:21:36 +08:00
caoqianming a30bffd244 fix: cal_mpointstat_manual 以班手动录入数据 2023-07-11 13:48:35 +08:00
caoqianming bf1ac0549e feat: mpointstat增加mgroup字段和相应逻辑 2023-07-11 13:46:37 +08:00
caoqianming c122335f8c feat: 支持测点数据反向分配给各工段 2023-07-11 10:53:28 +08:00
caoqianming f02135dc10 fix: init_test 排序错误 2023-07-10 16:26:23 +08:00
caoqianming a8576212a1 feat: 通过接口重新加载config 2023-07-10 15:12:45 +08:00
caoqianming e5fb485418 fix: RpjmemberCreateSerializer 的bug 2023-07-10 14:13:34 +08:00
caoqianming caaeb32817 feat: 增加能耗统计记录表 2023-07-10 13:45:22 +08:00
caoqianming 7af0447928 fix: cal_mpointstats 字符写错 2023-07-10 10:41:24 +08:00
caoqianming 9f46722f48 fix: cal_mpointstat_manual 标注bug 2023-07-10 10:20:24 +08:00
caoqianming 2884becf3f feat: 测点统计任务优化 2023-07-10 10:13:45 +08:00
caoqianming 56d9c50a39 fix: 非管理员不支持物理删除 2023-07-10 10:00:46 +08:00
caoqianming 377817f04c feat: sflog增加查询参数已获取当前值班记录 2023-07-07 15:36:49 +08:00
caoqianming 9d26946195 feat: bi exec查询参数校验 2023-07-07 15:36:06 +08:00
caoqianming 31ec00ba55 fix: 提前离厂只检查最近日志 2023-07-07 12:59:37 +08:00
caoqianming 9498e5eb22 feat: 测点统计记录支持手动创建 2023-07-06 17:03:28 +08:00
caoqianming ad0c3cdd7c fix: dataset validate默认sql_query为空/缺少查询参数提示 2023-07-06 16:58:04 +08:00
caoqianming e51d19fac0 fix: 初始化检测录入排序及取消质检任务执行 2023-07-06 14:48:33 +08:00
caoqianming e399e8fa4b fix: qm task 计算bug 2023-07-06 12:13:12 +08:00
caoqianming b672581c11 feat: 增加部分排序功能 2023-07-06 10:32:51 +08:00
caoqianming 9c83e9719e fix: qm task 计算时rate_pass 单独处理 2023-07-06 09:48:41 +08:00
caoqianming 79de49ed23 feat: 重新入厂的bug2 2023-07-06 09:10:45 +08:00
caoqianming 270b17e104 feat: 重新入厂的bug 2023-07-06 09:07:56 +08:00
caoqianming 1de238ca07 feat: 相关方人员重新入厂 2023-07-06 08:49:18 +08:00
caoqianming dab2d164b1 feat: 值班记录增加最后质检时间 2023-07-06 08:39:57 +08:00
caoqianming 46a5aa7cc7 fix: quastat task 计算优化3 2023-07-05 17:16:47 +08:00
caoqianming 4ae0ce1d9e fix: quastat task 计算优化2 2023-07-05 17:07:20 +08:00
caoqianming e0fcb2e22b fix: 初始化检测bug 2023-07-05 16:39:01 +08:00
caoqianming 07f517de58 fix: quastat task 计算优化 2023-07-05 16:32:08 +08:00
caoqianming a063db0c9b fix: quastat task 计算有误 2023-07-05 16:21:33 +08:00
caoqianming edd2dc5600 fix: 初始化检测录入rate_pass, create_by, belong_dept需要有 2023-07-05 16:17:10 +08:00
caoqianming eef4beebb4 fix: 修复quastat task 2023-07-05 16:02:28 +08:00
caoqianming 965e3169ba feat: 初始化检测录入bug 2023-07-05 14:35:21 +08:00
caoqianming a5272c6c6f fix: BulkCreateModelMixin bug 2023-07-05 14:23:23 +08:00
caoqianming 9d2108ce47 fix: quastat rate_pass字段可为空 2023-07-05 14:12:03 +08:00
caoqianming 066217d6c1 fix: 初始化检测录入bug 2023-07-05 14:06:44 +08:00
caoqianming ae84f6b6c9 feat: quastat 加入批量接口 2023-07-05 13:45:03 +08:00
caoqianming 235d17f193 feat: 设备增加power_kw查询 2023-07-05 13:44:41 +08:00
caoqianming 93881852d0 feat: sflog init_test接口 2023-07-05 13:44:07 +08:00
caoqianming 0f1bb7fd72 feat: utils增加批量接口mixin 2023-07-05 13:43:30 +08:00
caoqianming 388d9213fd feat: 增加了test_material字段 2023-07-04 13:30:19 +08:00
caoqianming 46b179b6ff doc: 补充注释 2023-07-04 10:11:16 +08:00
caoqianming fe117d05be feat: 增加input_materials 字段 2023-07-04 10:07:55 +08:00
caoqianming 1537da6bda feat: 增加fim app; 费用及成本配置 2023-07-04 10:07:15 +08:00
caoqianming 673fd0501c feat: equipment增加power_kw字段 2023-06-30 17:14:18 +08:00
caoqianming f62344509f feat: bi exec 支持code执行 2023-06-30 16:15:04 +08:00
caoqianming 73ade42f8d feat: visit增加来访事由 2023-06-30 15:12:39 +08:00
caoqianming 6b0e0fae3b feat: mpoint serializer增加material_name 2023-06-30 14:15:59 +08:00
caoqianming f6a15be31d feat: mpoint增加material字段 2023-06-30 12:09:57 +08:00
caoqianming f620dc0bcb refector: 生成排班记录 2023-06-30 10:24:15 +08:00
caoqianming a6167294f7 feat: sflog filter 2023-06-30 10:22:46 +08:00
caoqianming d285e09c5c fix: quastat create时年月日bug 2023-06-30 10:22:13 +08:00
caoqianming 3b427cce59 feat: 测点统计表及相关逻辑cal_val修改 2023-06-30 10:21:34 +08:00
caoqianming 72782163ab feat: admin增加mgroup 2023-06-30 10:19:10 +08:00
caoqianming d105218d9b fix: 删除布设时把监控该算法线程停止 2023-06-29 11:25:38 +08:00
caoqianming ef1ea0e784 fix: 通知提醒出错 2023-06-29 11:14:50 +08:00
caoqianming 6bbbf16049 feat: 值班记录排序 2023-06-28 09:13:14 +08:00
caoqianming 49fa109233 feat: 自动创建值班记录 2023-06-28 09:00:43 +08:00
caoqianming 783869638f fix: mpoint添加时mgroup必填 2023-06-27 16:08:45 +08:00
caoqianming e709b28d25 feat: mtm goal 接口 2023-06-27 14:17:25 +08:00
caoqianming 14539b89ba feat: 质量数据班日,班月,班年录入与处理 2023-06-27 13:49:03 +08:00
caoqianming 06c896c97f fix: perms_map 修改 2023-06-26 17:17:37 +08:00
caoqianming 13b0204c6b feat: quastat sflog create 不需要 belong_dept 2023-06-26 16:49:16 +08:00
caoqianming 51737bcdd8 fix: 权限代号调整 2023-06-26 16:45:52 +08:00
caoqianming 0e38b36ef5 feat: mtm相关表加入django后台 2023-06-26 16:33:06 +08:00
caoqianming 24fa17ddb5 fix: 修改字段后的bug 2023-06-26 16:29:51 +08:00
caoqianming 0145beb63f feat: 值班记录质量分析数据录入 2023-06-26 16:00:23 +08:00
caoqianming 07a8e5977f feat: 值班记录增加电耗统计 2023-06-25 17:10:39 +08:00
caoqianming ddd3f6a5f0 feat: 测点统计表接口 2023-06-25 17:09:19 +08:00
caoqianming c2ad28ae4b fix: 同步大华部门信息需要dahua_enabled 2023-06-25 16:50:54 +08:00
caoqianming a2b2cbe153 refector: 不需要打算法图片日志 2023-06-25 15:07:27 +08:00
caoqianming 24ce6836b3 fix: wf触发执行校验bug 2023-06-22 08:01:25 +08:00
caoqianming 730942598c fix: wf触发执行校验bug 2023-06-22 07:44:52 +08:00
caoqianming db1dddd70d fix: wf触发执行校验bug 2023-06-22 07:42:43 +08:00
caoqianming c99ab40d84 fix: wf触发执行校验bug 2023-06-22 07:40:26 +08:00
caoqianming a9825f5ad4 fix: rpj visit 在工单初始状态时可以编辑 2023-06-22 01:07:24 +08:00
caoqianming b2cfdf9995 fix: ticket_handle_permission_check 重新梳理 2023-06-22 00:14:17 +08:00
caoqianming d44f9751bb fix: 重复创建工单之隐藏bug 2023-06-21 22:50:05 +08:00
caoqianming df1b0c6b20 fix: 工单回到创建中的相应操作 2023-06-21 22:16:23 +08:00
caoqianming 50749cd10d fix: oplworker在工单开始状态可以新增 2023-06-21 17:14:35 +08:00
caoqianming 0787a9a70f fix: oplworker在工单初始状态下可删除 2023-06-21 17:10:18 +08:00
caoqianming e372015e7d fix: 校验重复创建工单 2023-06-21 16:50:03 +08:00
caoqianming 7ab3535c83 feat: task_ticket 默认发送通知 2023-06-21 15:31:36 +08:00
caoqianming 07822f093d feat: 工单回到创建中时更改作业状态 2023-06-21 15:14:06 +08:00
caoqianming 8a7ae2994e feat: 算法打印图片日志 2023-06-21 11:32:32 +08:00
caoqianming 1d16949d8a feat: 增加wpm,qm,mtm三个app 2023-06-20 17:05:50 +08:00
caoqianming 0312de5cf5 feat: opm operation 增加查询条件 2023-06-20 11:13:29 +08:00
caoqianming d2392a3c74 feat: 完善enm task相关功能 2023-06-15 16:57:29 +08:00
caoqianming 4f37b4c023 feat: 如果echart_options时以function开头就不处理了 2023-06-15 16:19:35 +08:00
caoqianming 21a1cc4e63 fix: 修改enm swagger read_only的展示 2023-06-15 08:37:14 +08:00
caoqianming 6b77346574 feat: 调整ai以适应算法部署到本地 2023-06-15 08:24:41 +08:00
caoqianming afa6cec3a0 fix: enm tasks bug 2023-06-14 16:50:11 +08:00
caoqianming 5f9ef83c6e feat: 完善enm表 2023-06-14 15:30:51 +08:00
caoqianming 2db95349b2 feat: 关闭工单时需要执行提交时调用方法 2023-06-13 09:29:51 +08:00
caoqianming cf4654a532 feat: 添加enm相关内容 2023-06-09 09:42:46 +08:00
caoqianming 52bb1ca367 feat: 修改系统自定义配置文件 2023-06-09 09:41:18 +08:00
caoqianming f452b43016 fix: 生成工单流水号 ok 2023-06-09 09:30:34 +08:00
caoqianming 91b2ac3755 Revert "fix: 工单流水号+1"
This reverts commit e8886902f2.
2023-06-09 09:11:16 +08:00
caoqianming 94ac4ddbe9 Revert "fix: 工单流水号不用加1"
This reverts commit 265d89c6f8.
2023-06-09 09:08:44 +08:00
caoqianming 059b044478 feat: 高处和动火校验证书是否上传 2023-06-08 10:35:39 +08:00
caoqianming 265d89c6f8 fix: 工单流水号不用加1 2023-06-08 10:26:46 +08:00
caoqianming ca485d9c78 fix: 矫正工单流水号bug 2023-06-08 10:15:49 +08:00
caoqianming d6198889f4 fix: 矫正工单流水号 2023-06-08 10:11:33 +08:00
caoqianming e8886902f2 fix: 工单流水号+1 2023-06-08 10:05:42 +08:00
caoqianming a7df6d339c fix: 作业删除时 删除可能的工单出现的bug 2023-06-08 09:21:53 +08:00
caoqianming 5c94f144bd fix: apk upload 修改sysconf 2023-06-08 09:14:56 +08:00
caoqianming c4e44cda26 feat: 算法处理失败时邮件通知 2023-06-07 14:51:37 +08:00
caoqianming 9d9e670240 feat: enm models初步设计 2023-06-07 13:48:00 +08:00
caoqianming d10b68c2b2 feat: 暂时不检查作业人员就位事件 2023-06-07 09:51:44 +08:00
caoqianming 8d08e2dde1 fix: operation 支持直接删除管理员操作 2023-06-07 09:42:21 +08:00
caoqianming 364abe1a3b feat: operation 支持直接删除管理员操作 2023-06-07 09:16:17 +08:00
caoqianming 31f5a402c0 feat: 有限空间气体检测记录必填 2023-06-05 14:30:13 +08:00
caoqianming 50fe411b71 feat: operation 增加筛选条件 2023-06-05 12:50:33 +08:00
caoqianming 15db992dff refetor: 修改get_ticket_sn 参数type 2023-06-03 16:56:02 +08:00
caoqianming 5d7880ca64 fix: opl ticket 撤回时支持修改oplworker gascheck 2023-06-03 16:33:25 +08:00
caoqianming 46b0638bfb feat: 添加enm app 2023-06-02 17:50:41 +08:00
caoqianming 5ded2347b7 feat: 更改部分系统配置为json自定义 2023-06-01 17:12:07 +08:00
caoqianming 313005eb5c refector: tlog查看权限放开 2023-05-31 16:49:46 +08:00
caoqianming ae071d1d9c perf: dataset exec 缓存优化 2023-05-31 09:19:32 +08:00
caoqianming 8a1d43b7b8 refector: 删除相关方时将该部门的账户禁用 2023-05-29 09:06:09 +08:00
caoqianming a3d9fe4606 feat: 报表模块基础开发 2023-05-26 13:02:43 +08:00
caoqianming a1efcb46da fix: 事件删除权限 2023-05-25 17:12:22 +08:00
caoqianming 515952ef8d fix: 管理员返回所有权限代号 2023-05-25 11:19:23 +08:00
caoqianming 2d2edc1ab3 fix: 管理员返回所有权限代号 2023-05-25 10:51:39 +08:00
caoqianming b338cbc34c refector: 如果超出时间不检查人员未就位 2023-05-25 10:46:31 +08:00
caoqianming 5131daa5cd feat: 接口增加默认缓存时间 2023-05-25 10:45:41 +08:00
caoqianming 3d9f04a443 refector: 管理员返回所有权限代号 2023-05-25 10:44:05 +08:00
caoqianming 863a301cb8 refector: visit audit end 修改司机入厂逻辑 2023-05-24 17:35:51 +08:00
caoqianming 9dff134329 fix: algo channel 添加bug 2023-05-24 17:19:32 +08:00
caoqianming 936af7c4fe feat: 开始添加设备管理模块 2023-05-22 15:55:32 +08:00
caoqianming b1ded623fa feat: 增加报表模块 2023-05-11 16:20:36 +08:00
caoqianming 4e6f4b249b fix: while 循环做card_door_authority的提高补偿机制次数 2023-05-09 17:02:41 +08:00
caoqianming eeca896a78 fix: 紧急bug 2023-05-09 09:52:54 +08:00
caoqianming 25e56b4bd0 feat: 查询用户列表可返回更详细的定位信息 2023-05-09 09:51:28 +08:00
caoqianming ef95b3c51f feat: 查询用户列表可返回更详细的定位信息 2023-05-09 09:46:44 +08:00
caoqianming b38e4860ac refector: 缓存区域信息带名字 2023-05-09 09:42:02 +08:00
caoqianming 702ef7641c fix: while 循环做card_door_authority的补偿机制4 2023-05-09 08:46:02 +08:00
caoqianming ca1a426182 fix: while 循环做card_door_authority的补偿机制3 2023-05-09 08:34:45 +08:00
caoqianming a395817028 fix: while 循环做card_door_authority的补偿机制2 2023-05-08 18:14:57 +08:00
caoqianming 8d3d1934b7 fix: while 循环做card_door_authority的补偿机制 2023-05-08 15:51:05 +08:00
caoqianming f59426b426 fix: 后入厂时的reason pop出 2023-05-06 13:20:07 +08:00
caoqianming 33cc805172 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-05-05 09:40:24 +08:00
caoqianming b1ec172829 refector: 尝试访问卡片以确保卡片生成 2023-05-05 09:40:20 +08:00
caoqianming 923e812890 fix: ep update 不放在事务中 2023-04-27 14:43:01 +08:00
caoqianming c2c05a5075 fix: opl level可为空 2023-04-27 14:42:33 +08:00
caoqianming e6933f9fc4 fix: rpjmember update rpj获取错误 2023-04-27 11:31:01 +08:00
caoqianming 7128e67e92 fix: 人员导出excel信息bug 2023-04-19 19:29:18 +08:00
caoqianming bc6aa5cacc fix: 人员导出excel信息bug 2023-04-19 19:25:39 +08:00
caoqianming 9192d9ffda fix: 人员导出excel信息bug 2023-04-19 19:20:52 +08:00
caoqianming aefd513987 fix: swipe_next exception_type 保存bug 2023-04-19 18:43:49 +08:00
caoqianming 6a0929dc10 fix: swipe_next还是通过save,这样可见update_time 变动 2023-04-19 17:36:10 +08:00
caoqianming aa84d50957 feat: employee导出并增加是否有定位卡的筛选 2023-04-18 19:34:03 +08:00
caoqianming 3410f5d968 feat: MySchedule创建时自动获取汉语描述 2023-04-18 18:10:50 +08:00
caoqianming 0303184ceb feat: 阿里云短信加入auto_log装饰器 2023-04-17 08:21:07 +08:00
caoqianming 1c661631ea fix: 加签和加签完成接口需要校验 2023-04-17 00:05:32 +08:00
caoqianming a757321f5c fix: 解决cache_areas_info重复执行的问题 2023-04-15 21:10:16 +08:00
caoqianming c4805c8d8e fix: 相关方中途入厂时因事务引发的bug 2023-04-15 21:02:33 +08:00
caoqianming 3af691844b fix: rpj_member_leave 中更新当前入厂项目bug 2023-04-15 18:25:19 +08:00
caoqianming 59e89c19ba fix: 解决cache_areas_info重复执行的问题 2023-04-15 17:54:18 +08:00
caoqianming 64bdd72146 fix: snap_and_analyse时更新缓存 2023-04-15 17:32:58 +08:00
caoqianming 284a36e24c fix: snap_and_analyse时更新缓存 2023-04-15 17:32:44 +08:00
caoqianming 0b1323b41d feat: 支持开启服务侧算力监控 2023-04-14 17:20:32 +08:00
caoqianming ba937ce751 refector: 一点优化 2023-04-14 16:54:10 +08:00
caoqianming 65ff80db75 refector: 工作流脚本每次失败都记录日志 2023-04-14 16:53:35 +08:00
caoqianming 2d2f171c32 feat: tdevice 视频通道查询带third_info 2023-04-14 16:26:21 +08:00
caoqianming 03ac2a5b1b refector: 命名修改 2023-04-14 16:24:56 +08:00
caoqianming d9c318de8e refector: 证书检索条件 2023-04-13 17:16:46 +08:00
caoqianming c097b44e0c fix: 文件上传不做幂等操作 2023-04-13 09:45:13 +08:00
caoqianming 50553bd0c0 fix: swip_next bug 2023-04-13 08:01:11 +08:00
caoqianming 005919af19 fix: 直接请求user列表不应该返回删除的用户 2023-04-12 18:03:24 +08:00
caoqianming 68c54a73e3 refector: swipe_next 优化2 2023-04-12 17:10:38 +08:00
caoqianming f4aacc2129 refector: swipe_next 优化 2023-04-12 17:06:38 +08:00
caoqianming 8f2bea554f feat: 摄像头支持随时开启算法监控(每10s拍照) 2023-04-12 15:56:50 +08:00
caoqianming eea05cf6f3 refector: 事件处理取消一些限制 2023-04-12 15:50:58 +08:00
caoqianming 2b054107c0 fix: 非工单节点下的流转不继续 2023-04-12 14:20:48 +08:00
caoqianming 14dc063f59 refector: post请求进行幂等操作 2023-04-12 14:19:18 +08:00
caoqianming 0bb351fb99 fix: 修改opl level字段默认为空字符 2023-04-12 14:18:23 +08:00
caoqianming 9d68a7006e refector: 修改dpm字段 2023-04-12 14:17:45 +08:00
caoqianming 557f95e4cf fix: 权限cache维持300s 2023-04-10 14:57:41 +08:00
caoqianming 731c93ce71 fix: get_user_perms_map 中 data_range取最小值 2023-04-10 14:56:41 +08:00
caoqianming 1a61e5ab27 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-04-07 15:06:30 +08:00
caoqianming 121d6ec15c feat: 增加相关方黑名单 2023-04-07 15:06:26 +08:00
caoqianming a6f5137dff fix: close_visit_by_leave_time 待入厂也应正常关闭 2023-04-05 10:15:05 +08:00
caoqianming 8df57ed99a refector: 开启关闭监控加入日志记录 2023-04-05 10:04:35 +08:00
caoqianming 96c12108e0 fix: 工单流水号bug 2023-04-03 14:53:40 +08:00
caoqianming 4c4e637cc3 fix: rparty delete同步dept 2023-04-03 14:01:38 +08:00
caoqianming 7cbd581701 fix: rparty create时dept字段冲突2 2023-04-03 13:35:54 +08:00
caoqianming cd3a0393ad fix: 生成工单流水号bug 2023-04-03 13:19:06 +08:00
caoqianming 3baa41b504 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-04-03 12:44:17 +08:00
caoqianming ec6c1c3d84 fix: rparty create时dept字段冲突 2023-04-03 12:44:13 +08:00
caoqianming be530ca9b9 fix: am config修改 2023-04-02 10:18:24 +08:00
caoqianming e32f82ace7 refector: send_mail_task优化 2023-03-31 23:16:40 +08:00
caoqianming f2c02a76d4 refector: send_mail_task优化 2023-03-31 10:14:01 +08:00
caoqianming 876c7734f1 refector: 工单 bind_x 优化 2023-03-30 12:22:13 +08:00
caoqianming a415859a26 fix: 许可证在工单撤回状态下可以编辑 2023-03-30 11:13:35 +08:00
caoqianming 201eabf33e fix: filter_dept字段长度修改 2023-03-30 10:08:49 +08:00
caoqianming ebcef8721f fix: clock record view加入权限控制 2023-03-29 16:53:03 +08:00
caoqianming 0766cba363 Merge branch 'v2' 2023-03-29 16:36:03 +08:00
caoqianming 7908b06cd1 fix: opl monitor不用celery 2023-03-29 10:22:41 +08:00
caoqianming 9b0de2e011 refector: user is_active用is_deleted统一处理 2023-03-28 10:46:34 +08:00
caoqianming 6d1c9e03c9 refector: 短信发送备用渠道,未写 2023-03-28 09:51:30 +08:00
caoqianming 76ce412741 fix: close_rpj_by_leave_time 执行 rpj_m_leave 2023-03-27 13:03:50 +08:00
caoqianming a046fa46f0 fix: 打卡记录导出bug2 2023-03-24 17:52:37 +08:00
caoqianming e0210c4bef fix: 打卡记录导出bug 2023-03-24 17:49:33 +08:00
caoqianming 1ed0a2542e fix: 入厂后账户启用 2023-03-24 17:34:42 +08:00
caoqianming 49abd43cf3 fix: 该项目成员已做离厂操作 2023-03-24 16:39:21 +08:00
caoqianming ce90e11c36 fix: idempotent 加入request_path 2023-03-24 16:38:51 +08:00
caoqianming 503953bb11 fix: 成员离厂有限制2 2023-03-24 16:23:56 +08:00
caoqianming 1966dde2c0 fix: 成员离厂有限制2 2023-03-24 16:20:50 +08:00
caoqianming 9d7739ae59 fix: 成员离厂有限制/大华启用才校验图片接口 2023-03-24 15:31:20 +08:00
caoqianming 068474f4e6 refector: rpjmember destory改回 2023-03-24 14:56:43 +08:00
caoqianming e2a6b669ff refector: rpj_member_leave 当前项目回写 2023-03-24 10:06:04 +08:00
caoqianming ffb6ac2720 refector: hrm sync 加入dh enabled判断 2023-03-24 10:04:57 +08:00
caoqianming 7c08b2374f fix: rpjlog缺少字段 2023-03-23 17:46:20 +08:00
caoqianming a4c54c48e0 feat: rpj member 后入厂和提前离厂 2023-03-23 17:42:44 +08:00
caoqianming 1f8963514f refector: 离职或退休可提供当前8h内的门禁时间 2023-03-23 17:15:56 +08:00
caoqianming 023dd12195 refector: 工单处理日志返回带签名图片 2023-03-23 13:48:58 +08:00
caoqianming 3c91e23cec refector: 正式环境500才发邮件 2023-03-23 13:48:13 +08:00
caoqianming 8628d0a74b fix: 事件通知只发给active的账号 2023-03-23 11:16:56 +08:00
caoqianming b217f30c59 fix: >10h算加班 2023-03-23 11:16:02 +08:00
caoqianming 1606213cbc refector: 打卡记录导出 2023-03-23 11:15:12 +08:00
caoqianming e4aad35f06 feat: 算法布设可开启实时监控任务(循环抓拍) 2023-03-21 18:17:55 +08:00
caoqianming 74b8681a8a fix: 更新入厂项目人员证书库按name 和 number 共同唯一 2023-03-17 17:54:50 +08:00
caoqianming 8b19556aff feat: 相关方出入厂人员添加去除等功能-待完成 2023-03-17 17:42:45 +08:00
caoqianming bb5e9925ea feat: 增加幂等装饰器并用在create方法上 2023-03-17 16:24:09 +08:00
caoqianming 6a328a25c8 refector: 证书编号可以不唯一 2023-03-17 11:25:07 +08:00
caoqianming f303801401 fix: rpj update 需要提供belong_dept和rparty 2023-03-17 09:28:54 +08:00
caoqianming be254372c0 fix: cr导出只显示上下班的 2023-03-16 13:25:37 +08:00
caoqianming 4478bb7b99 refector: cswipe_next优化 2023-03-16 12:28:48 +08:00
caoqianming 8fffce82b3 refector: correct_swip_task pageData 按 swingTime排序 2023-03-16 11:26:10 +08:00
caoqianming 7f8d7332aa refector: clock record detail还是多放一些信息 2023-03-16 00:08:39 +08:00
caoqianming 379f27fe48 refector: 刷卡推送优化detail添加channelCode 2023-03-15 23:45:11 +08:00
caoqianming 5dc43246e2 refector: hrm clockrecord 从大华侧请求带my_info数据 2023-03-15 23:13:21 +08:00
caoqianming ecbe077e55 fix: correct_swip_task bug 2023-03-15 21:12:02 +08:00
caoqianming 1c5e236e15 fix: swipe_next 先创建cr bug 2023-03-15 21:01:57 +08:00
caoqianming 0608d9045a fix: e_type为3 card_type判定 2023-03-15 20:14:54 +08:00
caoqianming dbf7fe7b20 fix: correct_swip_task bug 2023-03-15 18:13:53 +08:00
caoqianming 16daa861bd feat: 打卡记录增加忽略记录项目并进行代码优化 2023-03-15 18:07:42 +08:00
caoqianming 7cec134265 refector: correct_swip_task 从大华打卡记录里校正打卡记录 2023-03-15 00:29:01 +08:00
caoqianming f0b4544813 fix: 打卡记录推测bug 2023-03-14 23:17:56 +08:00
caoqianming 717c43ca50 feat: 增加考勤预测类型加班和缺卡并进行逻辑处理 2023-03-14 18:20:47 +08:00
caoqianming 5826e407f5 refactor: operation patch 增加 dept_ter dept_bus 2023-03-14 16:30:19 +08:00
caoqianming 215b18314c 工单过滤字段支持反向查询 2023-03-14 16:03:44 +08:00
caoqianming 5a3c380dff opl visit rpj 添加ticket的related_name 字段 2023-03-14 16:02:22 +08:00
caoqianming 5ebd884f18 离线刷卡记录订阅与推送处理 2023-03-14 15:04:00 +08:00
caoqianming 15111a7a9a visit 增加vehicle_photos 字段及其接口修改 2023-03-13 17:40:57 +08:00
caoqianming f5ec3434d3 hrm 考勤推测优化 2023-03-13 16:55:52 +08:00
caoqianming 41e96084b8 开始写 monitor_and_analyse 方法 2023-03-12 22:32:33 +08:00
caoqianming 8ac24740db 获取大华视频rtsp流 2023-03-12 21:58:31 +08:00
caoqianming 977c0527b1 刷卡考勤推测优化 2023-03-12 21:09:54 +08:00
caoqianming 5f1ac8ce40 刷卡考勤推测优化 2023-03-12 21:08:24 +08:00
caoqianming 5f614bf164 限制属地和业务部门为本公司部门 2023-03-12 20:40:31 +08:00
caoqianming cf10e498a0 调整了cv2 绘制图框的颜色 2023-03-12 12:47:17 +08:00
caoqianming c12f057790 修改 dahua xunxi 登录的timeout为10 2023-03-12 09:35:59 +08:00
caoqianming cf26cc69a8 opl_end时close_mtask 参数类型错误 2023-03-12 08:09:49 +08:00
caoqianming dc5d3d184f 修改always_on默认值 2023-03-10 17:43:00 +08:00
caoqianming 7fdb9fb74f 强制修改工单状态 2023-03-10 17:38:38 +08:00
caoqianming 744f54874c Merge branch 'v2' 2023-03-10 17:10:10 +08:00
caoqianming 3200ef33fc Merge branch 'develop' 2023-03-10 17:10:00 +08:00
caoqianming e3749d81a2 Merge branch 'develop' into v2 2023-03-10 17:09:25 +08:00
caoqianming 1916747947 dpm migrations 2023-03-10 17:09:02 +08:00
caoqianming 57da3eddb4 myschedule migrations 2023-03-10 17:08:45 +08:00
caoqianming f54cd0028f tdevice 增加mtask_uid 2023-03-10 17:08:03 +08:00
caoqianming 367d9b31dd 打卡时判断异常情况 2023-03-10 16:07:59 +08:00
caoqianming 830dee3358 dhclient snap 有可能失败进行处理 2023-03-10 14:53:39 +08:00
caoqianming 5cb1331000 告警间隔时间内不触发 2023-03-10 14:53:11 +08:00
caoqianming 403b97568a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-03-09 23:59:58 +08:00
caoqianming 7a37428b0f 修改my_log文件名为decorators 2023-03-09 23:59:41 +08:00
caoqianming be30c4d234 管理员重置密码 2023-03-09 10:54:41 +08:00
caoqianming d91c0b2bfe 相关方访客入厂关闭时同时关闭工单 2023-03-09 09:46:34 +08:00
caoqianming d0b6e46613 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_server into v2 2023-03-08 17:34:39 +08:00
caoqianming ee4a0448ca 如果账户禁用,不再发送短信通知 2023-03-08 17:34:21 +08:00
caoqianming 006f0ace98 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_server into v2 2023-03-04 23:16:53 +08:00
caoqianming f184ddc094 准备写实时监控rtsp进行算法识别 2023-03-04 23:15:54 +08:00
caoqianming 6cdf791429 am ready cache_area_info 2023-03-04 23:15:28 +08:00
caoqianming 6f25ebdd42 ecm algochannel 变更为always_on 为false 2023-03-03 10:03:41 +08:00
caoqianming f96a62d5e9 增加myschedule model 2023-03-03 10:03:10 +08:00
caoqianming 0bb4595ee6 增加myschedule 2023-03-03 10:02:41 +08:00
caoqianming 0a59af9c65 增加edu app 2023-03-03 10:02:09 +08:00
caoqianming 2aad51811c 增加dpm 双控app 2023-03-03 10:01:37 +08:00
caoqianming f5432d3884 更改刷脸类型 correct_enter_or_exit 2023-03-02 23:31:19 +08:00
caoqianming 3c3bb556db monitor drflog view_method字段增加 2023-03-02 23:30:51 +08:00
caoqianming e7af79a51a employee detail 取消door_range 字段 2023-03-02 22:29:04 +08:00
caoqianming 88db4fbcd4 hrm增加退休 2023-03-02 18:04:00 +08:00
caoqianming 34de8fdfec sms.py 优化 2023-03-02 16:58:38 +08:00
caoqianming 029459ce5e mylog, tasks, wxmp优化 2023-03-02 16:57:23 +08:00
caoqianming 4ab329c043 添加edu app 2023-02-21 10:39:31 +08:00
caoqianming ab880ae8ad 工作流查询优化 2023-02-20 09:07:03 +08:00
caoqianming 6c04d161f8 config 操作函数 2023-02-20 09:04:36 +08:00
caoqianming 9776ef42cd 添加websocket auth middleware 2023-02-20 09:03:51 +08:00
caoqianming c350c40941 开发模式下返回500详细信息 2023-02-20 09:02:49 +08:00
caoqianming e0945986a3 取消cache areas info 2023-02-17 00:12:19 +08:00
caoqianming 989e0930f2 更改sys_version 2023-02-16 11:26:20 +08:00
caoqianming bad884ce26 添加auto_log装饰器 2023-02-14 11:02:29 +08:00
caoqianming 74f6b737cb opl task daemon True 2023-02-14 10:31:10 +08:00
caoqianming 6960593041 绘制矩形框bug2 2023-02-13 17:16:32 +08:00
caoqianming 83467dceb4 绘制矩形框bug 2023-02-13 16:25:48 +08:00
caoqianming a7d60d69ae 算法测试 2023-02-13 16:09:50 +08:00
caoqianming d638448fa6 算法 log 一下 2023-02-13 15:57:02 +08:00
caoqianming d7a6adead7 opeartion partial update 2023-02-13 15:19:25 +08:00
caoqianming 0b8884cc2a 图片压缩功能 2023-02-13 15:18:54 +08:00
caoqianming 1dfb9626cc wf 更改ticket 状态接口 2023-02-12 21:05:56 +08:00
caoqianming 1833c1a7ff 开启关闭任务优化 2023-02-11 18:32:41 +08:00
caoqianming 5a25bfe343 开启关闭任务优化 2023-02-11 17:50:49 +08:00
caoqianming 870d87b44d 彻底停止作业监控 2023-02-11 17:14:43 +08:00
caoqianming 940f07033c opm start_mtask 关闭不可开启 2023-02-11 16:35:19 +08:00
caoqianming eda09432f4 operation path vchannels 2023-02-11 16:28:23 +08:00
caoqianming 9a9fe62baa 未知人员修改为人员 2023-02-11 16:27:56 +08:00
caoqianming 5b04858d2e 开启作业监控前关闭可能存在的 2023-02-10 12:21:15 +08:00
caoqianming 1646621844 开启作业监控前关闭可能存在的 2023-02-10 12:07:43 +08:00
caoqianming 93a00363b2 事件记录导出完成 2023-02-09 08:51:40 +08:00
caoqianming cb33dcb021 导出事件excel part2 2023-02-08 23:14:14 +08:00
caoqianming 73b0ce7cb7 事件导出excel part1 2023-02-08 17:33:55 +08:00
caoqianming afdd7a67ca Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-02-07 21:09:01 +08:00
caoqianming 90f79a7c99 wf报错优化 2023-02-07 21:08:57 +08:00
caoqianming bcef2026b0 ticketflow 增加 transition_ 返回 2023-01-30 13:41:07 +08:00
caoqianming f34b40ed3c rparty list search 2023-01-03 09:16:35 +08:00
caoqianming 2e67bcd48b 合并冲突 2023-01-02 23:22:01 +08:00
caoqianming 4d96f2d77a third dahua xunxi speaker 优化3 2023-01-02 23:19:18 +08:00
caoqianming cf0ac02660 third dahua xunxi speaker 优化2 2022-12-31 20:21:01 +08:00
caoqianming 7e3a1f4f78 third dahua xunxi speaker 优化 2022-12-24 14:10:22 +08:00
caoqianming ceb86617e2 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-12-24 14:04:26 +08:00
caoqianming 0fdfac0ae2 格式化 2022-12-24 14:04:10 +08:00
caoqianming d388871e7c speaker.py 优化 2022-12-23 17:42:04 +08:00
caoqianming 76b1fa0b82 dahua xunxi exception bug 2022-12-23 17:21:57 +08:00
caoqianming 46a1fcf50a workflow clone 接口 2022-12-22 16:58:31 +08:00
曹前明 477bde5af8 面板机打卡bug 2022-11-24 13:14:19 +08:00
曹前明 c676106e61 办公楼面板机打卡 2022-11-23 16:12:02 +08:00
caoqianming 2ffb5c9e3d 导出excel key 不存在的bug 2022-11-18 16:49:13 +08:00
caoqianming 58cd565977 event handle bug 2022-11-18 08:57:08 +08:00
caoqianming e84f012e09 获取三方token优化 2022-11-17 17:50:17 +08:00
caoqianming e24c632593 事件处理bug 2022-11-17 17:23:22 +08:00
caoqianming 09b6d7b182 correct_card_time 2022-11-15 15:51:56 +08:00
caoqianming d4e2db10f1 同步门禁时间范围bug 2022-11-15 14:22:08 +08:00
caoqianming 95dbaeee5f ticket list 返回待处理人 bug 2022-11-15 11:30:23 +08:00
caoqianming 4418e62ed6 dbbackup url 2022-11-14 13:07:16 +08:00
caoqianming 0981700f30 wf run task 优化 2022-11-14 10:39:08 +08:00
caoqianming 839e11b575 clear_dbbackup bug 2022-11-11 14:30:14 +08:00
caoqianming 03323fec17 数据库删除备份2 2022-11-11 14:25:53 +08:00
caoqianming 774db13d92 数据库删除备份 2022-11-11 14:18:26 +08:00
caoqianming b999ef60b3 数据库备份任务和查看接口 2022-11-11 10:02:42 +08:00
caoqianming 2badb9c45c 复杂查询 swagger 2022-11-10 15:32:25 +08:00
caoqianming d961a02378 cquery try 一下 2022-11-10 14:47:48 +08:00
caoqianming f942540b49 提供复杂查询接口 2022-11-10 14:12:03 +08:00
caoqianming c12d356b34 500邮件埋点 2022-11-10 10:14:09 +08:00
caoqianming e47c9cd0ad send_mail_task 默认参数 2022-11-10 09:48:58 +08:00
caoqianming b09e3e396a 工单脚本执行增加重试机制 2022-11-10 09:37:43 +08:00
caoqianming 19cfad5412 event service ec_codes 默认{} 2022-11-09 11:27:15 +08:00
曹前明 b04473cc3b 小优化 2022-11-07 22:07:03 +08:00
曹前明 dd3f3857b8 先关闭安全帽补偿机制 2022-11-07 21:51:52 +08:00
caoqianming 1f03e108d3 等待卡片生成时间延长 2022-11-07 17:27:19 +08:00
caoqianming c4dea515a2 人员列表增加手机号检索 2022-11-07 10:42:41 +08:00
曹前明 22e9bb38c3 邮件发送测试 2022-11-07 08:07:32 +08:00
曹前明 91f20a73af rpj, visit, opl删除时同步删除工单 2022-11-04 07:20:17 +08:00
曹前明 b0cf23834a 获取处理人bug 2022-11-04 06:57:30 +08:00
caoqianming 97bdde5888 hrm detail get_location bug 2022-11-03 16:12:45 +08:00
caoqianming 5b7b180ee1 清除日志记录,可更改时间 2022-11-03 16:01:37 +08:00
caoqianming 2448406e97 计算区域人员数量bug 2022-11-03 15:45:13 +08:00
caoqianming 1bf37aa239 重跑一段时间的打卡记录bug 2022-11-03 13:08:37 +08:00
caoqianming 6c846386e6 重跑一段时间的打卡记录bug 2022-11-03 12:55:07 +08:00
caoqianming 9f6f3ddb62 重跑一段时间的打卡记录 2022-11-03 12:42:34 +08:00
caoqianming 8d5a2a0983 打卡bug修复 2022-11-03 11:25:03 +08:00
caoqianming d73a35da6b 打卡bug修复 2022-11-03 11:02:32 +08:00
caoqianming de8ae9d740 打卡bug修复 2022-11-03 10:41:57 +08:00
caoqianming 7f1e6f0c56 打卡排序/许可证排序 2022-11-02 17:09:51 +08:00
caoqianming 64a331a825 swagger bug 2022-11-02 15:18:30 +08:00
caoqianming a5940c869c 安全帽识别增加补偿机制 2022-11-02 13:24:04 +08:00
caoqianming c4c8bb1898 打卡逻辑更新 2022-11-02 13:19:47 +08:00
caoqianming 3ee00bdbcf apk get 无需登录 2022-11-02 13:02:43 +08:00
caoqianming faab2f954a 部分优化 2022-11-01 17:43:28 +08:00
caoqianming 27dd44d436 visit audit bug 2022-11-01 15:21:51 +08:00
caoqianming 80108274ea visit_driver_end bug 2022-11-01 14:31:09 +08:00
caoqianming 10f19272eb visit belong_dept 默认公司 2022-11-01 13:52:12 +08:00
caoqianming d9190abdd5 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-11-01 12:57:10 +08:00
caoqianming 7d71834c02 bind visit bug 2022-11-01 12:57:08 +08:00
曹前明 f6b0f75073 许可证增加排序 2022-10-31 21:57:55 +08:00
曹前明 f2aadec871 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-30 21:57:52 +08:00
曹前明 b57ff355c3 rpj create 返回信息 2022-10-30 21:57:48 +08:00
caoqianming a787c02fa6 save_dahua_pic提供自定义路径 2022-10-28 17:13:42 +08:00
caoqianming 874d427df3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-28 16:36:54 +08:00
caoqianming 4fa0bb11d1 页面文字修改 2022-10-28 16:36:49 +08:00
曹前明 bdc57a91c9 未穿防烫服事件 2022-10-27 21:49:56 +08:00
曹前明 1dba032737 算法img bug 2022-10-27 21:37:50 +08:00
caoqianming 22412d0be1 相关方/访客项目可进行删除操作 2022-10-27 17:39:27 +08:00
caoqianming 55176e2cfe visit belong_dept 2022-10-27 15:59:39 +08:00
caoqianming a973b62fe8 employee 支持belong_dept filter 2022-10-27 14:06:44 +08:00
caoqianming 44778466cc ai_analyse bug 2022-10-27 13:23:28 +08:00
caoqianming ae2397595f ai_analyse bug 2022-10-27 13:19:58 +08:00
caoqianming 5f3eee5c7c ai_analyse bug 2022-10-27 13:16:34 +08:00
caoqianming c05add8952 算法识别结果尝试加入矩形框 2022-10-27 12:03:09 +08:00
caoqianming 19cbd6dd2a 算法优化一下 2022-10-27 10:25:11 +08:00
caoqianming 9aeb2510a9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-27 10:07:12 +08:00
caoqianming 0a1b068ea1 develop 增加测试接口 2022-10-27 10:07:09 +08:00
曹前明 5b32b838eb 算法识别bug 2022-10-26 21:47:49 +08:00
caoqianming 2549adc08a 加入多个新算法 2022-10-26 18:10:25 +08:00
caoqianming fe2ae8cd35 打卡记录导出增加身份证号列 2022-10-26 17:58:59 +08:00
caoqianming 6f6ee439d7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-26 08:42:53 +08:00
caoqianming 12c5aa5996 ep detail get_location bug 2022-10-26 08:42:50 +08:00
曹前明 9fd220f526 ep update 允许name变更 2022-10-25 21:28:52 +08:00
caoqianming 738da6d183 hrm ep detail返回详细定位信息 2022-10-25 16:20:22 +08:00
曹前明 90a4e46cc8 rpm分配账号可选已有的/至少选择一位访客/成员 2022-10-24 19:02:19 +08:00
曹前明 99f84f48cd bind rpj bug 2022-10-24 09:04:36 +08:00
曹前明 98035be264 empolyee update dahua 2022-10-23 14:00:21 +08:00
曹前明 63bd3286c6 校正性别 2022-10-22 23:48:13 +08:00
曹前明 08d1faf97e 校正性别 2022-10-22 23:33:03 +08:00
曹前明 97710370b6 人脸识别阈值 2022-10-20 17:54:58 +08:00
曹前明 885497f651 身份证号校验错误bug 2022-10-20 17:34:36 +08:00
曹前明 f7e06d67a1 身份证号校验错误bug 2022-10-20 17:29:37 +08:00
曹前明 0f3ca55ac3 hrm signal bug 2022-10-20 15:31:29 +08:00
曹前明 c478425b12 打卡记录导出bug 2022-10-19 20:05:42 +08:00
曹前明 d7cdca48a6 相关方data filter 2022-10-19 19:58:23 +08:00
曹前明 f0ee937af7 打卡记录导出 2022-10-19 19:58:05 +08:00
曹前明 d4e9406666 clockrecord增加筛选/身份证号校验取消 2022-10-19 11:59:52 +08:00
曹前明 0137da7479 blt all 只返回在线标签 2022-10-19 09:53:13 +08:00
曹前明 e439278da5 blt all 只返回在线标签 2022-10-19 09:42:55 +08:00
曹前明 cfc6b072c6 缓存区域信息 2022-10-18 19:16:54 +08:00
曹前明 2ad6d2a3be visitor 注册时创建ep 2022-10-18 14:06:05 +08:00
曹前明 02c387daf4 hrm info get_or_create 2022-10-18 12:16:38 +08:00
曹前明 af61d75177 访客账户注册时关联已有人员优化 2022-10-18 11:38:20 +08:00
曹前明 a6b71c9450 访客账户注册时关联已有人员bug 2022-10-18 11:16:24 +08:00
曹前明 9f1cf30957 访客账户注册时关联已有人员bug 2022-10-18 11:09:45 +08:00
曹前明 aafc3b1ba4 访客账户注册时关联已有人员bug 2022-10-18 11:06:29 +08:00
曹前明 fad13077f6 访客账户注册时关联已有人员 2022-10-18 10:19:35 +08:00
曹前明 53db781742 新建h5文件夹 2022-10-17 19:38:38 +08:00
曹前明 a4a6cd4a93 stop mtask view bug 2022-10-16 00:33:18 +08:00
曹前明 96b851e6bd apkview post bug 2022-10-16 00:13:11 +08:00
曹前明 831167f1f9 opl mtask_uid 2022-10-15 23:53:45 +08:00
caoqianming b129355aec start_mtask 返回mtask_id 2022-10-14 18:16:06 +08:00
caoqianming 3180af943c app端密钥登录validate 2022-10-14 13:41:20 +08:00
caoqianming e0d779d623 opl serializer 增加字段 2022-10-13 14:54:17 +08:00
caoqianming 2b4ae76eff opl serializer 增加字段 2022-10-13 14:51:13 +08:00
caoqianming 348ef951c6 django validationerr 加到 util exception 2022-10-13 09:07:21 +08:00
caoqianming 9227038836 clockrecord filter year month bug 2022-10-13 09:06:53 +08:00
caoqianming 415db7d998 解决雪花ID重复问题 2022-10-11 17:51:21 +08:00
caoqianming b2534d5471 雪花ID重复预处理 2022-10-11 17:09:05 +08:00
caoqianming aff9c0d613 bind_opl 增加字段 2022-10-11 15:54:58 +08:00
caoqianming 13f7a31d16 opl增加workscope 2022-10-11 15:53:59 +08:00
caoqianming 448dccbcac opl list detail serializer优化 2022-10-11 09:41:38 +08:00
caoqianming 62299f4d85 rpj create 返回id 2022-10-10 15:22:28 +08:00
caoqianming c068885888 增加coordinator_name和sys_version 2022-10-10 12:59:13 +08:00
caoqianming 026f656f2e vpeople增加防疫相关内容 2022-10-10 10:14:47 +08:00
曹前明 e8ae55606f 三方token 不过期 2022-10-04 21:20:40 +08:00
曹前明 7aa6f5ccea 获取三方token bug 2022-10-04 20:47:38 +08:00
曹前明 9c4388da78 用redis保存第三方token 2022-10-04 20:33:29 +08:00
曹前明 38b5512001 取消记录寻息成功日志 2022-10-04 11:29:46 +08:00
曹前明 3a38ee28b9 单例模式修改 2022-10-04 11:19:06 +08:00
曹前明 3c01174105 用celery更新token 2022-10-04 10:07:03 +08:00
曹前明 ba4a02b67b 用celery更新token 2022-10-04 10:05:16 +08:00
曹前明 aabb7aefea 寻息接口修改 2022-10-04 09:45:27 +08:00
曹前明 34d8aee962 三方接口异常打日志处理 2022-10-04 09:25:44 +08:00
曹前明 e3a94e9a72 三方接口处理问题 2022-10-04 09:03:31 +08:00
曹前明 7e9d5fe7b0 三方接口处理问题 2022-10-03 21:50:05 +08:00
曹前明 574254f7bc 三方接口处理问题 2022-10-03 14:13:58 +08:00
曹前明 f7b8186e55 三方接口处理问题 2022-10-03 14:11:35 +08:00
曹前明 e89e4dc180 同步数据库 2022-10-03 13:30:10 +08:00
曹前明 1042724b70 工单短信用多线程发送 2022-10-03 13:26:50 +08:00
曹前明 7a3c46c8f1 访问项目增加其他/作业监控任务停止时将mtask置空 2022-09-27 16:35:45 +08:00
曹前明 f22b1f6dc6 handle_xx_event_2 不默认区域 2022-09-27 08:44:14 +08:00
曹前明 4d11516869 卡片不存在做额外处理/增加清除日志任务 2022-09-26 17:46:16 +08:00
曹前明 cc2785d42e 第三方请求优化 2022-09-26 15:06:33 +08:00
曹前明 5d15469b05 tlog增加headers 2022-09-26 13:17:00 +08:00
曹前明 862210f8d3 身份证校验规则问题 2022-09-24 19:50:48 +08:00
曹前明 697e50b520 身份证校验错误bug 2022-09-24 19:16:55 +08:00
曹前明 7e890d87a9 来访项目可硬删除 2022-09-24 12:47:39 +08:00
曹前明 d0f3a59706 notify_event remployee bug 2022-09-24 12:38:56 +08:00
曹前明 efacae0549 check_miss_lcard bug 2022-09-24 12:26:25 +08:00
曹前明 561bc92c4a OperationDetailSerializer bug 2022-09-24 11:49:10 +08:00
曹前明 6556379273 develop test_not_in_place 2022-09-24 11:34:59 +08:00
曹前明 3433071b06 user info bug 2022-09-24 09:36:21 +08:00
曹前明 b874a9225f user info bug 2022-09-24 07:53:08 +08:00
曹前明 3c633b6370 user info bug 2022-09-24 07:50:27 +08:00
曹前明 4ad64f8aa5 bug 2022-09-24 07:46:50 +08:00
曹前明 61bf316329 获取用户信息更完整 2022-09-23 20:45:27 +08:00
曹前明 eb40747ed3 Operation 取消datafilter 2022-09-23 20:27:26 +08:00
曹前明 a960d4a9b8 RpjCreateUpdateSerializer 所属字段可为空 2022-09-23 17:48:55 +08:00
曹前明 d2a473b4a7 RpjCreateUpdateSerializer 所属字段可为空 2022-09-23 17:47:07 +08:00
曹前明 827d40a3f9 2分钟不再次触发 违规进入 2022-09-23 12:16:12 +08:00
曹前明 cc4b4c9365 超时滞留 bug 2022-09-23 11:58:14 +08:00
曹前明 5e6cb50f6f get_area_from_point 优化 2022-09-23 11:02:36 +08:00
曹前明 9c00a173ae dispath dahua event 大改后bug3 2022-09-23 10:36:34 +08:00
曹前明 1910a0fc88 dispath dahua event 大改后bug2 2022-09-23 10:34:55 +08:00
曹前明 12d86ae839 dispath dahua event 大改后bug 2022-09-23 10:27:24 +08:00
曹前明 32cdb2ad59 dispath dahua event 大改 2022-09-23 10:24:44 +08:00
曹前明 7e2ad9ea03 dispath dahua event bug 2022-09-23 10:00:57 +08:00
曹前明 600a1785f8 dispath event 优化 2022-09-23 09:56:19 +08:00
曹前明 48f4b22c6a dispath dahua event 优化 2022-09-23 09:51:55 +08:00
曹前明 7722a82a04 helmet2 bug 2022-09-22 18:52:54 +08:00
曹前明 1bdb26b7fa helmet2 bug 2022-09-22 18:37:45 +08:00
曹前明 879e91a8f9 helmet2 bug 2022-09-22 18:33:45 +08:00
曹前明 a2f156926d 获取apk信息bug 2022-09-22 15:55:24 +08:00
曹前明 6b088e8111 ticket 增加查询条件 2022-09-22 12:05:33 +08:00
曹前明 cc0845af97 visit_driver_end bug 2022-09-22 11:40:17 +08:00
曹前明 f827bcf5f6 visit_driver_end bug 2022-09-22 11:38:46 +08:00
曹前明 c5ff289b6a 修改访客入厂工作流 2022-09-22 11:32:30 +08:00
曹前明 bcd6aed982 depts bug 2022-09-22 11:02:43 +08:00
曹前明 a8cbc6abc3 blt query bug 2022-09-22 11:01:15 +08:00
曹前明 acc1efe2c8 blt all 增加depts筛选 2022-09-22 10:58:10 +08:00
曹前明 dfff50d836 hrm create update bug 2022-09-22 10:48:15 +08:00
曹前明 abe2fa2f76 check_phone_bug 2022-09-22 10:40:20 +08:00
曹前明 d24a265b1d phone,id_number加入校验 2022-09-22 10:31:32 +08:00
曹前明 32f98cda16 滞留和离岗代码优化 2022-09-21 20:10:17 +08:00
曹前明 82a3c3178a cache area info bug 2022-09-21 19:39:59 +08:00
曹前明 31ff16d22c cache area break 2022-09-21 19:20:53 +08:00
曹前明 8373f3c808 寻息 经纬转换 2022-09-21 19:09:10 +08:00
曹前明 1222b7be76 手机号校验bug 2022-09-21 18:25:28 +08:00
曹前明 236c796d0a 解绑定位卡无需参数ep 2022-09-21 17:14:25 +08:00
曹前明 8896cd0f4b 用户编辑时更新ep 2022-09-21 16:37:11 +08:00
曹前明 e137a7bf39 xunxi 增加timeout 时间 2022-09-21 14:36:05 +08:00
曹前明 d1db7d60bb 关闭寻息部分日志 2022-09-21 12:42:33 +08:00
曹前明 7eef31ddf1 blt all 只返回绑定的 2022-09-21 12:12:14 +08:00
曹前明 356478dedf 寻息日志记录 2022-09-21 11:21:15 +08:00
曹前明 a3ce727d74 bind_rail bug 2022-09-21 11:10:38 +08:00
曹前明 a29ed9342e 记录寻息日志 2022-09-21 11:03:35 +08:00
曹前明 e2e71c6d65 blt all bug 2022-09-21 10:37:49 +08:00
曹前明 1835067962 opl不可重复申请 2022-09-20 20:09:40 +08:00
曹前明 cfd4235a2b apk 上传bug 2022-09-19 18:05:48 +08:00
曹前明 b2b25548ae 更新人员表bug 2022-09-19 17:26:02 +08:00
曹前明 9a7df21526 算法全部采用url方式 2022-09-19 10:32:28 +08:00
曹前明 4111a5ef03 获取apk地址 2022-09-19 08:35:01 +08:00
曹前明 d37ee2142a 返回avatar 相对地址 2022-09-18 08:42:56 +08:00
曹前明 dbd15803a1 喇叭headers 2022-09-16 10:08:30 +08:00
曹前明 5a6c6d6394 增加喇叭视图集 2022-09-16 10:03:14 +08:00
曹前明 2d53719338 获取寻息headers 2022-09-16 09:58:05 +08:00
曹前明 a01f29d4a1 employee detail serializer 2022-09-16 09:52:47 +08:00
曹前明 4e93418739 重新门禁授权bug 2022-09-16 07:54:54 +08:00
曹前明 b90fe9078f 门禁重新授权 2022-09-16 07:50:01 +08:00
曹前明 fcffe29f05 rpm bug 2022-09-15 17:36:28 +08:00
曹前明 5acc65a6f0 相关方创建 2022-09-15 17:23:39 +08:00
曹前明 5c5cc60fed user simple serializer 修改 2022-09-15 16:33:17 +08:00
曹前明 7433d0fd04 employee detail 返回门禁时间范围 2022-09-15 16:22:51 +08:00
曹前明 dd5faaf619 userpost bug 2022-09-15 15:56:30 +08:00
曹前明 840f7c707b rpm 分配账号bug 2022-09-15 15:47:35 +08:00
曹前明 b34575f398 作业数据权限过滤bug 2022-09-15 14:59:02 +08:00
曹前明 2fb922334e operation开启权限过滤 2022-09-15 14:32:33 +08:00