Commit Graph

1101 Commits

Author SHA1 Message Date
caoqianming efc101d2a1 drf 动态字段 mixins 2022-01-24 16:21:00 +08:00
caoqianming f6a7ada99f drf 动态字段omit 2022-01-24 15:48:25 +08:00
caoqianming ceb0fe2354 drf动态字段mixins 2022-01-24 15:38:52 +08:00
caoqianming eaa6da6a4f sam order simple bug 2022-01-24 15:21:07 +08:00
caoqianming c39d62c9a5 去除is_mtested字段 2022-01-24 14:31:07 +08:00
caoqianming 444914fde9 wproduct list 增加order 2022-01-24 13:55:28 +08:00
caoqianming deb5eb1a3b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-24 13:47:28 +08:00
caoqianming aec8841ba6 sam order增加过期提醒 2022-01-24 13:47:08 +08:00
shijing 3eb5c6ac76 首页布局调整 2022-01-24 11:02:18 +08:00
shijing 400173c0cf Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-21 17:14:44 +08:00
shijing c2d2e2405b 检查记录添加操作人首页微调刷脸签到 2022-01-21 17:14:36 +08:00
caoqianming 65fe7f060b equip simple增加type 2022-01-21 16:35:37 +08:00
caoqianming 743d7ce862 employee list 去除face_data 2022-01-21 16:21:21 +08:00
caoqianming 07c6f4ae53 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-21 16:13:39 +08:00
caoqianming e53024c9bc 人脸识别数据用缓存处理 2022-01-21 16:13:32 +08:00
shilixia c35051df0c Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-21 15:19:49 +08:00
shilixia fcc6cfbade shebei 2022-01-21 15:19:42 +08:00
caoqianming db87609ad6 同步数据库 2022-01-21 14:46:02 +08:00
caoqianming f30c2b9741 打卡记录 timzone localtime 2022-01-21 14:43:09 +08:00
caoqianming 832f58d35f clock record bug 2022-01-21 14:16:31 +08:00
caoqianming 7b81a34d89 face cinoare from base64 bug 2022-01-21 14:04:39 +08:00
caoqianming 988dc29ef6 clock record post perm 2022-01-21 13:59:38 +08:00
caoqianming 2261cf1627 user list 增加is_atwork字段 2022-01-21 13:49:18 +08:00
caoqianming ad0599ec66 打卡时间范围设置宽,以供测试 2022-01-21 13:45:57 +08:00
caoqianming 190f61b274 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-21 13:42:01 +08:00
caoqianming 509404994a 打卡接口 2022-01-21 13:41:54 +08:00
shijing c435659368 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-21 10:55:14 +08:00
shijing 0f8128a5d8 物料安全库存 2022-01-21 10:55:07 +08:00
caoqianming 50ed7ea9ec order create 订单编号不必输入 2022-01-21 10:34:42 +08:00
caoqianming 3f9588ae58 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-21 08:59:14 +08:00
caoqianming cb595711fe wpm wproduct list bug 2022-01-21 08:59:06 +08:00
shijing c9d3b15a5f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-21 08:30:31 +08:00
shijing d1270c16ab newStyle 2022-01-21 08:30:22 +08:00
caoqianming 14438608b8 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-20 15:47:12 +08:00
caoqianming 3023929d66 iproduct增加to_order筛选条件 2022-01-20 15:47:05 +08:00
shijing 9df7d39e05 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-20 15:45:38 +08:00
shijing 0796f30cb1 dashPage 2022-01-20 15:45:32 +08:00
caoqianming 28882ae074 wproductserializer 增加to_order字段 2022-01-20 15:44:27 +08:00
caoqianming b8346d90b9 wproduct 指派订单 2022-01-20 15:41:47 +08:00
caoqianming 7f4da0221c 冷加工的合格率单独处理 2022-01-20 13:50:30 +08:00
caoqianming 0c5601f53a update check date bug 2022-01-20 13:23:04 +08:00
caoqianming b9a9aa2091 update check date bug 2022-01-20 13:21:59 +08:00
caoqianming ddc54a8c76 设备列表请求bug 2022-01-20 11:01:18 +08:00
caoqianming accfedb1d7 根据校准记录变更下次校准日期 2022-01-20 10:57:32 +08:00
caoqianming e4c7f4856c 同步数据库 2022-01-20 10:49:05 +08:00
caoqianming cf19c022fa em 更新检测日期 未完成 2022-01-20 10:47:31 +08:00
caoqianming 8e8f231f72 设备状态字段修改 2022-01-20 09:58:32 +08:00
caoqianming d01ca7df0f 冷加工产品合格率为1 2022-01-20 09:13:59 +08:00
caoqianming db270f7914 update_wproduct_by_test 根据配置是否需要质检决定 2022-01-20 08:42:40 +08:00
caoqianming 65f0d9f1ee 产品分解增加need_combtest字段 2022-01-19 15:17:19 +08:00