Commit Graph

3017 Commits

Author SHA1 Message Date
caoqianming 0e96485fae feat: mioitem添加count_tested 2025-02-25 10:33:22 +08:00
caoqianming 32ba222523 fix: mlog_submit process获取bug 2025-02-24 17:29:00 +08:00
caoqianming 63004f81ca fix: mlog_submit tracking获取方式 2025-02-24 17:21:28 +08:00
caoqianming 14cad30b2e fix: mlog_submit is_fix bug 2025-02-24 17:14:33 +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 2941ebd7d6 fix: mlogbinserializer处理返工的错误 2025-02-24 16:06:55 +08:00
caoqianming 2663f20953 feat: 返修逻辑完成 2025-02-24 13:22:43 +08:00
caoqianming 553fbcc826 feat: labelmat和wpr都加上返修Enum 2025-02-24 10:26:00 +08:00
caoqianming 0c5cc55b54 feat: 用于返修的mlog 2025-02-24 09:39:05 +08:00
caoqianming af999467db fix: 去除materialbatch的数据库约束 2025-02-21 17:23:28 +08:00
caoqianming a1525d1289 fix: mb create加锁 2025-02-21 17:05:50 +08:00
caoqianming 07473ddf90 feat: mio出入库支持选入mioitemw 2025-02-21 11:01:47 +08:00
caoqianming 74a7025f6c feat: wm_in 在mlogbin时必填 2025-02-20 17:02:36 +08:00
caoqianming 7200bc45b3 fix: do_in xmaterial的type error 2025-02-20 14:48:18 +08:00
caoqianming 7b484a65cd feat: route添加document字段 2025-02-19 15:35:15 +08:00
caoqianming c585f2fc11 feat: mlogbin支持mtask非必填 2025-02-19 14:29:55 +08:00
caoqianming 5f0d34f9c3 feat: route添加parent字段以支持子步骤 2025-02-19 14:02:29 +08:00
caoqianming f741eda285 feat: 七车间入库_仓库执行人 remove None 2025-02-18 17:45:42 +08:00
caoqianming f5229ab8cb feat: ftestwork_submit 时根据工段配置生成不合格品 2025-02-18 11:09:49 +08:00
caoqianming b062d7ef6b fix: cal_material_count 挪到单独文件里 2025-02-18 11:03:22 +08:00
caoqianming 56d49b4d26 fix: cal_material_count 只统计合格品 2025-02-18 10:56:09 +08:00
caoqianming edac22b701 feat: cal_material_count 改为同步执行 2025-02-18 10:51:31 +08:00
caoqianming b3d060b25a feat: cal_material_count_from_mlog 2025-02-18 10:42:59 +08:00
caoqianming 7b87e79bf5 feat: 部分app model注释 2025-02-18 09:02:28 +08:00
caoqianming 855ca9b054 feat: wpm和wpmw表添加doc2 2025-02-17 16:57:50 +08:00
caoqianming 12c6cc0d17 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-17 16:17:09 +08:00
caoqianming 89642fb194 feat: wpm和wpmw表添加doc 2025-02-17 16:17:06 +08:00
zty 7544efdc1e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-17 15:35:24 +08:00
zty 095a6f9d51 feat: enm/task view 修改校正测试 增加能修改 天和月的时间类型 2025-02-17 15:35:21 +08:00
caoqianming 9f558acedb feat: base execute_raw_sql时允许不返回值 2025-02-17 14:37:30 +08:00
caoqianming 57e6e23e95 feat: equip添加采集数据请求字段 2025-02-17 14:35:43 +08:00
caoqianming 8cbb921969 feat: 光子棒管综合统计添加数据 2025-02-17 11:24:43 +08:00
caoqianming e6b27950b2 feat: ftestitem增加检测设备字段 2025-02-17 09:34:48 +08:00
caoqianming 61525d236e feat: qct detail是检测项按顺序返回 2025-02-14 10:56:40 +08:00
caoqianming d7361a71df perf: 优化has_envdata的sql查询2 2025-02-13 13:26:32 +08:00
caoqianming 61f9dc3b51 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-13 11:26:30 +08:00
caoqianming dbbdaa89b9 perf: 优化has_envdata的sql查询 2025-02-13 11:26:27 +08:00
zty 5ecb3341e0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-12 17:34:09 +08:00
zty 5f85d0273c feat: 修改enm/task 2025-02-12 17:34:04 +08:00
caoqianming 9d27ccd1dc fix: base get_user_route 路由重复的问题 2025-02-12 15:10:20 +08:00
caoqianming 861bb03469 feat: wpmw添加字段 2025-02-12 15:10:00 +08:00
caoqianming a88f7e282e feat: Ptest不指定testitem 2025-02-11 14:53:26 +08:00
caoqianming 7dc11e032d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-11 14:40:41 +08:00
caoqianming ac41f5a105 fix: 粗中细磨的统计要涵盖粗磨和粗中磨的数据 2025-02-11 14:40:38 +08:00
zty f7d6f59fcd feat: 修改 enm 回转窑产量计算 2025-02-11 14:24:59 +08:00
caoqianming 44486b64a3 feat: mlogbw的输出不允许删除 2025-02-11 11:12:14 +08:00
caoqianming f8416d91b6 feat: 增加mio返回is_tested 2025-02-10 18:19:06 +08:00
caoqianming b8c0a9b420 fix: 车间执行人和仓库人问题 2025-02-10 15:57:40 +08:00
caoqianming 1a3e428195 feat: do_in 支持wpr 2025-02-08 15:31:35 +08:00
caoqianming 33f162fa3a fix: do_in 的bug 2025-02-08 14:49:30 +08:00
caoqianming 8838227919 feat: wpr增加查询条件 2025-02-08 14:26:21 +08:00
caoqianming 957938f8dd feat: mpoint添加search字段 2025-02-08 11:09:58 +08:00
caoqianming ff4bdf027f fix: equip_last_mlog 添加运行状态 2025-02-08 10:53:23 +08:00
caoqianming 5b7b1bf276 fix: 获取可交接到的工段进行去重 2025-02-08 09:45:05 +08:00
caoqianming 2843905def feat: 默认密码从conf中读取 2025-02-08 09:41:49 +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 622d594795 feat: 优化mloginit报错提示 2025-02-06 16:56:06 +08:00
caoqianming 77a50ae162 feat: route添加material筛选条件 2025-02-06 16:40:42 +08:00
caoqianming 1b2f201786 feat: 入厂和作业时进行证书过期校验 2025-02-06 09:21:20 +08:00
caoqianming 171348fbbd feat: base 短信发送读取配置 2025-02-05 17:24:08 +08:00
caoqianming b1a574051c feat: examrecord添加查询条件 2025-02-05 17:19:58 +08:00
caoqianming 6cd55f8460 feat: certificate添加state字段及其处理 2025-02-05 14:41:32 +08:00
caoqianming 821b88eb90 feat: handover submit支持改版 2025-02-05 10:55:21 +08:00
caoqianming 66e4273b97 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-05 09:54:31 +08:00
caoqianming 8a2e409c8a feat: 增加改版交接类型 2025-02-05 09:54:22 +08:00
zty abf50b97b8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-05 09:20:49 +08:00
zty 2f46f9e31a feat: 修改qm 增加rate_pass 目标值 2025-02-05 09:20:47 +08:00
caoqianming 7740613cf7 feat: testitem删除校验 2025-01-24 16:19:59 +08:00
zty 1d22dd983a feat: qm/ task view 增加 rate_pass_t 设置合格率目标值 2025-01-23 11:15:25 +08:00
caoqianming f88689cc1e feat: 增加addto_wpr字段配置以在wpr表里添加额外信息 2025-01-22 13:51:03 +08:00
caoqianming 3e93fce213 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-01-22 10:15:07 +08:00
caoqianming 89449eb7c6 feat: mlogbin 只校验主批是否重复 2025-01-22 10:14:49 +08:00
zty e0f7ce4636 feat: qm 合格率设置阈值 2025-01-21 15:15:24 +08:00
zty 4254e226d3 feat: enm/view 修改correct 增加不能校正当日或当月数据 2025-01-21 12:45:51 +08:00
zty fa18fee720 feat:remove 碳排放强度计算和字段 2025-01-21 09:40:52 +08:00
zty bec6600089 feat: enm/model 增加碳排放强度 和 碳排放量字段与 task 计算逻辑 2025-01-21 09:24:58 +08:00
caoqianming 4927afa9b7 feat: 工艺路线复制按钮 2025-01-20 15:43:04 +08:00
caoqianming 688b3fc3d1 feat: ftest增加筛选条件 2025-01-20 13:51:13 +08:00
caoqianming fd5747f99c feat: wpr change时变更defectbug 2025-01-20 11:03:25 +08:00
caoqianming 4b7ee277f1 feat: 撤回时部分恢复缺陷项 2025-01-20 10:55:10 +08:00
caoqianming 50f19291a0 fix: mlog revert bug 2025-01-20 10:45:10 +08:00
caoqianming 1eb990d3d5 fix: mlogbw submit错误 2025-01-20 10:33:44 +08:00
caoqianming f004417d49 fix: ftest增加defect_main的后续逻辑变更 bug 2025-01-17 17:18:26 +08:00
caoqianming 4699b31f83 feat: ftest增加defect_main的后续逻辑变更 2025-01-17 16:52:14 +08:00
caoqianming 6737d3f0f4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-01-17 16:38:28 +08:00
caoqianming d9a5720cc6 feat: ftest添加主要缺陷字段 2025-01-17 16:38:15 +08:00
zty cd652f3696 feat:enm/service 修改translate_eval_formula 2025-01-17 16:08:27 +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 6bcafcad3a fix: 变更单件产品的属性问题3 2025-01-17 10:19:58 +08:00
caoqianming d653caed1d fix: 变更单件产品的属性问题2 2025-01-17 10:01:02 +08:00
caoqianming 8b7887ec43 fix: 变更单件产品的属性问题 2025-01-17 09:57:53 +08:00
caoqianming 7605574f37 fix: update_mb_item bug 2025-01-17 09:29:33 +08:00
caoqianming 7382eed0b6 fix: 修改mioitemw的外键名字 2025-01-17 08:58:44 +08:00
caoqianming 31f2fdde84 fix: 采购入库支持检验3 2025-01-16 17:30:53 +08:00
caoqianming 2f259bd5f3 feat: 采购入库支持检验2 2025-01-16 17:15:38 +08:00
caoqianming 8bcd6b4f69 feat: 采购入库支持检验 2025-01-16 17:09:01 +08:00
caoqianming adf3341f4b feat: testitem添加process查询条件 2025-01-16 15:27:47 +08:00
caoqianming ae2ba421f8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-01-16 15:01:02 +08:00
caoqianming 13418e9b1a feat: ftest增加筛选mlogbw_ftest__wpr 2025-01-16 15:00:42 +08:00
zty ae5cf55e9b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-01-16 13:56:24 +08:00
zty b8b1167f17 feat: 增加氨水液位计 绑定字段up_down 计算方式 2025-01-16 13:56:20 +08:00
caoqianming 7efdc2c316 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-01-16 11:30:40 +08:00
caoqianming 161d72094f feat: testitemserializer返回process_name 2025-01-16 11:28:35 +08:00
zty 9c3cf5a534 feat: enm/service 修改传入公式,校正计算测点 2025-01-16 11:18:36 +08:00
caoqianming 0dbbc9beb2 feat: testitem增加type筛选条件 2025-01-16 10:34:42 +08:00
caoqianming e59a5894f3 fix: mlogbin allow_empty 2025-01-16 10:17:35 +08:00
caoqianming baef2c586a feat: testitem支持操作项 2025-01-16 10:01:00 +08:00
caoqianming 6ea24b6b1c feat: MlogbInSerializer wm_in allow_blank False 2025-01-16 09:27:06 +08:00
caoqianming 24bdb818a5 feat: 采购入库才可进行检验 2025-01-16 08:34:59 +08:00
caoqianming 923ac2276c feat: 隐式物料不可出入库 2025-01-15 17:13:28 +08:00
caoqianming a7b14994b7 feat: mioitemw添加ftest字段 2025-01-15 16:07:53 +08:00
caoqianming 84e1aca814 feat: ftest增加type选项 2025-01-15 15:20:12 +08:00
caoqianming a2a89a0785 feat: 增加mioitemw的update 2025-01-15 15:02:19 +08:00
caoqianming 5409f5d55d feat: mioitemw test 2025-01-15 13:37:28 +08:00
caoqianming 5b977d4cf9 fix: pmservice cal_real_task_count 2025-01-14 12:37:42 +08:00
caoqianming 620ed2e19e fix: mioserializer add mio_user 2025-01-14 11:35:34 +08:00
caoqianming 8d4d0f7cbc fix: mlogbw create时进行wpr的校验 2025-01-14 11:27:40 +08:00
caoqianming f4f17fd2b8 fix: handover submit合并批次bug 2025-01-14 08:52:16 +08:00
caoqianming e76b3dcd69 fix: ftestwork submit wm需要扣减bug3 2025-01-14 08:36:48 +08:00
caoqianming f9bd8a3607 fix: ftestwork submit wm需要扣减bug2 2025-01-13 18:04:18 +08:00
caoqianming f84b8b33b8 fix: ftestwork submit wm需要扣减bug 2025-01-13 17:41:59 +08:00
caoqianming 582cf99a58 fix: ftestwork create bug ins 2025-01-13 17:36:13 +08:00
caoqianming a333810dd9 fix: handover create bug 2025-01-13 17:34:10 +08:00
caoqianming f68d498dd3 feat: handover submit支持合并为单个新批次 2025-01-13 17:26:41 +08:00
caoqianming 77faee5d1a fix: qm cal_count bug 2025-01-13 17:21:39 +08:00
caoqianming ced8692585 feat: handoverserializer 优化 2025-01-13 16:12:18 +08:00
caoqianming 0931835708 feat: wpr返回详情 2025-01-13 16:10:11 +08:00
caoqianming fbd424fce9 feat: labelmat返回defect_name 2025-01-13 14:58:36 +08:00
caoqianming 045183301b feat: labelmat添加字段 2025-01-13 14:36:27 +08:00
caoqianming 23b837c784 feat: festworkdefect submit操作 2025-01-13 14:05:00 +08:00
caoqianming 14d785656d feat: ftestworkdefect同步数据库 2025-01-13 11:32:26 +08:00
caoqianming 69daa63ea6 feat: ftestwork的submit支持defect 2025-01-13 11:23:42 +08:00
caoqianming 942e54a7e4 feat: ftestwork支持ftestworkdefect 2025-01-13 09:39:18 +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 18f39bff9c feat: get_alldata_with_batch_and_store 2025-01-10 14:41:56 +08:00
caoqianming ee3dc6a5a2 feat: mlog revert bug 2025-01-10 14:30:04 +08:00
caoqianming 4b327c0575 feat: mlog撤回 2025-01-10 13:47:39 +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 c03129ae81 feat: Handover正常交接不支持不合格品 2025-01-10 09:40:51 +08:00
caoqianming 2da98efca8 feat: wpr list 返回 defect详情 2025-01-10 09:20:41 +08:00
caoqianming e77dee956f feat: FtestProcessSerializer 更严谨 2025-01-10 08:49:25 +08:00
caoqianming 533e3e09dc feat: wmserializer返回defect_name 2025-01-10 08:43:00 +08:00
caoqianming 8d923255fd fix: mlog_submit提交的bug 2025-01-09 18:14:36 +08:00
caoqianming ce7183ff17 fix: 不支持消耗物料的检验 2025-01-09 17:02:30 +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
caoqianming 7a290f9af6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-01-09 16:27:35 +08:00
caoqianming 88535650a7 fix: mlog submit中提交wprbug 2025-01-09 16:27:12 +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 aca5cd8a63 fix: mlog submit defect_qs 2025-01-09 15:57:23 +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 37cce1664b feat: mlog submit支持质检 2025-01-09 15:28:31 +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 348464598e fix:MlogbwCreateUpdateSerializer bug3 2025-01-09 12:28:55 +08:00
caoqianming 58aa629648 fix:MlogbwCreateUpdateSerializer bug3 2025-01-09 11:36:18 +08:00
caoqianming ef4a31c3a5 fix:MlogbwCreateUpdateSerializer bug2 2025-01-09 11:25:52 +08:00
caoqianming d33678a603 fix:MlogbwCreateUpdateSerializer bug 2025-01-09 11:15:15 +08:00
caoqianming 6fbe0a7b1c fix: mlogbw删除的bug 2025-01-09 10:51:04 +08:00
caoqianming 868b37559f fix: FtestProcessSerializer的bug 2025-01-09 10:18:44 +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 a20b15abed feat: mlogbw增加质检统计3 2025-01-08 16:43:47 +08:00
caoqianming 396fcdd7cc feat: mlogbw增加质检统计2 2025-01-08 16:34:13 +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 22ff47a6ba feat: init_by_qct 2025-01-08 12:17:59 +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 38aa64df12 feat: 检测编号改为textfield 2025-01-07 15:37:14 +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 c8594aaa99 feat: wm添加route查询条件 2025-01-07 13:52:31 +08:00
caoqianming ccac1aea87 feat: 如果是主要输入物料且是主批次,才需生成输出2 2025-01-07 13:23:55 +08:00
caoqianming 0e428f6c9d feat: 如果是主要输入物料且是主批次,才需生成输出 2025-01-07 11:10:07 +08:00
caoqianming f8c72a1487 feat: 增加routemat表 2025-01-07 09:50:44 +08:00
caoqianming 3efeb746dc feat: wprlist增加筛选条件 2025-01-07 08:38:47 +08:00
caoqianming 8afbc9a0b5 feat: wprlist默认排除已消耗的2 2025-01-06 17:08:48 +08:00
caoqianming 0673580d3b feat: wprlist默认排除已消耗的 2025-01-06 17:06:00 +08:00