Commit Graph

1667 Commits

Author SHA1 Message Date
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