Commit Graph

2177 Commits

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