Commit Graph

844 Commits (ad72e55de70b3c65869bb1c044ea10570487c83c)

Author SHA1 Message Date
jun 52d1519a91 41816 试制件工单-手动插单时,不需要卡控零件产线对应关系 12 months ago
jun 1de46a3e8f 41793 MES-PC:演示过程-点检单页面问题 12 months ago
jun 1d24be316a 41815 MES:PC-生产工单-手动按钮报工,已完成数量也要累加 12 months ago
jun 9bbcc13ff5 41807 组件返工作业--返工单创建时间超过配置时间(增加配置)后,通过邮件提醒 12 months ago
jun c9998589da 排序工单导入问题修复 12 months ago
微笑着面对明天 e2b71f8ceb 业务履历新增 12 months ago
微笑着面对明天 f0c39b0a6c 业务履历新增 12 months 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
gsz 3720a134c5 41606 BTO工单的生成规则需要根据产线独立排序 1 year ago
jun 165ef27abf 设备信息表、设备变量表:查询条件需要支持模糊查询 1 year ago
jun b76a98727b 递归查询bom树信息 1 year ago
jun c5445e7617 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 6a837edbb8 41603 生产工单-导入工单时,系统不应该区分产线的大小写 1 year ago
gsz 2fa26b16e1 41236 非排序加工规则-编辑时未带出字段 1 year ago
jun 6a0d1eee40 BOM树开发 1 year ago
jun fe60829f79 41583 BTO创建工单基于生产组配置,现在配置成发布,实际工单生产状态是未处理 1 year ago
jun 6d7e2c40d0 fix #bug 41559
fix #bug 41577
1 year ago
administrator 743ba7d251 Maximo修改接口对象为大写 1 year ago
jun 91b7738bd0 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 83e4391f2e 生产工单导入问题修复 1 year ago
administrator 7aa0e85c10 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
administrator 5e998706cf Maximo修改接口对象为大写 1 year ago
gsz 3c910c4bfb Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 71a8a6eed3 41549 零件发运组+零件拉动组+非排序产品加工规则配置+零件生产组 导入 1 year ago
jun e3e8d6ed8d 添加设备时,同一个设备可以关联到2个工位,需要修复。 1 year ago
administrator 05512b63f5 BTO 如果生产组零件组禁用了生产零件则跳过 1 year ago
logic.fang 3e5a3ac66f 41513 MES-PC端-生产版本、物料信息-查询接口要求允许同时查询禁用、启动的数据 1 year ago
gsz 58f4bccad7 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 6e1a17e253 41525 设备+缺陷+点检模块新增导入功能 1 year ago
jun df74eb09cd 工单修改需要同步标识需要改为未同步 1 year ago
jun 524ba1060b 问题清单问题修复 1 year ago
jun 36fb84aef3 问题清单问题修复 1 year ago
jun 29cc194ad7 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 3a1ecd62e2 问题清单问题修复 1 year ago
logic.fang 19893a3119 产线看板-部分 1 year ago
logic.fang 057a9f2f2f MES设备数据查询报表-增加“日志类型名称”、“更新时间”、“更新人” 1 year ago
logic.fang b664e74e37 产线产品加工规则报表 1 year ago
jun 29720c309a 报工调整 1 year ago
jun 45d07effe3 工单相关问题修复 1 year ago
gsz 53bcf4fa40 FS报表-可疑品条码信息报表 1 year ago
jun a2e1e427a3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun e9d081c413 报工调整后,只是报工调整数量需要变化 1 year ago
administrator f0f812fbfa Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 3c81d6cf8a 导入模板管理开发 1 year ago
jun 4bd046e407 1、工单汇总回传SAP异常问题修复
2、导入模板功能开发
1 year ago
gsz bedb0c264c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 665a0369a6 41404 主工位与子工位修改 1 year ago
jun d1a0e05f7e Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun be13f191fd 41388 工单界面不显示产线名称 1 year ago
logic.fang a9993e56b4 MES设备数据查询报表 1 year ago
jun 1194039fff 包装定义维护--增加是否验证LOT Number查询条件 1 year ago
jun 566d9d8b0d 工单演示问题修复 1 year ago
jun c9075c7803 工单演示问题修复 1 year ago
jun 9f4b6b049b 接口映射函数添加NotTrans处理逻辑 1 year ago
jun def92011b7 问题清单问题修复 1 year ago
administrator 76628d0151 增加BTO缺失字段 1 year ago
jun ebeeabeb7f CBR冲销优化 1 year ago
jun 6bd043ff5d CBR冲销 1 year ago
gsz 14ae5dcdf4 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz f32028f27d 6.13 bug修改 1 year ago
administrator 54e1dc05ab 重构maximo的ws服务接口 1 year ago
jun bbe3d22215 核心包中存在,二开中移除 1 year ago
jun 2a89cd5776 规则代码基础数据 1 year ago
jun aee32ac3e8 新增打印机配置 1 year ago
administrator 46684e8ee8 maximo仪表主数据和设备主数据 webService服务 地址:http://localhost:8300/i3plus/mes-service?wsdl localhost替换为部署环境的ip 1 year ago
administrator 94b3bd2199 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 7f078c176d 基础主数据bug 1 year ago
gsz 6187044e1e Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz ea08717ad7 bug修改 1 year ago
jun 0508f5918a 字段变更 1 year ago
administrator 7baf424ccf Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 1424806cf8 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 5b3b9f15a2 bom取值逻辑变更 1 year ago
gsz 6c20420829 bug修改 1 year ago
administrator ef644554a1 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
gsz c35452fb94 bug修改 1 year ago
gsz b3c185eab8 华为云OBS接口修改 1 year ago
gsz 4309761919 41255 非排序加工规则-新增&编辑-汇报方法字段 1 year ago
gsz 3055568c36 华为云OBS服务接入 1 year ago
administrator d2a71caa3c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
gsz 6b99baa3c7 41232 MES-PC:车系页面问题汇总 1 year ago
gsz 572503cace 41238 物料bom页面条数没有显示 1 year ago
administrator d6189f43ab 恢复注释掉的 ProduceSeq 1 year ago
administrator 2263ba7836 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
gsz 41cd3c45b6 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 2ba89b2cdf 41238 物料bom页面条数没有显示 1 year ago
王杰 14d23ee8d3 工单状态 加工 1 year ago
gsz eb0af4bad3 解决bug 41235 41231 41223 41225 41226 41232 41234 1 year ago
administrator cb82726adf Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 3bda4b3a06 武汉报工逻辑调整 1 year ago
jun 5680b47cb4 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 0fa4ff86be 逻辑修改 1 year ago
gsz eb3de12f5e 装车单详情新增发运组查询 1 year ago
jun 7f89951056 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 9161c1b4d5 报工功能演示修改 1 year ago
gsz 19a71a99ec 点检单设备查询无效 1 year ago
jun b82af4a2f0 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun b354c07e5b 武汉报工功能开发 1 year ago
gsz c28fbbb20e bug修改 1 year ago
gsz 2685dd0e84 MesPartSap修改字段数据来源 零件状态 1 year ago
administrator 7cf5aa1f25 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
gsz d546070fcd 客户车型转换配置明细 1 year ago
administrator ad12de4d28 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
gsz e9bab83882 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 1d8b426667 媒体文件维护 1 year ago
administrator c651fa000b 暂时注释掉 ProduceSeq 1 year ago
administrator 8dc060da00 BTO修改 及 增加job配置,及job日志显示 1 year ago
gsz cee870bf8c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 9d06f117f9 组织模型新增设备过滤已绑定工位 1 year ago
administrator d8f32bc5a9 更新字段 1 year ago
administrator b52d8c4c33 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
gsz b32a1b1160 组织模型新增设备过滤已绑定工位 1 year ago
gsz 90cc18b191 责任人区域关系修改 1 year ago
gsz 544247bae8 责任人区域关系 1 year ago
administrator 9338f4870a bto-job第一个版本完成,按时圆整 1 year ago
gsz f62c90d3ff 生产工单produceSeq类型改变报错 1 year ago
gsz 19859d11c9 所有页面零件信息查询支持模糊匹配 1 year ago
gsz 68af7786cf 客户零件转化配置字段修改 1 year ago
jun c6778d3b56 包装定义维护功能开发 1 year ago
jun 73b97cc3b0 物料信息主数据修改 1 year ago
LML丶 3efad1a43c BOM树 1 year ago
LML丶 ad5889f96e Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 b214ed3bad BOM树 1 year ago
gsz 149855d02b Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz f8e40a535d 根据产线和班组查单个开关班记录接口 1 year ago
jun 121ced9b8e 主数据bug修复 1 year ago
LML丶 22680d10ab Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 7d749607a6 修改装车单明细 1 year ago
jun 195c7bf5c0 功能演示:主数据bug修复 1 year ago
jun a88744c157 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun dce484125c 主数据bug修复 1 year ago
LML丶 804f0b847a 修改装车单明细 1 year ago
gsz f7bb788ec0 MesCustomerPart修改pojo字段 1 year ago
gsz 3e2994bedb Mes PDM表对照修改字段 1 year ago
LML丶 9ea589d9b3 修改装车单明细 1 year ago
LML丶 5a634f7ba1 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun e142961a0f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 3762d71ed4 修改装车单明细 1 year ago
jun 6790a6e1da 主数据bug修复 1 year ago
gsz ca5426b7ec Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 93450bccbf Mes PDM-config下面的表对照 1 year ago
jun 20f9e853cf 主数据bug修复 1 year ago
微笑着面对明天 66a8669203 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
微笑着面对明天 c4e6e97320 基础主数据bug 1 year ago
LML丶 6eb056acd6 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 167389c275 修改装车单明细 1 year ago
jun 73f566ee10 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun b133ed57b6 演示问题清单0521 1 year ago
微笑着面对明天 035c67e571 基础主数据bug 1 year ago
LML丶 ab291c8c77 修改装车单明细 1 year ago
LML丶 8fefd3dbac Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 5506f9611d 修改装车单明细 1 year ago
王杰 d654ac93f5 mes 1 year ago
jun 15de434e68 41053 MES:生产工单问题汇总 1 year ago
jun 68a2f24362 班次查询有效期内的班次 1 year ago
LML丶 f1f7e0cd29 修改装车单明细 1 year ago
LML丶 f8fc179046 修改装车单明细 1 year ago
LML丶 9e812fdd51 修改装车单明细 1 year ago
LML丶 e997e6110b Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 3e4b2a5172 修改装车单明细 1 year ago
微笑着面对明天 971c719065 基础主数据bug 1 year ago
LML丶 64b565fc86 修改装车单明细 1 year ago
LML丶 ad5974f98a 发布 1 year ago