Commit Graph

936 Commits (b50fdbe35764bc291ce893ec7317f9dec5d8092e)

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