Commit Graph

600 Commits (6bd043ff5d8af20f4bac21f0461282515b635c55)

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