Commit Graph

804 Commits (f4f581d23728f44c3e687ef0bed25fa51fb73f99)

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