 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 |