Commit Graph

999 Commits (4c6ee6446e5e897dd3724c6c26c62f9413d30f1d)

Author SHA1 Message Date
gsz 92a0136482 生产工单日志 12 months ago
jun 933bc2fab0 写入目标表失败,更新同步标识特殊处理(未配置失败code报错) 12 months ago
gsz 8e1461d066 42692 MES:可疑品汇总逻辑更新 12 months ago
jun 19eea2b97e 生产版本和工作中心绑定关系取消 12 months ago
jun 3e7c2c75c5 写入目标表失败,更新同步标识特殊处理(未配置失败code报错) 12 months ago
jun ad72e55de7 MES2PISCES-发运单回传汇总逻辑问题修复 12 months ago
jun 114ca961fe Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 2f37ea1865 接口映射分组名称用枚举 1 year ago
xiangwei.zhang 26e9ba93dd 新增导入信息 1 year ago
xiangwei.zhang 85bed73d4e Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 3267d04197 接口映射,自定义脚本页面开发 1 year ago
gsz 3006fc0d13 42692 MES:可疑品汇总逻辑更新 1 year ago
jun d4a3b131df 42660 SAP生计划完成率更新 1 year ago
jun 2935bd40f7 汇总工单信息发送给SAP 1 year ago
jun 95759dd876 42582 线边库存报表 1 year ago
gsz dac6a8f9ec 42102 点检单页面增加打印功能 1 year ago
jun 2b70084c7c 42602 发运后,客退品返工,生成并打印新条码
42582 线边库存报表
1 year ago
jun 8bf1738bcf 产线零件关系软删 1 year ago
王杰 6cf1811cfc 少了物料查询条件 1 year ago
王杰 9f04956492 少了物料查询条件 1 year ago
王杰 923c2570b9 查询条件写错 1 year ago
jun 5a8e76d8c5 零件条码状态,排序加工规则导出问题修复 1 year ago
jun 4758a89f4c 汇总发送工单时间提前10分钟 1 year ago
jun 78bb487025 工单汇总发送SAP逻辑调整,零件条码状态,加工记录导出功能 1 year ago
jun 440a9eaa3c 42580 PC-产线与零件关系维护-导入后,产线代码为空 1 year ago
gsz effc71dd95 产量统计报表report_type=10 的过滤掉 1 year ago
gsz 0962527d5f 汇总工单给SAP不统计 试制单order_flag !='P' 1 year ago
gsz d2c1c4c591 汇总工单给SAP 时间分组方式,关闭状态数量逻辑变更 1 year ago
gsz 458b24957d 汇总工单给SAP 时间分组方式,关闭状态数量逻辑变更 1 year ago
jun 73a11a618a 零件条码状态,产品加工记录报表开发 1 year ago
logic.fang abcbb98767 产线看板-工单完成情况-当班一次合格率汇总逻辑变更 1 year ago
jun 2939ac3b69 发运单明细页面显示备注字段 1 year ago
gsz fbda3b66cc 42563 工单汇总SAP,只是汇总非排序工单,(排序和BTO工单都不需要回传SAP) 1 year ago
gsz b722a36e55 根据物料工位分组分页查询设备加工记录返回分页pager 1 year ago
gsz 32b76ad88d 根据物料工位分组分页查询设备加工记录 1 year ago
gsz 26834c591c 42102 点检单页面增加打印功能 1 year ago
王杰 5953ef5722 设备日志报表 查询条件 1 year ago
王杰 637bac157b 设备点位 查询 设备代码不能模糊查询 1 year ago
jun 5a5bce2767 打印模板增加打印时间字段 1 year ago
臧学普 22157ae0eb Merge remote-tracking branch 'origin/dev' into dev 1 year ago
臧学普 91de11ab78 在零件生产组没有可以生成的零件时,更新窗口时间 1 year ago
王杰 6cde8fa37c 工位扫描日志model 1 year ago
王杰 188fa73561 修改同步字段赋1的问题 已经跟罗 双 2人确认 1 year ago
王杰 f4f581d237 设备日志报表 查询条件 1 year ago
jun 38d65f2050 报工调整增加原因录入功能 1 year ago
jun 8f341689c9 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
臧学普 9c7a954f2b 日志打印零件生产组生成工单时的时间 1 year ago
jun ee50030890 产线与零件关系导入(产线名称改为产线代码) 1 year ago
臧学普 fad2cb5c66 修改bto生产工单的窗口提示信息 1 year ago
臧学普 8d48119572 查询客户排序信息时查询未解析过的数据 1 year ago
logic.fang 1e77a3a7f5 产线看板-优化 1 year ago
jun 2d94c2c66d 问题清单修复 1 year ago
jun f8d371a3e2 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun c4d113ce05 问题清单修复 1 year ago
王杰 b08727bb82 系统配置查询方法 1 year ago
臧学普 d81c9d9cc3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
臧学普 ba4c03b843 更新bto按时圆整生成工单逻辑 1 year ago
jun 096835bd11 问题清单修复 1 year ago
王杰 0da6e7f2f6 mes报表验证分表配置 1 year ago
王杰 7e50e2cf37 mes报表验证分表配置 1 year ago
微笑着面对明天 1390979630 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 736ae7ebff 新增设备数据变量 1 year ago
gsz 587502b2d8 代码回退,逻辑有变待确认 1 year ago
gsz 786385b2e0 MES可疑品汇总修改 返工数/不合格数/检验数量逻辑 1 year ago
jun c0e3d72b51 问题清单修复 1 year ago
gsz 0994b7ffaa MES可疑品汇总job修改汇总逻辑 1 year ago
王杰 8d20f2ff9d 日志分表 查询 bug 1 year ago
gsz 7698c12158 MES可疑品汇总 增加qms同步标志qmsSync 1 year ago
gsz 065b4241d9 42221 单件条码返工后报废 1 year ago
jun b5a0c0d81a 问题清单修复 1 year ago
jun 56ded2a6bc Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 0989f3aeee 问题清单修复 1 year ago
王杰 2f65a4a093 设备日志报表 增加分表查询字段 1 year ago
王杰 3a6248a1ea modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java 1 year ago
gsz fa51917ab3 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz bfafa4206c ccsc汇总job 规则随机逻辑修改 1 year ago
jun 763ad4546c 问题清单修复 1 year ago
jun a6c1d5a485 CCSC检测,重新打开 1 year ago
gsz 86c9ec3ecf Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 05bd490501 42189 零件扩展属性 条码模板与零件条码规则匹配开发 1 year ago
jun 7de9fef630 问题清单修复 1 year ago
jun b55cbb30bc 问题清单修复 1 year ago
jun 68bc7bc96a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun a5873a9388 问题清单修复 1 year ago
logic.fang 684d5ea5d9 产线看板-"单位小时完工率"与"产线一次下线合格率"部分的时间段排序优化 1 year ago
logic.fang 4d68d813e3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 1de19ae114 问题清单修复 1 year ago
王杰 79c62b3d63 设备LOg变更字段 1 year ago
王杰 452e538823 设备LOg变更字段 1 year ago
jun ee3a6879cd 数据同步脚本 1 year ago
王杰 15debc5dfb mesmove 增加 erp生产线值 1 year ago
王杰 f3c87a4e87 导入模版 1 year ago
王杰 a42db56264 导入模版接口调整 主数据下载模版时不能进行模糊查询 1 year ago
王杰 f4b0330b09 追溯报表 1 year ago
王杰 dd6836c891 追溯报表 1 year ago
王杰 e21607fe85 追溯报表 1 year ago
jun 50fe1a10a5 问题清单修复 1 year ago
jun 5e2d23b101 问题清单修复 1 year ago
logic.fang 27b4f49263 Merge branch 'dev' of C:\Code\IdeaProjects\yfai\YF\i3plus-mes-yfai with conflicts. 1 year ago
jun ddd22117b1 问题清单修复 1 year ago
王杰 c94dc6e14c 设备日志 1 year ago
王杰 3826df02ee mes枚举 1 year ago
jun ff001be549 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 3227ee65ca 问题清单修复 1 year ago
gsz 496b219fd7 媒体文件MesMediaFileCfgController crud 1 year ago
王杰 193e918dae 设备日志 1 year ago
王杰 29351f41cc mes 1 year ago
王杰 f5af575513 设备日志 1 year ago
jun 25ad2f58a7 问题清单修复 1 year ago
臧学普 266ce66508 增加fid 1 year ago
臧学普 acded409ab 注释掉obs相关接口,使用原有的文件管理系统 1 year ago
gsz f49cf4bbdb MES_QMS报废品汇总查同步标识为3的数据 1 year ago
王杰 46a24a8e61 设备日志 1 year ago
jun b2a5acf45b 问题清单修复 1 year ago
jun abfb72759f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java
1 year ago
jun 5e2b921ee9 问题清单修复 1 year ago
王杰 7190b76438 mes execption 类变更路径 1 year ago
王杰 741ef4d549 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
王杰 19f73ea5fe mes execption 类变更路径 1 year ago
jun 80ade2b239 bug #41896 1 year ago
jun 8142c2a990 问题清单修复 1 year ago
jun 816ca4bec6 问题清单修复 1 year ago
gsz d72767f2ac Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 5063ba69aa MES2PISCES 装车单 1 year ago
微笑着面对明天 30d470f43c 导入和报工 1 year ago
王杰 a63d7f4fb1 产线与零件关系 查询条件无效问题修复 1 year ago
jun 684977eefd bug 41915 1 year ago
微笑着面对明天 8dd414182e 零件检验 1 year ago
gsz f42d9f4da2 MES2PISCES 发运单+装车单回传 1 year ago
jun 9dd5ceed60 自定义脚本 1 year ago
jun 1b2f04fb6c 接口同步脚本 1 year ago
王杰 0578661a0e pieces2mes数据同步 1 year ago
jun 5fb9194a20 接口调试增加脚本,FID 1 year ago
jun 7963cf5150 问题清单问题修复 1 year ago
jun c7d9ee47dd Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 3139b7b7fd 工单同步 1 year ago
王杰 4f64cf83c5 pisces同步加工记录到mes 1 year ago
jun f3e9c616bf Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 6fb3bebb71 问题清单bug修复 1 year ago
administrator 9254ace3fc Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
administrator 8950311d38 导入零件与产线关系 1 year ago
王杰 9bcc7452f8 清除不用代码 1 year ago
administrator 704e3c30ce Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
jun 11a0cafc90 打印模板不区分工厂 1 year ago
微笑着面对明天 f0da109d4c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 6921b2d333 报工 1 year ago
jun 12a164f54f bug 41859 1 year ago
jun 2e48c4f4e6 问题清单问题修复 1 year ago
administrator 308aa1603f 修改工单的生产序列号 1 year ago
jun 8eb0dd64e5 跨工厂防错表名修改 1 year ago
jun f3ee1d1ab9 问题清单问题修复 1 year ago
jun 47e0abbd06 问题清单问题修复 1 year ago
jun 1be92c9e7b 返回值类型转换 1 year ago
jun c94b8ba822 增加Pisces数据源 1 year ago
jun bdeb76d456 增加pisces数据源 1 year ago
jun 52d1519a91 41816 试制件工单-手动插单时,不需要卡控零件产线对应关系 1 year ago
jun 1de46a3e8f 41793 MES-PC:演示过程-点检单页面问题 1 year ago
jun 1d24be316a 41815 MES:PC-生产工单-手动按钮报工,已完成数量也要累加 1 year ago
jun 9bbcc13ff5 41807 组件返工作业--返工单创建时间超过配置时间(增加配置)后,通过邮件提醒 1 year ago
jun c9998589da 排序工单导入问题修复 1 year ago
微笑着面对明天 e2b71f8ceb 业务履历新增 1 year ago
微笑着面对明天 f0c39b0a6c 业务履历新增 1 year ago
王杰 80402f86f0 编码规则 1 year ago
微笑着面对明天 844dafc2ce 业务履历 1 year ago
王杰 12d3944353 误删文件 1 year ago
gsz 5374bf371b Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 1f63093d15 主子工位卡控去掉 1 year ago
jun 059bd13f16 41785 产线看板查询点检结果存在显示异常 1 year ago
jun 8f88fcadac 跨工厂防错功能开发 1 year ago
gsz 56f285e1cf QMS点检结果脚本 1 year ago
administrator 552e0098c4 增加产线与工位的关系--校验唯一性 1 year ago
administrator c8dd6fef9a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
administrator 712b62051c 增加产线与工位的关系 1 year ago
gsz d15d620e92 MES_QMS报废品汇总+MES可疑品汇总JOB 1 year ago
administrator fceafc19ee 增加产线与工位的关系 1 year ago
administrator cd28b340aa Bto增加produceSeq规则 1 year ago
jun 2d9e5bd025 新增试制件逻辑 1 year ago
jun 095716d731 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 3c556186da 工艺流程界面问题修复 1 year ago
gsz 4657a697ab MES_QMS报废品汇总+可疑品汇总pojo 1 year ago
jun 73350ef0b9 追溯报表页面样式调整 1 year ago
jun 5db1430759 41696 生产工单页面,增加车型配置下拉选择 1 year ago
administrator 3e262a7e6e Bto增加圆整时间 1 year ago
jun 15a644c5a8 工单页面问题修复 1 year ago
jun 040e5f1b3a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun f7c34ae3b0 追溯报表,字体地址变更 1 year ago
administrator 2f9f3b75fd 零件发运组关系 1 year ago
jun 91bf6c376a 追溯报表,翻译 1 year ago
jun e80a47b6a5 追溯报表,生成pdf文件 1 year ago
gsz ea2b735694 主子关系ExtendType修改 1 year ago
jun d84a7a61e5 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun f605d49d1d 生产开模统计数据发送
追溯报表开发
1 year ago
gsz 260c42fc3c 41549 枚举修改 1 year ago
gsz 810aa42ca5 41549 枚举修改 1 year ago
gsz e7a0262fd1 主子工位报错 1 year ago
logic.fang dfa12c6df5 产线看板-“异常停线时间”部分需求未明确 1 year ago
gsz aa6c6f58b3 41525导入功能优化-校验并返回数据+枚举中文导入 1 year ago
gsz 4326bbe286 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz e3fc93ecaa 根据生产加工记录产线物料产生的工单报工job测试 1 year ago
jun 6160d3da6a 更新系统同步标志 1 year ago