jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity
938 Commits
21 Branches
24 Tags
10 MiB
uat-temp-wj-chongqingdaqu-dev
uat-temp-nht-2503130000-shipping
dev_temp_xw_202503170000_45656
uat-temp-nht-chengdu-loading
uat-temp-nht-2503130000-chengdu-shipping
uat-temp-wj-chongqingdaqu-prod
uat
test
dev_temp_xw_202503120000_45631
uat-temp-logic-20250313-45610
dev
uat-temp-nht-2503040000-seres
uat-temp-wj-2502060000-chongqing-step
dev_temp_xw_20250305_45455
test-temp-wj-250117-pack
uat-temp-castle-250211-44248
uat-temp-nht-2502100000-45019
uat-temp-wj-250124-equ-check-step
dev-temp-xw-202501150000-44852
dev-temp-xw-202501031219-44700
master
yfai-mes-ext-v3.3
yfai-mes-ext-v3.2
yfai-mes-ext-v3.11
yfai-mes-ext-v3.1
yfai-mes-ext-v3.0
yfai-mes-ext-v2.9
yfai-mes-ext-v2.8
yfai-mes-ext-v2.7
yfai-mes-ext-v2.5
yfai-mes-ext-v2.4
yfai-mes-ext-v2.3
yfai-mes-ext-v2.2
yfai-mes-ext-v2.1
yfai-mes-ext-v2.0
yfai-mes-ext-v1.9
yfai-mes-ext-v1.8
yfai-mes-ext-v1.7
yfai-mes-ext-v1.6
yfai-mes-ext-v1.5
yfai-mes-ext-v1.4
yfai-mes-ext-v1.3
yfai-mes-ext-v1.2
yfai-mes-ext-v1.1
yfai-mes-ext-v1.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '41cfa4e252'
${ noResults }
Commit Graph

931 Commits (41cfa4e252e411918d586de263d10c2afa888e14)

Author SHA1 Message Date
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
微笑着面对明天 844dafc2ce 业务履历 10 months ago
王杰 12d3944353 误删文件 10 months ago
gsz 5374bf371b Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 10 months ago
gsz 1f63093d15 主子工位卡控去掉 10 months ago
jun 059bd13f16 41785 产线看板查询点检结果存在显示异常 10 months ago
jun 8f88fcadac 跨工厂防错功能开发 10 months ago
gsz 56f285e1cf QMS点检结果脚本 10 months ago
administrator 552e0098c4 增加产线与工位的关系--校验唯一性 10 months ago
administrator c8dd6fef9a Merge remote-tracking branch 'origin/dev' into dev 10 months ago
administrator 712b62051c 增加产线与工位的关系 10 months ago
gsz d15d620e92 MES_QMS报废品汇总+MES可疑品汇总JOB 10 months ago
administrator fceafc19ee 增加产线与工位的关系 10 months ago
administrator cd28b340aa Bto增加produceSeq规则 10 months ago
jun 2d9e5bd025 新增试制件逻辑 10 months ago
jun 095716d731 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 3c556186da 工艺流程界面问题修复 10 months ago
gsz 4657a697ab MES_QMS报废品汇总+可疑品汇总pojo 10 months ago
jun 73350ef0b9 追溯报表页面样式调整 10 months ago
jun 5db1430759 41696 生产工单页面，增加车型配置下拉选择 10 months ago
administrator 3e262a7e6e Bto增加圆整时间 10 months ago
jun 15a644c5a8 工单页面问题修复 10 months ago
jun 040e5f1b3a Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun f7c34ae3b0 追溯报表，字体地址变更 10 months ago
administrator 2f9f3b75fd 零件发运组关系 10 months ago
jun 91bf6c376a 追溯报表，翻译 10 months ago
jun e80a47b6a5 追溯报表，生成pdf文件 10 months ago
gsz ea2b735694 主子关系ExtendType修改 10 months ago
jun d84a7a61e5 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun f605d49d1d 生产开模统计数据发送 
追溯报表开发
 11 months ago
gsz 260c42fc3c 41549 枚举修改 11 months ago
gsz 810aa42ca5 41549 枚举修改 11 months ago
gsz e7a0262fd1 主子工位报错 11 months ago
logic.fang dfa12c6df5 产线看板-“异常停线时间”部分需求未明确 11 months ago
gsz aa6c6f58b3 41525导入功能优化-校验并返回数据+枚举中文导入 11 months ago
gsz 4326bbe286 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 11 months ago
gsz e3fc93ecaa 根据生产加工记录产线物料产生的工单报工job测试 11 months ago
jun 6160d3da6a 更新系统同步标志 11 months ago
gsz 3720a134c5 41606 BTO工单的生成规则需要根据产线独立排序 11 months ago
jun 165ef27abf 设备信息表、设备变量表：查询条件需要支持模糊查询 11 months ago
jun b76a98727b 递归查询bom树信息 11 months ago
jun c5445e7617 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 6a837edbb8 41603 生产工单-导入工单时，系统不应该区分产线的大小写 11 months ago
gsz 2fa26b16e1 41236 非排序加工规则-编辑时未带出字段 11 months ago
jun 6a0d1eee40 BOM树开发 11 months ago
jun fe60829f79 41583 BTO创建工单基于生产组配置，现在配置成发布，实际工单生产状态是未处理 11 months ago
jun 6d7e2c40d0 fix #bug 41559 
fix #bug 41577
 11 months ago
administrator 743ba7d251 Maximo修改接口对象为大写 11 months ago
jun 91b7738bd0 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 83e4391f2e 生产工单导入问题修复 11 months ago
administrator 7aa0e85c10 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
administrator 5e998706cf Maximo修改接口对象为大写 11 months ago
gsz 3c910c4bfb Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 11 months ago
gsz 71a8a6eed3 41549 零件发运组+零件拉动组+非排序产品加工规则配置+零件生产组 导入 11 months ago
jun e3e8d6ed8d 添加设备时，同一个设备可以关联到2个工位，需要修复。 11 months ago
administrator 05512b63f5 BTO 如果生产组零件组禁用了生产零件则跳过 11 months ago
logic.fang 3e5a3ac66f 41513 MES-PC端-生产版本、物料信息-查询接口要求允许同时查询禁用、启动的数据 11 months ago
gsz 58f4bccad7 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 11 months ago
gsz 6e1a17e253 41525 设备+缺陷+点检模块新增导入功能 11 months ago
jun df74eb09cd 工单修改需要同步标识需要改为未同步 11 months ago
jun 524ba1060b 问题清单问题修复 11 months ago
jun 36fb84aef3 问题清单问题修复 11 months ago
jun 29cc194ad7 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 3a1ecd62e2 问题清单问题修复 11 months ago
logic.fang 19893a3119 产线看板-部分 11 months ago
logic.fang 057a9f2f2f MES设备数据查询报表-增加“日志类型名称”、“更新时间”、“更新人” 11 months ago
logic.fang b664e74e37 产线产品加工规则报表 11 months ago
jun 29720c309a 报工调整 11 months ago
jun 45d07effe3 工单相关问题修复 11 months ago
gsz 53bcf4fa40 FS报表-可疑品条码信息报表 11 months ago
jun a2e1e427a3 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun e9d081c413 报工调整后，只是报工调整数量需要变化 11 months ago
administrator f0f812fbfa Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 3c81d6cf8a 导入模板管理开发 11 months ago
jun 4bd046e407 1、工单汇总回传SAP异常问题修复 
2、导入模板功能开发
 11 months ago
gsz bedb0c264c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 11 months ago
gsz 665a0369a6 41404 主工位与子工位修改 11 months ago
jun d1a0e05f7e Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun be13f191fd 41388 工单界面不显示产线名称 11 months ago
logic.fang a9993e56b4 MES设备数据查询报表 11 months ago
jun 1194039fff 包装定义维护--增加是否验证LOT Number查询条件 11 months ago
jun 566d9d8b0d 工单演示问题修复 11 months ago
jun c9075c7803 工单演示问题修复 11 months ago
jun 9f4b6b049b 接口映射函数添加NotTrans处理逻辑 11 months ago
jun def92011b7 问题清单问题修复 11 months ago
administrator 76628d0151 增加BTO缺失字段 11 months ago
jun ebeeabeb7f CBR冲销优化 11 months ago
jun 6bd043ff5d CBR冲销 11 months ago
gsz 14ae5dcdf4 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 11 months ago
gsz f32028f27d 6.13 bug修改 11 months ago
administrator 54e1dc05ab 重构maximo的ws服务接口 11 months ago
jun bbe3d22215 核心包中存在，二开中移除 11 months ago
jun 2a89cd5776 规则代码基础数据 11 months ago
jun aee32ac3e8 新增打印机配置 11 months ago
administrator 46684e8ee8 maximo仪表主数据和设备主数据 webService服务 地址:http://localhost:8300/i3plus/mes-service?wsdl localhost替换为部署环境的ip 11 months ago
administrator 94b3bd2199 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
微笑着面对明天 7f078c176d 基础主数据bug 11 months ago
gsz 6187044e1e Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 11 months ago
gsz ea08717ad7 bug修改 11 months ago
jun 0508f5918a 字段变更 11 months ago
administrator 7baf424ccf Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 1424806cf8 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 5b3b9f15a2 bom取值逻辑变更 11 months ago
gsz 6c20420829 bug修改 11 months ago
administrator ef644554a1 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
gsz c35452fb94 bug修改 11 months ago