Commit Graph

335 Commits

Author SHA1 Message Date
caoqianming 12416a4f61 fix: mlogbw create bug2 2025-02-28 16:30:47 +08:00
caoqianming 9eb3abefc4 fix: mlogbw create bug 2025-02-28 16:27:23 +08:00
caoqianming 31e8b92d29 feat: mlogbin create时处理qct 2025-02-28 15:50:23 +08:00
caoqianming 286a5306e3 feat: 批次处理做兼容性处理 2025-02-28 15:31:38 +08:00
caoqianming 77f7a454a1 feat: mlogbw变更出发mlogbdefect 2025-02-28 11:28:40 +08:00
caoqianming c71bb0d8f6 fix: 不能删除该产出明细更新限制条件 2025-02-26 11:27:25 +08:00
caoqianming 2010078665 perf: 优化mlog list速度3 2025-02-25 17:33:41 +08:00
caoqianming 4e6aa547b5 perf: 优化mlog list速度2 2025-02-25 17:30:40 +08:00
caoqianming 6653befcdb perf: 优化mlog list速度 2025-02-25 16:33:54 +08:00
caoqianming debf07a7b9 feat: mlogbdetail 返回时携带tracking 2025-02-24 16:20:56 +08:00
caoqianming 2e8ca4a14d fix: mlogbin perform_create处理返工的bug 2025-02-24 16:12:46 +08:00
caoqianming 2663f20953 feat: 返修逻辑完成 2025-02-24 13:22:43 +08:00
caoqianming c585f2fc11 feat: mlogbin支持mtask非必填 2025-02-19 14:29:55 +08:00
caoqianming 44486b64a3 feat: mlogbw的输出不允许删除 2025-02-11 11:12:14 +08:00
caoqianming 5b7b1bf276 fix: 获取可交接到的工段进行去重 2025-02-08 09:45:05 +08:00
caoqianming 550a3281bc fix: 获取可交接到的工段2 2025-02-07 13:34:25 +08:00
caoqianming 2488e500ce fix: 获取可交接到的工段 2025-02-07 10:12:27 +08:00
caoqianming b96846d2c0 feat: 获取可交接到的工段 2025-02-07 10:04:12 +08:00
caoqianming 805d4ac4fe fix: 切分融合的单件生成2 2025-01-17 15:42:24 +08:00
caoqianming 5b7f8e1359 fix: 切分融合的单件生成 2025-01-17 14:54:09 +08:00
caoqianming 713c51bdbd feat: 切分融合的单件生成 2025-01-17 14:45:31 +08:00
caoqianming 58b3863763 feat: 删除次批时无需删除输出2 2025-01-10 16:00:36 +08:00
caoqianming 79cb50709e feat: 删除次批时无需删除输出 2025-01-10 15:51:49 +08:00
caoqianming 155f305071 feat: mlogbin 在merge时向下取整 2025-01-10 14:55:45 +08:00
caoqianming 695590589e fix: 追踪到个的才需要赋予质检表 2025-01-10 11:27:08 +08:00
caoqianming b8fd5fd13b feat: 追踪到个的才需要赋予质检表 2025-01-10 10:34:59 +08:00
caoqianming 0429ac6988 feat: mlogbin无需加载qct 2025-01-09 16:56:01 +08:00
caoqianming 4f1bbaa574 feat: mlogbin初始化质检表的bug 2025-01-09 16:37:30 +08:00
zty d1bd74fd5d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-01-09 16:19:43 +08:00
zty d60cc99b48 feat: wpm/sflog 增加enstat 数据 2025-01-09 16:19:39 +08:00
caoqianming 56808f21ca feat: mlog删除时同步删除ftest2 2025-01-09 15:42:12 +08:00
caoqianming f241194c40 feat: mlog删除时同步删除ftest 2025-01-09 15:36:19 +08:00
caoqianming 180724bee5 Merge remote-tracking branch 'origin/master' 2025-01-09 14:17:07 +08:00
caoqianming 5b0063e42d fix: mlogbin delete bug 2025-01-09 14:14:32 +08:00
zty 4a3934b4fd Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-01-09 13:36:58 +08:00
zty 07c996964d feat: wpm/sflog 增加 enstat 数据 2025-01-09 13:36:54 +08:00
caoqianming 6fbe0a7b1c fix: mlogbw删除的bug 2025-01-09 10:51:04 +08:00
caoqianming 3c6aa3ea18 feat: 去除mlogbdefects2 2025-01-09 10:12:01 +08:00
caoqianming 860e2157b1 feat: 去除mlogbdefects2 2025-01-09 10:09:48 +08:00
caoqianming 3751b2f2e2 feat: 去除mlogbdefect 2025-01-09 10:07:51 +08:00
caoqianming f209d1767d feat: mlogbin也需要找寻质检表 2025-01-09 09:37:57 +08:00
caoqianming bc44d0335a feat: mlogbin删除时需要删除子集ftest记录2 2025-01-09 09:03:32 +08:00
caoqianming b20dee64df feat: mlogbin删除时需要删除子集ftest记录 2025-01-09 08:58:24 +08:00
caoqianming 51123ee0c5 feat: mlogbw增加质检保存bug 2025-01-09 08:43:32 +08:00
caoqianming 5f88433a25 feat: mlogbw增加质检统计 2025-01-08 16:21:18 +08:00
caoqianming 2331bec13b feat: 增加MlogbDefect以进行统计 2025-01-08 15:02:41 +08:00
caoqianming 8eddeb4f70 fix: mlogb质检 2025-01-08 10:29:12 +08:00
caoqianming 95b98df8cf fix: mlogb找寻质检表 2025-01-07 15:41:04 +08:00
caoqianming 7c9feb23ac feat: mlogb添加qct字段以便调用检验表 2025-01-07 15:29:19 +08:00
caoqianming 98f4af2f8c fix: 如果是主要输入物料且是主批次,才需生成输出3 2025-01-07 14:38:34 +08:00
caoqianming abd6ca53f1 feat: Mlogb返回增加树型结构 2025-01-07 14:31:10 +08:00
caoqianming e333b84c1b feat: Mlogb添加parent字段 2025-01-07 14:24:00 +08:00
caoqianming d3a304b918 feat: Mlogb的排序 2025-01-07 14:08:32 +08:00
caoqianming 011df65e4c fix: 如果是主要输入物料且是主批次,才需生成输出 2025-01-07 14:07:25 +08:00
caoqianming 0e428f6c9d feat: 如果是主要输入物料且是主批次,才需生成输出 2025-01-07 11:10:07 +08:00
caoqianming 9f56968385 fix: change_or_new该物料编号已存在不可使用 2025-01-06 16:12:33 +08:00
caoqianming afb3b23486 feat: mlogbin自动创建mlogbout数量2 2025-01-06 14:09:10 +08:00
caoqianming b454972943 feat: mlogbin自动创建mlogbout数量 2025-01-06 13:46:23 +08:00
caoqianming fc56ecea08 fix: mlogbin创建mlogbw的错误2 2025-01-06 10:40:33 +08:00
caoqianming 84723967dc fix: mlogbin创建mlogbw的错误 2025-01-06 10:33:33 +08:00
caoqianming d784ac8a3c feat: 生产日志追踪到个完善 2025-01-06 10:23:51 +08:00
caoqianming 8d0d5ebcd0 fix: 主要是wpmw change_or_new的修正 2025-01-03 14:37:57 +08:00
caoqianming cd6e78961b fix: def cal_mlogb_count bug 2025-01-02 17:14:56 +08:00
caoqianming 426be9d805 feat: 添加mlogbw接口 2025-01-02 15:36:55 +08:00
caoqianming 7d2d74ee80 feat: 日志操作时对有ticket的进行处理 2024-12-17 13:37:22 +08:00
caoqianming bdd644a527 fix: 日志撤销的同时将任务变更状态 2024-12-16 13:06:02 +08:00
caoqianming bcbaba330d feat: batchst增加batch__startswith__in筛选条件 2024-12-04 10:16:41 +08:00
caoqianming fb43bdde85 feat: 完善get_alldata_with_batch 2024-12-03 10:36:23 +08:00
caoqianming d9a1512a92 feat: 定义batchst默认排序为batch 2024-12-02 14:33:44 +08:00
caoqianming de6e5d315a feat: 记录batchst 最后操作时间 2024-12-02 14:13:17 +08:00
caoqianming 17697d6482 feat: 添加batchst路由 2024-12-02 13:39:43 +08:00
caoqianming 6396eff968 feat: fmlog 移除route字段 2024-11-28 17:06:42 +08:00
caoqianming d52bd4e064 feat: mlog 变化不再创建日志 2024-11-23 23:12:45 +08:00
caoqianming 1cb64b26af feat: mlog list 接口一点优化 2024-11-19 09:25:36 +08:00
caoqianming 7c85d3df65 fix: mlog select_related_fields bug2 2024-11-18 17:38:11 +08:00
caoqianming af72749b8a fix: mlog select_related_fields bug 2024-11-18 17:27:41 +08:00
caoqianming 71db15bacd feat: 添加cms模块创建article表 2024-11-18 10:42:33 +08:00
caoqianming 95739bc3bb feat: wmaterial增加查询条件 2024-11-14 12:12:14 +08:00
caoqianming 7d9582fe34 feat: mlogb添加字段以追踪原料批次 2024-11-13 15:56:40 +08:00
caoqianming 7510b2fc31 feat: 报废提交不需要限制接收人 2024-09-06 10:11:44 +08:00
caoqianming beb6b79709 fix: mlog view select related 2024-09-05 15:00:40 +08:00
caoqianming 1243a50463 feat: mlog返回routepack_name 2024-09-05 14:17:21 +08:00
caoqianming a1871a3763 feat: mloginit 可填end_time及test_user_name 返回 2024-09-05 13:14:12 +08:00
caoqianming e5ac627834 feat: wmaterial filter_queryset默认返回非报废品 2024-09-05 12:29:36 +08:00
caoqianming 6e7e6c584e feat: 一二级日志录入 2024-09-04 15:25:14 +08:00
caoqianming 170f3db824 feat: 添加fmlog 2024-09-04 09:04:37 +08:00
caoqianming 0148efba62 feat: process添加中间状态 2024-09-03 10:58:33 +08:00
caoqianming 31f8f002aa feat: mlog 增加ticket查询条件 2024-09-03 10:25:59 +08:00
caoqianming 6a573dd4dd feat: mlog经审批后提交 2024-09-03 09:10:28 +08:00
caoqianming 78dc923305 fix: 日志提交的校验 2024-08-30 13:31:37 +08:00
caoqianming 5289e71280 feat: wmaterial添加外协字段及相关调整 2024-08-30 09:21:29 +08:00
caoqianming ab759a76c9 feat: mog submit时产出为0 2024-08-29 15:05:53 +08:00
caoqianming 42c1386efd feat: sflogexp增加返回信息 2024-08-06 08:29:21 +08:00
caoqianming aa42ba6e3f feat: submit时校验消耗和产出是否已经填写 2024-08-01 18:12:30 +08:00
caoqianming 9ff4f21f9a fix: mlogbin create时生成编号变更3 2024-08-01 09:59:39 +08:00
caoqianming 99ab4e1957 feat: mlogbin create时生成编号变更2 2024-08-01 09:20:15 +08:00
caoqianming 0813a3b568 feat: mlogbin create时生成编号变更 2024-07-31 16:33:32 +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 c068c47bc7 feat: 增加外协生产日志功能 2024-07-23 10:11:31 +08:00
caoqianming 0ab6e0bc72 feat: 增加不合格项接口 2024-07-22 17:58:21 +08:00
caoqianming 92fc1e9e0a feat: 添加返修交接支持 2024-07-19 10:04:02 +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 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 c058fe9338 feat: 支持不合格品处理/添加不合格品存储字段 2024-07-17 16:58:28 +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 07680704ec feat: cal_mtask_progress_from_mlog 2024-07-15 16:57:09 +08:00
caoqianming 4934327808 feat: mlogbout url register 2024-07-11 17:44:18 +08:00
caoqianming b33c86fd6e feat: mlogb in update 接口 2024-07-11 15:58:08 +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 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 24b2a98440 refecor: 一些处理 2024-07-05 08:49:36 +08:00
caoqianming 3c52125440 feat: wm,handover,mlog增加检索条件 2024-06-28 15:29:39 +08:00
caoqianming 5efd9888dd feat: 交接记录提交只要是同部门的就可以2 2024-06-21 13:27:47 +08:00
caoqianming 966821fad6 feat: 交接记录提交只要是同部门的就可以 2024-06-21 10:40:07 +08:00
caoqianming ece11699f8 feat: sflogexp返回更多信息 2024-04-28 13:32:53 +08:00
caoqianming d01bb012b9 fix: 异常值班处理的权限 2024-04-28 09:35:16 +08:00
caoqianming b429ad9059 fix: 废弃一些接口 2024-03-06 18:01:24 +08:00
caoqianming f6db92f815 feat: 增加wmaterial查询条件 2024-03-06 15:50:29 +08:00
caoqianming 78fd0c9721 feat: 日志撤回后修改任务状态 2024-01-18 10:55:41 +08:00
caoqianming 89215d4752 feat: 任务停止后日志不可再提交 2024-01-04 09:11:53 +08:00
caoqianming c91533a328 feat: mlog增加equipments字段 2023-12-27 09:51:04 +08:00
caoqianming 93de5ea879 feat: wmaterialserializer返回全名 2023-12-22 13:47:59 +08:00
caoqianming 0f2d2dbee9 feat: 其他生产记录增加查询handle_date 2023-12-20 15:17:31 +08:00
caoqianming a9c16c4a9d feat: 日志提交和撤回返回序列化信息 2023-12-18 11:12:33 +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 1b5c910cf8 fix: 交接记录的提交bug 2023-12-16 13:00:56 +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 6b6ff7cd3c feat: mlog更新时更新日志 2023-12-14 10:36:47 +08:00
caoqianming 2d8169849f feat: 将mlog添加审计日志 2023-12-07 09:39:52 +08:00
caoqianming dc47570a5b feat: wm增加查询条件 2023-12-01 11:33:23 +08:00
caoqianming 9dc31b366b fix: handover submit bug 2023-11-30 14:14:52 +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 555700793f feat: otherlog路由注册 2023-11-27 13:21:14 +08:00
caoqianming ec5c246bdc feat: 其他生产日志 2023-11-27 11:33:15 +08:00
caoqianming 2030812c18 fix: 能管的工段异常修改 2023-11-22 16:07:00 +08:00
caoqianming a7204ec897 doc: 添加注释 2023-11-20 19:08:10 +08:00
caoqianming fddadfe30c feat: wpm中增加到岗记录 2023-11-20 16:26:14 +08:00
caoqianming 2ae8913b25 feat: 一些统计分析接口可用bi替代 2023-11-14 13:48:07 +08:00
caoqianming 9315efe6f4 perf: 一些调整 2023-11-03 09:07:33 +08:00
caoqianming 03ae93f7e9 feat: 车间库存形成交接记录以及交接记录的提交 2023-11-01 18:11:26 +08:00
caoqianming f8b3868467 fix: mlog增加handle_users的返回 2023-11-01 14:41:08 +08:00
caoqianming 8abc008ddf feat: 单个mlog submit 2023-11-01 13:59:51 +08:00
caoqianming 9427544cca feat: mlog添加字段 2023-10-31 15:06:10 +08:00
caoqianming 2d20825716 feat: 增加交接记录表及相应接口 2023-10-31 10:50:36 +08:00
caoqianming 3cbc6e3fef feat: 增加mlog查询条件 2023-10-25 10:42:29 +08:00
caoqianming bc2a16a9a4 feat: 增加组合件出入库 2023-10-24 10:26:13 +08:00
caoqianming fd4ccae448 feat: 返回可用的批次号 2023-10-23 15:03:09 +08:00
caoqianming 53b38d7cc4 feat: 获取相关任务的第一道工序日志 2023-10-23 10:30:49 +08:00
caoqianming 2725a97213 feat: handle_user也作为约束条件 2023-10-23 09:02:57 +08:00
caoqianming c142f00bf3 feat: 增加handle_date及相应的校验 2023-10-20 14:50:56 +08:00
caoqianming 53d2276998 fix: mlog confirm bug 2023-10-19 14:07:09 +08:00
caoqianming c6f9b749c7 feat: mlog增加handle_user 2023-10-10 16:43:05 +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 9504b527cb feat: 增加车间库存并完成生产领料 2023-09-27 15:41:36 +08:00
caoqianming ccfeb9d901 feat: sflogexp合并stlog 2023-08-08 14:41:50 +08:00
caoqianming ebe6ab9f3b feat: 增加生产异常动态记录表 2023-08-04 14:26:53 +08:00
caoqianming ad2f903c89 fix: init_test bug 2023-08-02 10:51:48 +08:00
caoqianming 437d4c923e fix: init_test 报错 2023-07-25 13:25:05 +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 f02135dc10 fix: init_test 排序错误 2023-07-10 16:26:23 +08:00
caoqianming e51d19fac0 fix: 初始化检测录入排序及取消质检任务执行 2023-07-06 14:48:33 +08:00
caoqianming e0fcb2e22b fix: 初始化检测bug 2023-07-05 16:39:01 +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 066217d6c1 fix: 初始化检测录入bug 2023-07-05 14:06:44 +08:00
caoqianming 93881852d0 feat: sflog init_test接口 2023-07-05 13:44:07 +08:00
caoqianming a6167294f7 feat: sflog filter 2023-06-30 10:22:46 +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 51737bcdd8 fix: 权限代号调整 2023-06-26 16:45:52 +08:00
caoqianming 0145beb63f feat: 值班记录质量分析数据录入 2023-06-26 16:00:23 +08:00
caoqianming 1d16949d8a feat: 增加wpm,qm,mtm三个app 2023-06-20 17:05:50 +08:00