Commit Graph

3258 Commits

Author SHA1 Message Date
shijing 40d31912e7 fix:添加输入输出的检验物料 2025-07-21 10:48:07 +08:00
shijing cf5bcc69b7 fix:mlogdetail传material_in 给检验页面 2025-07-18 17:17:12 +08:00
shijing 511740f0de fix:检验表更新 2025-07-18 17:16:19 +08:00
shijing 0038ca830b fix:统计分析却现象有为1,无为0 2025-07-18 15:13:28 +08:00
shijing 87a43199c4 fix:禅道014、015 2025-07-18 14:54:40 +08:00
shijing 70ae1a6aab fix:统计分析不合格项0为有,1为没有 2025-07-17 16:06:08 +08:00
shijing e6581158f3 fix:检验调整 2025-07-17 16:04:53 +08:00
shijing 09833232bc fix:wpr检验修正 2025-07-17 09:55:11 +08:00
shijing eb4590f6b9 fix:wpr检验修正 2025-07-17 09:40:20 +08:00
shijing 44ff595cb1 fix:统计分析调整 2025-07-17 08:48:36 +08:00
shijing 3d76ab3b93 fix:统计分析调整 2025-07-16 16:46:00 +08:00
shijing 51c2a8a4b3 fix:统计分析调整 2025-07-16 16:31:51 +08:00
shijing d843a84353 fix:禅道011、012 2025-07-16 14:09:52 +08:00
shijing 43df3085e2 fix:成品库和工艺步骤的流程图更新 2025-07-16 09:16:31 +08:00
shijing 3c96b563c2 fix:去除冗余代码 2025-07-15 16:36:58 +08:00
shijing e690a10951 fix:流程图支持相同两个节点间多条线 2025-07-15 16:36:21 +08:00
shijing 80c8cfdd85 fix:bx 2025-07-15 10:20:17 +08:00
shijing ed526af585 fix:检测项为空时,不传 2025-07-15 09:56:47 +08:00
shijing 51bcaa2dbb fix:玻纤毛坯检测未完成物料中wpr展示二维码 2025-07-14 15:18:10 +08:00
shijing d18c9be671 fix:玻纤wpr检验表中检验板段模糊查询 2025-07-14 11:14:17 +08:00
shijing 263d7bd706 fix:mlogb中的工艺步骤选择 2025-07-14 09:01:55 +08:00
shijing aca0fd057e fix:审批撤回需要提交人撤回 2025-07-14 08:57:07 +08:00
shijing b6c80f3ba9 fix:光芯mlog->mlogb日志传参变动 2025-07-11 16:42:12 +08:00
shijing ae67be4728 fix:日志撤回按钮限制 2025-07-11 16:27:02 +08:00
shijing 3b2cecec17 fix:fmlog_detail刷新 2025-07-11 14:59:00 +08:00
shijing 9de938fa44 fix:玻纤统计分析静态页面 2025-07-11 08:37:12 +08:00
shijing 9760735630 fix:光芯日志列表分页问题 2025-07-10 14:34:11 +08:00
shijing 2ec6a4b0ce fix:utask 2025-07-10 08:35:37 +08:00
shijing 1f5cee4f11 fix:交接记录只要提交都可撤销 2025-07-10 08:35:08 +08:00
shijing 4ed5be41e6 fix:玻纤车间看板 2025-07-09 16:00:58 +08:00
shijing f28a87a3c4 fix:传参修正 2025-07-09 14:05:39 +08:00
shijing 69e7513a77 fix: 2025-07-09 14:05:05 +08:00
shijing e1cb3faf4c fix:毛坯检测统计分析 2025-07-09 14:04:35 +08:00
shijing f73b4a5405 fix: 2025-07-09 14:04:11 +08:00
shijing a39f69d455 fix:去掉非必要的接口请求 2025-07-09 14:02:30 +08:00
shijing 4596256e76 fix:全选文案更改 2025-07-09 14:01:15 +08:00
shijing a8c2a94005 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-07-09 14:00:49 +08:00
shijing 734ae73e0d fix:返工日志标记 2025-07-09 14:00:46 +08:00
zty bb17d31373 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-07-09 11:17:36 +08:00
zty b53f21be24 feat:修改白灰线前端代码 2025-07-09 11:17:30 +08:00
shijing 7394e62c5e fix:日志中结束时间消除必填 2025-07-07 11:12:36 +08:00
shijing 0e23bd307b fix:光芯日志mgroup多次请求问题 2025-07-07 09:24:23 +08:00
shijing 973b755dc3 fix:车间看板页面文件 2025-07-07 09:12:10 +08:00
shijing 85d60f1a0f fix:coding#803#857、38已下检测的项检测时候,缺陷项加可以全选的功能 2025-07-04 16:26:36 +08:00
shijing 7e7d417ced fix:日志中使用数不能改问题修正 2025-07-04 16:25:26 +08:00
shijing 23b711d72f fix:质检统计修正 2025-07-04 16:24:31 +08:00
shijing 642baa3965 fix:coding#803#842、25检测表,绑定缺陷项的时候加判断,如果列表里已绑定就加提示:缺陷项已存在 2025-07-04 11:27:20 +08:00
shijing bf64596820 fix:分合批撤销后不展示编辑 2025-07-04 09:57:14 +08:00
shijing c0ab24c25b fix:光芯返工日志不传route 2025-07-04 08:50:52 +08:00
shijing 2703a2a1a3 fix:scFormTable增加pushType传输 2025-07-03 16:38:22 +08:00
shijing f986cd8d59 fix:更新版本号 2025-07-03 16:05:19 +08:00
shijing f406c87f5c fix:交接多选后显示 2025-07-03 15:34:00 +08:00
shijing a53d3e4989 fix:批次追踪左侧列表去掉类型筛选,去除版本列,日志展示变更 2025-07-03 15:03:27 +08:00
shijing c0f0038ccb fix:光芯日志mlogb_form修正 2025-07-03 13:51:47 +08:00
shijing 111c0fc49f fix:分批查看时显示原始物料 2025-07-03 11:17:24 +08:00
shijing bfa4fd5127 fix:coding#803#848、31日志列表加列:添加批次号、提交人列 2025-07-02 16:52:50 +08:00
shijing 0d5aab23d4 fix:coding#803#849#32交接记录里加显示板段号列、搜索里加扫码批次查询 2025-07-02 16:49:58 +08:00
shijing 1590c37b94 fix:#803#861#40日志,选择任务的时候按工艺列下拉选择 2025-07-02 15:19:57 +08:00
shijing 1b295d784f fix:#803#860#39装炉压板出炉工序加下图列 2025-07-02 14:43:46 +08:00
shijing 5cadf81f08 fix:#803#859#39日志详情去掉工段物料列表 2025-07-02 14:21:22 +08:00
shijing b5cfa535be fix:conding#803#853#34.退料弹窗数量不可编辑 2025-07-02 13:58:29 +08:00
shijing ef83958eae fix:统计同步 2025-07-02 10:37:45 +08:00
shijing 86472560fe fix:质检统计(简)页面清理 2025-07-02 10:09:02 +08:00
shijing bb806e4fb4 fix:光芯日志可选择工艺步骤 2025-07-01 15:23:06 +08:00
shijing 22bdea774a fix:光芯辅料库 2025-07-01 15:21:20 +08:00
shijing ae1964ec92 fix:我的工单中添加撤回 2025-07-01 15:09:59 +08:00
shijing 1d234fefe5 fix:质检统计 2025-07-01 15:08:48 +08:00
shijing bace29ba45 fix:光芯大屏添加定时更新(5分钟) 2025-07-01 15:06:46 +08:00
shijing 0b263f076b fix:批次查询列表修正 2025-06-30 17:00:11 +08:00
shijing 7986a9793d fix:更换查询参数 2025-06-27 17:17:38 +08:00
shijing 0d904c380d fix:光芯工序不合格统计表中的不合格项全部展示 2025-06-27 14:53:48 +08:00
shijing 254beea5f8 fix:光芯检验统计根据要求改动 2025-06-27 14:53:07 +08:00
shijing d8d9fbf914 fix:出入库记录do_out、other_in、pur_in中mioitem可以撤回并删除 2025-06-27 14:52:23 +08:00
shijing e7b03c0ca6 fix:wpr查询传参错误纠正 2025-06-27 14:50:41 +08:00
shijing 10ee4471de fix:玻纤交接记录列表交接类型显示调整 2025-06-27 11:02:59 +08:00
shijing abfd1b875b fix:玻纤分批次 2025-06-27 10:38:54 +08:00
shijing 6117de9bc4 fix:工序不合格统计中产品编号左侧固定 2025-06-26 14:36:17 +08:00
shijing d5f8ecfec0 fix:交接时新批次展示 2025-06-26 14:22:40 +08:00
shijing f13ce97a92 fix:工序不合格统计 2025-06-26 13:38:33 +08:00
shijing dba36ec30b fix:拆分批撤销,批量检测清空列表 2025-06-26 13:19:17 +08:00
shijing a39127a804 fix:质检统计调整 2025-06-25 15:25:33 +08:00
shijing ff3aa11c27 fix:玻纤分批次 2025-06-25 15:23:57 +08:00
shijing 1c9349287b fix:棒管综合统计相关改动 2025-06-25 10:44:06 +08:00
shijing 6e92abc098 fix:出入库详情表单领料时,仓库不可选,添加辅料详情列表 2025-06-24 14:25:07 +08:00
shijing 0d532cccb9 fix:光芯辅料表头变化 2025-06-24 14:21:05 +08:00
shijing 0093661dd0 fix:表头颜色重选 2025-06-24 14:20:31 +08:00
shijing f9b3f0c269 fix:工序不合格统计 2025-06-24 14:20:07 +08:00
shijing 75c8a19fb3 fix:玻纤批次打印模板添加原始物料 2025-06-24 09:20:29 +08:00
shijing 9fd9cf9983 fix:辅料出入库记录撤回 2025-06-23 17:21:51 +08:00
shijing 023abaff33 fix:编辑查看交接记录时人员显示 2025-06-23 16:43:09 +08:00
shijing b505568d64 fix:coding#858 2025-06-23 16:41:23 +08:00
shijing 1a99f731bf Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-06-23 16:40:31 +08:00
shijing cf89f8583f fix:玻纤带板段号批次打印模板添加原始物料 2025-06-23 16:40:28 +08:00
zty 4894b637d1 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-06-23 13:53:48 +08:00
zty 3ca29f706e feat: index_enm_bh 修改白灰线的大屏数据 2025-06-23 13:53:44 +08:00
shijing dcde52c633 fix:输出物料是单件时输出不显示编辑按钮 2025-06-23 13:46:06 +08:00
shijing 5a3ffca288 fix:光芯交接改动 2025-06-23 11:24:49 +08:00
shijing f749fc14f0 fix:光芯mlog日志问题修改 2025-06-23 09:13:35 +08:00
shijing f68a2e1b7f fix:撤销前有提示 2025-06-23 08:56:31 +08:00
shijing ea9395bf14 fix:辅料采购入库,半成品采购入库,以及辅料出入库详情 2025-06-20 17:25:15 +08:00
shijing fc0c344074 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-06-20 15:01:15 +08:00
shijing eb9396f2f8 fix:交接撤消 2025-06-20 15:01:12 +08:00
zty feb0e9bb1c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-06-20 10:15:49 +08:00
zty 3ed7c5f9b1 feat: 增加凌源白灰线内容 2025-06-20 10:15:47 +08:00
shijing 306a797c86 fix:物料统计错误传参修正 2025-06-20 09:08:31 +08:00
shijing a87de2a427 fix:光芯大屏单个任务产量请求参数修改 2025-06-19 16:55:26 +08:00
shijing cc17dde1dc fix:光芯输入物料表单优化 2025-06-19 15:46:23 +08:00
shijing 125c9759b8 fix:光芯交接表单优化 2025-06-19 15:45:29 +08:00
shijing 03f65b7129 fix:物料清单相关改动(辅料添加位号,添加是否进入车间库存) 2025-06-19 15:44:24 +08:00
shijing 1f8442060d fix:库存相关改动(辅料添加位号,添加物料详情列表) 2025-06-19 15:43:32 +08:00
shijing 3e70adebe3 fix:coding#851#852 2025-06-18 09:35:02 +08:00
shijing f660f13950 fix:工序带板段号打印模板修改 2025-06-16 16:20:25 +08:00
shijing 6f5bb4a897 fix:标签打印模板调整 2025-06-16 15:30:55 +08:00
shijing 6270b2344d fix:玻纤去掉表单里的扫码按钮 2025-06-16 10:35:45 +08:00
shijing 2ec004908a fix:光芯日志输入物料编辑的时候传参的参数名纠正 2025-06-16 09:21:40 +08:00
shijing a051211b35 fix:玻纤脱模测量和退火工段的物料打印时,要带出板段号,并展示每个板段的切分数 2025-06-13 16:53:42 +08:00
shijing 95f289c461 fix:玻纤mlogs条件返回数据 2025-06-13 15:44:45 +08:00
shijing 731ae2cca8 fix:玻纤车间看板数据填充 2025-06-13 15:42:48 +08:00
shijing a85e691f3f fix:玻纤脱模测量和退火工段的物料打印时,要带出板段号,并展示每个板段的切分数 2025-06-13 15:41:05 +08:00
shijing bac9fcb414 fix:玻纤脱模测量和退火工段的物料打印时,要带出板段号 2025-06-12 15:28:00 +08:00
shijing 4447c2495d fix:更新版本 2025-06-12 13:58:01 +08:00
shijing c5fd2ee402 fix:光芯大屏任务产量展示二次超洗数量,精雕改为倒角 2025-06-12 13:48:24 +08:00
shijing 7eff9f3505 fix:玻纤车间看板75% 2025-06-12 13:22:25 +08:00
shijing 555b342f01 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-06-12 10:00:48 +08:00
shijing 662b78500f fix:后面几个检验工段的返工交接可以返已完成的所有品 2025-06-12 10:00:45 +08:00
caoqianming 8137352425 feat: ichat index界面 2025-06-12 09:38:23 +08:00
caoqianming b48e263cd6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-06-12 08:48:41 +08:00
caoqianming e33f0786dd feat: 合肥南方的总数据量页面 2025-06-12 08:47:16 +08:00
shijing 764acde2b4 fix: 2025-06-11 16:03:05 +08:00
shijing aace8c1d2e fix:排一次棒和排板时去掉number获取 2025-06-11 15:59:56 +08:00
shijing 385f0170a0 fix:玻纤控制台页面 2025-06-11 15:57:13 +08:00
shijing b117708119 fix:wpr物料查询 2025-06-10 11:28:34 +08:00
shijing be1be82c78 fix:光芯质检统计添加比例汇总,筛选条件调整 2025-06-10 11:28:14 +08:00
shijing a5770cd4f5 fix:玻纤首页数据调整 2025-06-09 14:43:07 +08:00
shijing 15aa2ca1d2 fix:光芯生产检验统计 2025-06-09 14:42:22 +08:00
shijing 74a7078f69 fix:光芯统计小改动 2025-06-06 13:46:49 +08:00
shijing 8b345a1df6 fix:玻纤后面几个工段的返工只能选择合格品和合格B类 2025-06-06 08:38:11 +08:00
shijing 5f7a15c05c fix: 2025-06-05 15:18:54 +08:00
shijing 1e9fd15561 fix: 2025-06-05 15:18:38 +08:00
shijing 45e51885bc fix:光芯统计分析->库存统计隐藏型号、规格 2025-06-05 15:04:56 +08:00
shijing 565af72322 fix:光芯统计分析->质检统计->返修部分修正 2025-06-05 15:02:50 +08:00
shijing b1381d17cc fix:光芯大屏不合格项改动,以及表格滚动 2025-06-05 15:00:56 +08:00
shijing 3e63889dfc fix:光芯->统计分析->工序合格数 2025-06-05 14:31:13 +08:00
shijing aa7c8d827a fix:交接表单选择物料后再显示交接工段 2025-06-05 09:24:06 +08:00
shijing 95188151e2 fix:光芯质检统计合格率添加%,外观总合格数没有的时候显示0 2025-06-04 16:46:30 +08:00
shijing b8ec85f85f fix:玻纤车间看板布局页面 2025-06-04 10:27:34 +08:00
shijing 7141116c43 fix:光芯质检统计添加底部总计 2025-06-04 10:27:05 +08:00
shijing ae9baae3da fix:光子统计部分更新 2025-06-04 09:43:49 +08:00
shijing 073fd4eb9d fix:光子统计部分更新 2025-06-04 09:34:47 +08:00
shijing 1a4449e766 fix:bug修正 2025-06-04 09:33:59 +08:00