Commit Graph

874 Commits (65e2a26cc83bef7b3da2e1e640408bb1f6a36162)
 

Author SHA1 Message Date
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