jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity
1,098 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 'ebd39ef044'
${ noResults }
Commit Graph

1089 Commits (ebd39ef044c08a0cc249ed481b2c52916fbd298f)

Author SHA1 Message Date
微笑着面对明天 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
gsz 1967d69a05 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz c442e79998 根据设备停机超时时间新增设备停机记录JOB 1 year ago
jun 7e0b83ac8f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 88668667ec 工单页面排序调整 1 year ago
gsz 3f2441aea8 查询工位停机类型和原因 1 year ago
gsz a10c96d993 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz aaf43a36b8 设备生产停机记录 1 year ago
微笑着面对明天 de9d52a455 基础主数据bug 1 year ago
gsz 0d9f80c19f CCSC接口映射下发检验结果bug修改 1 year ago
gsz 8e122920ad CCSC首尾件和随机件bug修改 1 year ago
gsz cc241b68b6 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 05ace94510 CCSC三个表页面CRUD 1 year ago
王杰 9b0e4b99c3 mes 1 year ago
LML丶 9a8ca50f5e 增加查询条件 1 year ago
LML丶 e55a9c4f3e 增加查询条件 1 year ago
gsz a38dcfbcb5 开关班管理开发 1 year ago
gsz a1a59e6c7e QMS同步MES_CCSC任务检测结果 1 year ago
王杰 67f1953f20 mes 1 year ago
LML丶 50fa5f470c 增加查询条件 1 year ago
LML丶 37dbbb982f 增加查询条件 1 year ago
LML丶 a187118703 增加查询条件 1 year ago
LML丶 be5d161874 增加查询条件 1 year ago
LML丶 0a97500eac 增加查询条件 1 year ago
LML丶 19e407cae3 修改接口 1 year ago
LML丶 d2da4e449d 修改接口 1 year ago
LML丶 e052858c6b 修改接口 1 year ago
LML丶 12aa742fe0 修改接口 1 year ago
LML丶 8855a848bd 修改表字段 1 year ago
LML丶 df7436e81c 修改表字段 1 year ago
LML丶 ea7037e44a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 0db692de60 修改表字段 1 year ago
微笑着面对明天 3c9608ab18 基础主数据bug 1 year ago
LML丶 bd7a1e6249 修改表字段 1 year ago
gsz e150f8a1d2 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 796c7fafa2 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 
 Conflicts:
	modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java
 1 year ago
LML丶 fa7a952dd6 修改表字段 1 year ago
gsz 71873fb9e5 QMSCCSC检测任务 1 year ago
LML丶 7c7361e7a6 修改表字段 1 year ago
LML丶 0c74686e3b 修改表字段 1 year ago
LML丶 f1cf01c8e1 修改表字段 1 year ago
LML丶 4e5859f042 修改表字段 1 year ago
LML丶 0456566231 修改表字段 1 year ago
LML丶 d1882b87db 修改表字段 1 year ago
LML丶 904f990ba2 修改表字段 1 year ago
LML丶 f1b536be1b 修改表字段 1 year ago
LML丶 e6b22b541d 修改表字段 1 year ago
LML丶 6a80a9b059 修改表字段 1 year ago
LML丶 ecbbecd0a2 修改表字段 1 year ago
LML丶 27479d8c0e 修改表字段 1 year ago
LML丶 cfe42bf2d4 修改表字段 1 year ago
LML丶 5c153d8f2d 修改表字段 1 year ago
LML丶 bab0ecc946 修改表字段 1 year ago
LML丶 9c1817b543 修改表字段 1 year ago
LML丶 54f78e5aa9 修改表字段 1 year ago
LML丶 7e1b7464b4 修改表字段 1 year ago
LML丶 e16d225610 修改表字段 1 year ago
LML丶 0eac845a45 修改表字段 1 year ago
LML丶 b467cec302 修改表字段 1 year ago
LML丶 3eae48e188 修改表字段 1 year ago
LML丶 b08431ccae 修改表字段 1 year ago
LML丶 e1645c99d3 修改表字段 1 year ago
LML丶 9a76f2d9bc 修改表字段 1 year ago
gsz 91fd5c4d91 模具映射关系维护 1 year ago
微笑着面对明天 cfc3af073f Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
微笑着面对明天 3a5ee5a221 基础主数据bug 1 year ago
微笑着面对明天 37b7acf15c 基础主数据bug 1 year ago
gsz 39db1c5201 Maximo 增加描述 1 year ago
LML丶 f32c1dcb03 修改表字段 1 year ago
LML丶 dfcf5c0308 修改表字段 1 year ago
LML丶 8704b44eb6 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 f361dd372a 修改表字段 1 year ago
gsz b0ac2d9e93 枚举明细bug修改 1 year ago
gsz 5374272ddd bug修改 1 year ago
微笑着面对明天 90dd8bf7db Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
微笑着面对明天 b73a32f25d 基础主数据bug 1 year ago
jun 838aeed985 演示功能修复 1 year ago
gsz 306ddf5fe7 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 27ce83c06c Mes枚举主表&枚举明细配置 1 year ago
LML丶 86c7299106 修改表字段 1 year ago
jun e89d97f765 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 336431f6e5 字段变更 1 year ago
微笑着面对明天 e3e392b5ea 基础主数据bug 1 year ago
微笑着面对明天 079da0588c 基础主数据bug 1 year ago
LML丶 023b707814 修改表字段 1 year ago
微笑着面对明天 e2c6822345 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
微笑着面对明天 2d8687ef67 基础主数据bug 1 year ago
LML丶 c1ecacac9e 修改表字段 1 year ago
LML丶 5668c64322 修改表字段 1 year ago
LML丶 471b386ec0 修改表字段 1 year ago
LML丶 7088d5b456 修改表字段 1 year ago
LML丶 2c9fa1b8a9 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 1db487a26b 修改表字段 1 year ago
jun 788eb76c98 SAP生产计划代码逻辑变更 1 year ago
jun b1735050d3 SAP生产计划代码错误 1 year ago
LML丶 64e17bba45 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 d3693836ca 修改表字段 1 year ago
jun f62bd6c249 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 799013d0b5 SAP生产计划代码错误 1 year ago
LML丶 27890b20a7 修改表字段 1 year ago
LML丶 ebdea2938b 修改表字段 1 year ago
LML丶 f19f674d64 修改表字段 1 year ago
jun 72b41b32b1 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 630bf2dd61 SAP生产计划逻辑调整 1 year ago
gsz a881b3ec49 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz f7bcdab3d7 Mes-Maximo仪表主数据&模具映射关系维护 1 year ago
LML丶 550f3eb930 发运逻修改 1 year ago
LML丶 c5ddfe0c9f 发运逻修改 1 year ago
LML丶 ec6cfd5905 发运逻修改 1 year ago
LML丶 df880ec4e3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 b628c49ec1 编译错误 注释 1 year ago
微笑着面对明天 a70747d259 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
微笑着面对明天 71a2d40140 基础主数据bug 1 year ago
jun d583285fea 配置文件提交 1 year ago
微笑着面对明天 cc11385979 基础主数据bug 1 year ago
王杰 55cf372318 yfai 数据源 1 year ago
LML丶 09e1914ead 编译错误 注释 1 year ago
LML丶 049d43a18e Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 e8938ce8e6 编译错误 注释 1 year ago
王杰 9857eee02d mes ext 1 year ago
微笑着面对明天 afeb428774 基础主数据bug 1 year ago
LML丶 f2cb92d67a 编译错误 注释 1 year ago
LML丶 9af55a792a 编译错误 注释 1 year ago
LML丶 321f27d30f 编译错误 注释 1 year ago
微笑着面对明天 16b927606a 基础主数据bug 1 year ago
微笑着面对明天 274297a51a 基础主数据bug 1 year ago
微笑着面对明天 dce3e8e0ab 基础主数据bug 1 year ago
LML丶 f11181dfb5 编译错误 注释 1 year ago
LML丶 1774946880 编译错误 注释 1 year ago
LML丶 b3b7ddeabe 增加字段 1 year ago
LML丶 5811900705 工位与Bin位关系维护 1 year ago
LML丶 55b6217a9a 工位与Bin位关系维护 1 year ago
LML丶 f48ba3af54 工位与Bin位关系维护 1 year ago
微笑着面对明天 29c7d167cf 基础主数据bug 1 year ago
微笑着面对明天 504f642bcb Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
微笑着面对明天 502f97bb22 基础主数据bug 1 year ago
LML丶 03227dd376 工位与Bin位关系维护 1 year ago
LML丶 2cd16dd40e Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinCfgController.java
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java
 1 year ago
LML丶 2b01910d78 工位与Bin位关系维护 1 year ago
微笑着面对明天 a8f28c5cbe 基础主数据bug 1 year ago
LML丶 e06f85e3c0 主页面输入查询条件后未按查询条件查询 1 year ago
jun 573ed6b5f8 SAP生产计划字段调整 1 year ago
jun 5c96e95600 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 4c79252fba 生产汇报bug修复 1 year ago
LML丶 5cc5637aea 主页面输入查询条件后未按查询条件查询 1 year ago
LML丶 4f5e0bc133 主页面输入查询条件后未按查询条件查询 1 year ago
jun 128f48e7f2 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesWorkOrderBtoExcelServiceImpl.java
 1 year ago
jun 488a29951b 报工生产汇报修改 1 year ago
LML丶 1231b2c1c9 主页面输入查询条件后未按查询条件查询 1 year ago
LML丶 f91e0f5ea6 增加 班组信息 班组生产线对应关系维护 1 year ago
LML丶 2cbac10698 增加 班组信息 班组生产线对应关系维护 1 year ago
LML丶 b753707e29 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 48879c64fa 零件名称需模糊查询 1 year ago
gsz 97ccfbd6cb Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz a32c922f12 Mes设备停机原因+设备停机类型 1 year ago
LML丶 c63a0607c8 零件名称需模糊查询 1 year ago
LML丶 bd98d58a8a 零件名称需模糊查询 1 year ago
LML丶 a5467131f3 唯一性校验：客户零件号+零件号+客户代码 1 year ago
LML丶 270b4941ea 新增时，需判定唯一，唯一条件，区域+产线+班次代码 1 year ago
LML丶 da8a39da4a 班次名称 查询条件未生效 1 year ago
LML丶 e3a4e7734c 修枚枚举路径 1 year ago
LML丶 e8bb24f6ea 点检 1 year ago
LML丶 64313ac6ca Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 b71ac558e9 点检 1 year ago
jun 73933cbf74 40858 MES:创建工单：添加校验-选择生产线对应工作中心与物料版本中该物料对应工作中心是否一致 1 year ago
jun 0ecf86c5af 40855 MES-PC：生产工单添加查询条件-创建人 1 year ago
jun bf3f6ecc89 40794 产品工艺路线-新增报错 1 year ago
gsz 6c3c50a7b0 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 29e52d9524 Mes设备停机原因+设备停机类型 1 year ago
LML丶 2f02ede5e8 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 0d187a5036 点检 1 year ago
jun 3d5058f5ad BTO工单日期 1 year ago
jun bc3f075d42 字段修改 1 year ago
gsz ea8eaa0969 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 9599dc038b MesMaximo查询仪表主数据+设备主数据接口 1 year ago
LML丶 73c0c71adb Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 9e6fc4fb05 点检 1 year ago
jun 3bcb6f6223 问题修复 1 year ago
jun e602b1a136 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 36e4f7d825 工单页面调整 1 year ago
LML丶 3386c6bbd7 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 b33d2adaca 点检 1 year ago
微笑着面对明天 a5549c343b 基础主数据 1 year ago
LML丶 4f8d2b7c04 点检 1 year ago
LML丶 459c46b3a6 点检 1 year ago
LML丶 d14e573673 点检 1 year ago
LML丶 1226a69a81 点检 1 year ago
LML丶 e47e4d5728 点检 1 year ago
LML丶 fc80bdfbe5 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 3f494d81df 点检 1 year ago
jun dafda27e66 枚举位置修改 1 year ago
jun 40d925a5c0 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
#	modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java
 1 year ago
jun 7384626734 枚举位置移动 1 year ago
LML丶 78fbf4fd80 修改描述 1 year ago
LML丶 c79be357c2 修改描述 1 year ago
LML丶 9a48a78c4d 修改描述 1 year ago
LML丶 57b532da86 修改描述 1 year ago
LML丶 d33ace46fb 修改描述 1 year ago
LML丶 30c2122c15 修改描述 1 year ago
LML丶 aa1ba2b717 修改描述 1 year ago
jun ce50fccc87 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun b2b72e8c7d 工单导入 1 year ago
gsz 9b2531eb1c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 32655d74de 给maximo提供新增仪表主数据+设备主数据接口 1 year ago
jun e24580595d 报工数量卡控 1 year ago
jun b44cf508dc Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun fdb1ff8d82 40757 MES-PC：物料信息：新增字段【物料类型】与WMS物料类型枚举一致，新增编辑正常下拉选择 1 year ago
gsz 6463468513 maximo仪表主数据+设备主数据接口 1 year ago
jun 320c620333 设备加工参数维护 1 year ago
jun ddde8d27ab Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 326d7ffb2f 腔组维护增加名称 1 year ago
LML丶 c3ed51b7a1 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 5f36c07720 修改描述 1 year ago
jun b1d4bbd23c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 960e478536 模具腔组主数据(3个页面) 1 year ago
gsz d1eaebe991 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 9bf9dac36e MES装车组+装车组详情 1 year ago
LML丶 7ff8a229bd 修改描述 1 year ago
jun 2c1917ac02 工艺路线明细逻辑修改 1 year ago
LML丶 5e6264b0cc 修改描述 1 year ago
LML丶 b543a5deb5 修改描述 1 year ago
LML丶 d13ef03421 修改描述 1 year ago
LML丶 f67f60584a 修改描述 1 year ago
LML丶 eafdd794ac Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 b8fd0e9419 修改描述 1 year ago
gsz f1057cdb70 MES产品工艺路线修改 1 year ago
jun 7e53c893cf 类名修改 1 year ago
jun 0fa2418933 工艺路线开发 1 year ago
gsz 3333977b93 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz b8a152e47f MES产品工艺路线新增生产区域代码areaCode 1 year ago
LML丶 e48469618d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 f7d32ba83b 修改描述 1 year ago
gsz e2ff38d219 MES产品工艺路线开发 1 year ago
LML丶 c04c83b504 修改描述 1 year ago
jun 6aa74526fb 工艺路线开发 1 year ago
LML丶 b07a18b86f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 7dd6ca6ea9 修改描述 1 year ago
jun 58f4c91e5a 生产版本优化 1 year ago
LML丶 10a62322d2 修改描述 1 year ago
LML丶 76da2658f2 修改描述 1 year ago
jun a58ef48f16 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 9767bd5af5 发送sap生产计划逻辑变更 1 year ago
LML丶 dfb72bbd0c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 bf84728bc2 修改字段 1 year ago
jun 5fc061f2f9 字段修改 1 year ago
jun c714570d0d 工艺，工艺工序关系基础信息维护 1 year ago
LML丶 4d12985007 修改字段 1 year ago
LML丶 78f1e743b8 修改字段 1 year ago
LML丶 036aae4b79 修改字段 1 year ago
LML丶 0507e31ae1 修改字段 1 year ago
LML丶 0dd67a5ef9 修改字段 1 year ago
LML丶 3217407694 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 c6eb3bac25 修改字段 1 year ago
jun e2fc0df9f3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 9b92111034 更新工单完成数量 1 year ago
LML丶 832b04842c 修改字段 1 year ago