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

1088 Commits (010663944e67062de43ee5de5560d71177e0f8f6)

Author SHA1 Message Date
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
gsz b3c185eab8 华为云OBS接口修改 11 months ago
gsz 4309761919 41255 非排序加工规则-新增&编辑-汇报方法字段 11 months ago
gsz 3055568c36 华为云OBS服务接入 11 months ago
administrator d2a71caa3c Merge remote-tracking branch 'origin/dev' into dev 11 months ago
gsz 6b99baa3c7 41232 MES-PC：车系页面问题汇总 11 months ago
gsz 572503cace 41238 物料bom页面条数没有显示 11 months ago
administrator d6189f43ab 恢复注释掉的 ProduceSeq 11 months ago
administrator 2263ba7836 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
gsz 41cd3c45b6 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 11 months ago
gsz 2ba89b2cdf 41238 物料bom页面条数没有显示 11 months ago
王杰 14d23ee8d3 工单状态 加工 11 months ago
gsz eb0af4bad3 解决bug 41235 41231 41223 41225 41226 41232 41234 11 months ago
administrator cb82726adf Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 3bda4b3a06 武汉报工逻辑调整 11 months ago
jun 5680b47cb4 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 0fa4ff86be 逻辑修改 11 months ago
gsz eb3de12f5e 装车单详情新增发运组查询 11 months ago
jun 7f89951056 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 9161c1b4d5 报工功能演示修改 11 months ago
gsz 19a71a99ec 点检单设备查询无效 11 months ago
jun b82af4a2f0 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun b354c07e5b 武汉报工功能开发 11 months ago
gsz c28fbbb20e bug修改 11 months ago
gsz 2685dd0e84 MesPartSap修改字段数据来源 零件状态 11 months ago
administrator 7cf5aa1f25 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
gsz d546070fcd 客户车型转换配置明细 11 months ago
administrator ad12de4d28 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
gsz e9bab83882 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 11 months ago
gsz 1d8b426667 媒体文件维护 11 months ago
administrator c651fa000b 暂时注释掉 ProduceSeq 11 months ago
administrator 8dc060da00 BTO修改 及 增加job配置,及job日志显示 11 months ago
gsz cee870bf8c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 11 months ago
gsz 9d06f117f9 组织模型新增设备过滤已绑定工位 11 months ago
administrator d8f32bc5a9 更新字段 11 months ago
administrator b52d8c4c33 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
gsz b32a1b1160 组织模型新增设备过滤已绑定工位 11 months ago
gsz 90cc18b191 责任人区域关系修改 11 months ago
gsz 544247bae8 责任人区域关系 11 months ago
administrator 9338f4870a bto-job第一个版本完成，按时圆整 11 months ago
gsz f62c90d3ff 生产工单produceSeq类型改变报错 11 months ago
gsz 19859d11c9 所有页面零件信息查询支持模糊匹配 11 months ago
gsz 68af7786cf 客户零件转化配置字段修改 11 months ago
jun c6778d3b56 包装定义维护功能开发 11 months ago
jun 73b97cc3b0 物料信息主数据修改 11 months ago
LML丶 3efad1a43c BOM树 11 months ago
LML丶 ad5889f96e Merge remote-tracking branch 'origin/dev' into dev 11 months ago
LML丶 b214ed3bad BOM树 11 months ago
gsz 149855d02b Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 11 months ago
gsz f8e40a535d 根据产线和班组查单个开关班记录接口 11 months ago
jun 121ced9b8e 主数据bug修复 11 months ago
LML丶 22680d10ab Merge remote-tracking branch 'origin/dev' into dev 11 months ago
LML丶 7d749607a6 修改装车单明细 11 months ago
jun 195c7bf5c0 功能演示：主数据bug修复 12 months ago
jun a88744c157 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun dce484125c 主数据bug修复 12 months ago
LML丶 804f0b847a 修改装车单明细 12 months ago
gsz f7bb788ec0 MesCustomerPart修改pojo字段 12 months ago
gsz 3e2994bedb Mes PDM表对照修改字段 12 months ago
LML丶 9ea589d9b3 修改装车单明细 12 months ago
LML丶 5a634f7ba1 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun e142961a0f Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 3762d71ed4 修改装车单明细 12 months ago
jun 6790a6e1da 主数据bug修复 12 months ago
gsz ca5426b7ec Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz 93450bccbf Mes PDM-config下面的表对照 12 months ago
jun 20f9e853cf 主数据bug修复 12 months ago
微笑着面对明天 66a8669203 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 c4e6e97320 基础主数据bug 12 months ago
LML丶 6eb056acd6 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 167389c275 修改装车单明细 12 months ago
jun 73f566ee10 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun b133ed57b6 演示问题清单0521 12 months ago
微笑着面对明天 035c67e571 基础主数据bug 12 months ago
LML丶 ab291c8c77 修改装车单明细 12 months ago
LML丶 8fefd3dbac Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 5506f9611d 修改装车单明细 12 months ago
王杰 d654ac93f5 mes 12 months ago
jun 15de434e68 41053 MES：生产工单问题汇总 12 months ago
jun 68a2f24362 班次查询有效期内的班次 12 months ago
LML丶 f1f7e0cd29 修改装车单明细 12 months ago
LML丶 f8fc179046 修改装车单明细 12 months ago
LML丶 9e812fdd51 修改装车单明细 12 months ago
LML丶 e997e6110b Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 3e4b2a5172 修改装车单明细 12 months ago
微笑着面对明天 971c719065 基础主数据bug 12 months ago
LML丶 64b565fc86 修改装车单明细 12 months ago
LML丶 ad5974f98a 发布 12 months ago
gsz 1967d69a05 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz c442e79998 根据设备停机超时时间新增设备停机记录JOB 12 months ago
jun 7e0b83ac8f Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 88668667ec 工单页面排序调整 12 months ago
gsz 3f2441aea8 查询工位停机类型和原因 12 months ago
gsz a10c96d993 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz aaf43a36b8 设备生产停机记录 12 months ago
微笑着面对明天 de9d52a455 基础主数据bug 12 months ago
gsz 0d9f80c19f CCSC接口映射下发检验结果bug修改 12 months ago
gsz 8e122920ad CCSC首尾件和随机件bug修改 12 months ago
gsz cc241b68b6 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz 05ace94510 CCSC三个表页面CRUD 12 months ago
王杰 9b0e4b99c3 mes 12 months ago
LML丶 9a8ca50f5e 增加查询条件 12 months ago
LML丶 e55a9c4f3e 增加查询条件 12 months ago
gsz a38dcfbcb5 开关班管理开发 12 months ago
gsz a1a59e6c7e QMS同步MES_CCSC任务检测结果 12 months ago
王杰 67f1953f20 mes 12 months ago
LML丶 50fa5f470c 增加查询条件 12 months ago
LML丶 37dbbb982f 增加查询条件 12 months ago
LML丶 a187118703 增加查询条件 12 months ago
LML丶 be5d161874 增加查询条件 12 months ago
LML丶 0a97500eac 增加查询条件 12 months ago
LML丶 19e407cae3 修改接口 12 months ago
LML丶 d2da4e449d 修改接口 12 months ago
LML丶 e052858c6b 修改接口 12 months ago
LML丶 12aa742fe0 修改接口 12 months ago
LML丶 8855a848bd 修改表字段 12 months ago
LML丶 df7436e81c 修改表字段 12 months ago
LML丶 ea7037e44a Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 0db692de60 修改表字段 12 months ago
微笑着面对明天 3c9608ab18 基础主数据bug 12 months ago
LML丶 bd7a1e6249 修改表字段 12 months ago
gsz e150f8a1d2 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months 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
 12 months ago
LML丶 fa7a952dd6 修改表字段 12 months ago
gsz 71873fb9e5 QMSCCSC检测任务 12 months ago
LML丶 7c7361e7a6 修改表字段 12 months ago
LML丶 0c74686e3b 修改表字段 12 months ago
LML丶 f1cf01c8e1 修改表字段 12 months ago
LML丶 4e5859f042 修改表字段 12 months ago
LML丶 0456566231 修改表字段 12 months ago
LML丶 d1882b87db 修改表字段 12 months ago
LML丶 904f990ba2 修改表字段 12 months ago
LML丶 f1b536be1b 修改表字段 12 months ago
LML丶 e6b22b541d 修改表字段 12 months ago
LML丶 6a80a9b059 修改表字段 12 months ago
LML丶 ecbbecd0a2 修改表字段 12 months ago
LML丶 27479d8c0e 修改表字段 12 months ago
LML丶 cfe42bf2d4 修改表字段 12 months ago
LML丶 5c153d8f2d 修改表字段 12 months ago
LML丶 bab0ecc946 修改表字段 12 months ago
LML丶 9c1817b543 修改表字段 12 months ago
LML丶 54f78e5aa9 修改表字段 12 months ago
LML丶 7e1b7464b4 修改表字段 12 months ago
LML丶 e16d225610 修改表字段 12 months ago
LML丶 0eac845a45 修改表字段 12 months ago
LML丶 b467cec302 修改表字段 12 months ago
LML丶 3eae48e188 修改表字段 12 months ago
LML丶 b08431ccae 修改表字段 12 months ago
LML丶 e1645c99d3 修改表字段 12 months ago
LML丶 9a76f2d9bc 修改表字段 12 months ago
gsz 91fd5c4d91 模具映射关系维护 12 months ago
微笑着面对明天 cfc3af073f Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 3a5ee5a221 基础主数据bug 12 months ago
微笑着面对明天 37b7acf15c 基础主数据bug 12 months ago
gsz 39db1c5201 Maximo 增加描述 12 months ago
LML丶 f32c1dcb03 修改表字段 12 months ago
LML丶 dfcf5c0308 修改表字段 12 months ago
LML丶 8704b44eb6 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 f361dd372a 修改表字段 12 months ago
gsz b0ac2d9e93 枚举明细bug修改 12 months ago
gsz 5374272ddd bug修改 12 months ago
微笑着面对明天 90dd8bf7db Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 b73a32f25d 基础主数据bug 12 months ago
jun 838aeed985 演示功能修复 12 months ago
gsz 306ddf5fe7 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz 27ce83c06c Mes枚举主表&枚举明细配置 12 months ago
LML丶 86c7299106 修改表字段 12 months ago
jun e89d97f765 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 336431f6e5 字段变更 12 months ago
微笑着面对明天 e3e392b5ea 基础主数据bug 12 months ago
微笑着面对明天 079da0588c 基础主数据bug 12 months ago
LML丶 023b707814 修改表字段 12 months ago
微笑着面对明天 e2c6822345 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 2d8687ef67 基础主数据bug 12 months ago
LML丶 c1ecacac9e 修改表字段 12 months ago
LML丶 5668c64322 修改表字段 12 months ago
LML丶 471b386ec0 修改表字段 12 months ago
LML丶 7088d5b456 修改表字段 12 months ago
LML丶 2c9fa1b8a9 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 1db487a26b 修改表字段 12 months ago
jun 788eb76c98 SAP生产计划代码逻辑变更 12 months ago
jun b1735050d3 SAP生产计划代码错误 12 months ago
LML丶 64e17bba45 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 d3693836ca 修改表字段 12 months ago
jun f62bd6c249 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 799013d0b5 SAP生产计划代码错误 12 months ago
LML丶 27890b20a7 修改表字段 12 months ago
LML丶 ebdea2938b 修改表字段 12 months ago
LML丶 f19f674d64 修改表字段 12 months ago
jun 72b41b32b1 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 630bf2dd61 SAP生产计划逻辑调整 12 months ago
gsz a881b3ec49 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz f7bcdab3d7 Mes-Maximo仪表主数据&模具映射关系维护 12 months ago
LML丶 550f3eb930 发运逻修改 12 months ago
LML丶 c5ddfe0c9f 发运逻修改 12 months ago
LML丶 ec6cfd5905 发运逻修改 12 months ago
LML丶 df880ec4e3 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 b628c49ec1 编译错误 注释 12 months ago
微笑着面对明天 a70747d259 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 71a2d40140 基础主数据bug 12 months ago
jun d583285fea 配置文件提交 12 months ago
微笑着面对明天 cc11385979 基础主数据bug 12 months ago
王杰 55cf372318 yfai 数据源 12 months ago
LML丶 09e1914ead 编译错误 注释 12 months ago
LML丶 049d43a18e Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 e8938ce8e6 编译错误 注释 12 months ago
王杰 9857eee02d mes ext 12 months ago
微笑着面对明天 afeb428774 基础主数据bug 12 months ago
LML丶 f2cb92d67a 编译错误 注释 12 months ago
LML丶 9af55a792a 编译错误 注释 12 months ago
LML丶 321f27d30f 编译错误 注释 12 months ago
微笑着面对明天 16b927606a 基础主数据bug 12 months ago
微笑着面对明天 274297a51a 基础主数据bug 12 months ago
微笑着面对明天 dce3e8e0ab 基础主数据bug 12 months ago
LML丶 f11181dfb5 编译错误 注释 12 months ago
LML丶 1774946880 编译错误 注释 12 months ago
LML丶 b3b7ddeabe 增加字段 12 months ago
LML丶 5811900705 工位与Bin位关系维护 12 months ago
LML丶 55b6217a9a 工位与Bin位关系维护 12 months ago
LML丶 f48ba3af54 工位与Bin位关系维护 12 months ago
微笑着面对明天 29c7d167cf 基础主数据bug 12 months ago
微笑着面对明天 504f642bcb Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 502f97bb22 基础主数据bug 12 months ago
LML丶 03227dd376 工位与Bin位关系维护 12 months 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
 12 months ago
LML丶 2b01910d78 工位与Bin位关系维护 12 months ago
微笑着面对明天 a8f28c5cbe 基础主数据bug 12 months ago
LML丶 e06f85e3c0 主页面输入查询条件后未按查询条件查询 12 months ago
jun 573ed6b5f8 SAP生产计划字段调整 12 months ago
jun 5c96e95600 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 4c79252fba 生产汇报bug修复 12 months ago
LML丶 5cc5637aea 主页面输入查询条件后未按查询条件查询 12 months ago
LML丶 4f5e0bc133 主页面输入查询条件后未按查询条件查询 12 months 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
 12 months ago
jun 488a29951b 报工生产汇报修改 12 months ago
LML丶 1231b2c1c9 主页面输入查询条件后未按查询条件查询 12 months ago
LML丶 f91e0f5ea6 增加 班组信息 班组生产线对应关系维护 12 months ago
LML丶 2cbac10698 增加 班组信息 班组生产线对应关系维护 12 months ago
LML丶 b753707e29 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 48879c64fa 零件名称需模糊查询 12 months ago
gsz 97ccfbd6cb Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz a32c922f12 Mes设备停机原因+设备停机类型 12 months ago
LML丶 c63a0607c8 零件名称需模糊查询 12 months ago
LML丶 bd98d58a8a 零件名称需模糊查询 12 months ago
LML丶 a5467131f3 唯一性校验：客户零件号+零件号+客户代码 12 months ago
LML丶 270b4941ea 新增时，需判定唯一，唯一条件，区域+产线+班次代码 12 months ago
LML丶 da8a39da4a 班次名称 查询条件未生效 12 months ago
LML丶 e3a4e7734c 修枚枚举路径 12 months ago
LML丶 e8bb24f6ea 点检 12 months ago
LML丶 64313ac6ca Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 b71ac558e9 点检 12 months ago
jun 73933cbf74 40858 MES:创建工单：添加校验-选择生产线对应工作中心与物料版本中该物料对应工作中心是否一致 12 months ago
jun 0ecf86c5af 40855 MES-PC：生产工单添加查询条件-创建人 12 months ago
jun bf3f6ecc89 40794 产品工艺路线-新增报错 12 months ago
gsz 6c3c50a7b0 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz 29e52d9524 Mes设备停机原因+设备停机类型 12 months ago
LML丶 2f02ede5e8 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 0d187a5036 点检 12 months ago
jun 3d5058f5ad BTO工单日期 12 months ago
jun bc3f075d42 字段修改 12 months ago
gsz ea8eaa0969 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz 9599dc038b MesMaximo查询仪表主数据+设备主数据接口 12 months ago
LML丶 73c0c71adb Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 9e6fc4fb05 点检 12 months ago
jun 3bcb6f6223 问题修复 12 months ago
jun e602b1a136 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 36e4f7d825 工单页面调整 12 months ago
LML丶 3386c6bbd7 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 b33d2adaca 点检 12 months ago
微笑着面对明天 a5549c343b 基础主数据 12 months ago
LML丶 4f8d2b7c04 点检 12 months ago
LML丶 459c46b3a6 点检 12 months ago
LML丶 d14e573673 点检 12 months ago
LML丶 1226a69a81 点检 12 months ago
LML丶 e47e4d5728 点检 12 months ago
LML丶 fc80bdfbe5 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 3f494d81df 点检 12 months ago
jun dafda27e66 枚举位置修改 12 months 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
 12 months ago
jun 7384626734 枚举位置移动 12 months ago
LML丶 78fbf4fd80 修改描述 12 months ago
LML丶 c79be357c2 修改描述 12 months 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
LML丶 242b5a4f6d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 768487f28f 零件发运组-圆整方式 枚举修改 1 year ago
jun 76f35628d3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun ac5a142300 生产汇报开发 1 year ago
gsz b8a7f4e2a6 2024-05-10 新增SAP2MES & MES2SAP 接口映射 1 year ago
jun c326833687 生产工单开发 1 year ago
jun 61a3944368 暂时修改为单数据源 1 year ago
LML丶 b22ccc606f 零件发运组-圆整方式 枚举修改 1 year ago
LML丶 28ad2676de 零件发运组-圆整方式 枚举修改 1 year ago
LML丶 bcd9ed9f2f 零件发运组-圆整方式 枚举修改 1 year ago
LML丶 88565ac8a3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 f092f6f434 零件发运组-圆整方式 枚举修改 1 year ago
jun 566bb1d67d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 24e2a087f9 40564 客户零件转换配置-明细-两条数据的明细数据一样，新增一条明细，两个数据都有 1 year ago
LML丶 c9ca2e0d34 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 18a620dd04 零件发运组-圆整方式 枚举修改 1 year ago
jun 387ef0be2f BUG修复 1 year ago
LML丶 c77ddb256b 新增 发运单 装车单 配置为空 1 year ago
LML丶 208a070319 增加枚举 1 year ago
LML丶 8ad6fbaa81 增加枚举 1 year ago
LML丶 3451fc5714 增加枚举 1 year ago
LML丶 a439883fdf 发运组 发运组代码唯一校验 1 year ago
LML丶 3d328898fe 发运组 发运组代码唯一校验 1 year ago
LML丶 a90b5cc23a 发运组 发运组代码唯一校验 1 year ago
LML丶 0802634dae 装车单 新增 增加状态 
明细 增加单号
 1 year ago
LML丶 beb84ec246 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 d3cc6b9c2c 装车单 新增 增加状态 
明细 增加单号
 1 year ago
jun c137e15e0a 40574 客户工厂-信息点维护-信息点校验 1 year ago
jun bf1fdbe013 40463 客户信息和客户工厂-在客户零件转换配置中维护后，还能继续删除 1 year ago
jun ef07171dc3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 5c125bb4d5 SAP生产计划 1 year ago
LML丶 4433b6dc66 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 56f2b20056 新增bean repository 1 year ago
jun e54eb1e58e 界面配置(新增) 1 year ago
jun 3b6dabc2c8 40512 客户车型配置-3个不同的车型，明细一样，新添加车型后依然有前车型的明细 1 year ago
zhang.xw f43e7c6462 基础主数据bug 1 year ago
LML丶 aef501cba1 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java
 1 year ago
LML丶 429d608f85 新增bean repository 1 year ago
zhang.xw 3e84587e53 基础主数据bug 1 year ago
zhang.xw bb727380ac 基础主数据bug 1 year ago
LML丶 78e691fcb7 新增bean repository 1 year ago
LML丶 9db8f63631 新增bean repository 1 year ago
LML丶 de1cbf2274 新增bean repository 1 year ago
LML丶 2688a7f23c 新增bean repository 1 year ago
LML丶 4a8cd12b2e 新增bean repository 1 year ago
LML丶 a5bb08ab22 新增bean repository 1 year ago
LML丶 849318174c 新增bean repository 1 year ago
LML丶 cf5014c08f 新增bean repository 1 year ago
LML丶 f548861191 新增bean repository 1 year ago
LML丶 67fc7ebffc 新增bean repository 1 year ago
LML丶 1046242ed7 新增bean repository 1 year ago
LML丶 00810b8eff 增加查询条件 1 year ago
LML丶 a2fe7a57ed 增加查询条件 1 year ago
LML丶 afa9baef86 增加查询条件 1 year ago
LML丶 4df13450e1 增加查询条件 1 year ago
LML丶 0b8b5d0b73 增加查询条件 1 year ago
LML丶 d4471fc18f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java
 1 year ago
LML丶 d902071563 增加查询条件 1 year ago
zhang.xw dd2400800f 基础主数据开 1 year ago
LML丶 5578becfaa 增加查询条件 1 year ago
LML丶 98751db0e5 增加查询条件 1 year ago
LML丶 0974adbd05 增加查询条件 1 year ago
LML丶 5580f8f061 增加查询条件 1 year ago
LML丶 ba5d81e6e3 增加查询条件 1 year ago
LML丶 10183607e2 增加查询条件 1 year ago
LML丶 e2ce692320 增加查询条件 1 year ago
LML丶 aae21468f5 新增 枚举 1 year ago
LML丶 330f9aed05 新增 枚举 1 year ago
LML丶 5b820c8715 新增 枚举 1 year ago
LML丶 a680d658ef 新增 枚举 1 year ago
zhang.xw 79502bd1d3 基础主数据开 1 year ago
zhang.xw c95b3f265f 基础主数据开 1 year ago
LML丶 3059216f3c 新增 枚举 1 year ago
LML丶 eccb916cf7 新增 枚举 1 year ago
LML丶 01ab141291 新增 主数据bean 1 year ago
LML丶 ace93ba407 新增 主数据bean 1 year ago
LML丶 0250ea0677 新增 主数据bean 1 year ago
LML丶 d73c00a60b 新增 主数据bean 1 year ago
LML丶 c5505d85df 新增 主数据bean 1 year ago
zhang.xw 327e7f4f45 基础主数据开 1 year ago
LML丶 b5f42242b1 新增 主数据bean 1 year ago
LML丶 d308d3af07 新增 主数据bean 1 year ago
LML丶 9a4019b6a1 新增 主数据bean 1 year ago
LML丶 f88bc410e9 新增 主数据bean 1 year ago
LML丶 ef16e5c976 新增 主数据bean 1 year ago
LML丶 ef2d210a23 新增 主数据bean 1 year ago
LML丶 373e52aee4 新增 主数据bean 1 year ago
LML丶 b6f7c429fa 新增 主数据bean 1 year ago
LML丶 e75dfab77d 新增 主数据bean 1 year ago
LML丶 7a138400aa 新增 主数据bean 1 year ago
LML丶 1ccead6a0b 新增 主数据bean 1 year ago
LML丶 a790e6458a 新增 主数据bean 1 year ago
LML丶 99e32ba442 新增 主数据bean 1 year ago
LML丶 62d7057b22 新增 主数据bean 1 year ago
LML丶 adffc95ab4 新增 主数据bean 1 year ago
LML丶 525f478a01 新增 主数据bean 1 year ago
zhang.xw e9c2f6aded 基础主数据开 1 year ago
zhang.xw a6bb46a1cf webservice 支持 1 year ago
zhang.xw f73f5e4b11 基础属性新增 1 year ago
王杰 aa619aa98c init mes 1 year ago
王杰 fb15aba831 init mes 1 year ago
王杰 71be9b94d0 init mes 1 year ago
王杰 82c8f44764 init mes 1 year ago
王杰 a3be096ba4 init mes 1 year ago
王杰 24f100afcc 删除 'modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/.DS_Store' 1 year ago
王杰 bcf204a678 删除 'modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/.DS_Store' 1 year ago
王杰 e35a2c17d9 init mes 1 year ago
王杰 f1712a8ee1 init mes 1 year ago
王杰 f95997b5fe init mes 1 year ago
王杰 d252625a61 init mes 1 year ago
王杰 2c7464799a 删除 'modules/.DS_Store' 1 year ago
王杰 d5d08a37bf init mes 1 year ago
puxiao 69ccbf067f Finish Task#6320 23032-部品报缺报表 PCR-20240322 1 year ago
puxiao e73c7a4102 Finish Task#6320 23032-部品报缺报表 PCR-20240322 1 year ago
yxw 06bb19a415 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
yxw dc188542fe 新建工单调WMS生成工单BOM 1 year ago
王杰 0e48ea437c jx mes 节拍报表 1 year ago
王杰 6c5f9e5300 jx mes 节拍报表 bug 1 year ago
王杰 da8539a0a7 嘉兴 mes 工单接口调整 节拍报表全工位接口调整 1 year ago
王杰 4124b2dfd8 修理票报表 1 year ago
yxw 3801d1436c 产线看板小时计划产量逻辑更改 1 year ago
yxw 96dca4e820 工单下达校验当前工单是否存在工单BOM 1 year ago
王杰 40084c90be 嘉兴 mes 节拍客制化报表 1 year ago
王杰 09f7451661 节拍 变更 1 year ago
王杰 a02b6c3f80 jx pcn 1 year ago
王杰 c59ad59c6f jx pcn 下线补录来源于DB的采集数据 1 year ago
yxw 6ec478b294 仅导入修改存在物料 1 year ago
王杰 e3adb21ee7 jx mes 对象结构 编辑 plc代码保存 1 year ago
yxw f17e92f6a5 出货检验报表查询条码明细 1 year ago
yxw fa35fc643a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
yxw 92223877ba 物料导入数据去掉空格 1 year ago
王杰 20cf8163a8 jx mes 监控看板 工厂不良率 计算改成 除数乘100 1 year ago
yxw 416b98ee4d JxPrintPackageAndSpotTicketService打印模板增加打印参数 1 year ago
王杰 b3e5bddb26 看板 1 year ago
王杰 8815f6efc6 jx 看板 1 year ago
王杰 c11dea20a1 jx mes 生产线 1 year ago
王杰 561ea05a97 jx 1 year ago
王杰 9010685763 add table sxworkcelllineoffrecord 1 year ago
王杰 32397a3cd9 jx center board log 1 year ago
王杰 32f77f8396 jx center board log 1 year ago
王杰 972c7d1b10 plc collect pd 1 year ago
王杰 f3cf26d8ff plc collect pd 1 year ago
王杰 8a761f2f82 生产数据报表 1 year ago
yxw 80583a8fb6 Q管理、扭矩管理点检明细报表增加作业单号查询条件 1 year ago
yxw 5db43703f3 过程追溯报表、条码履历报表生产条码字段更改为productSn 1 year ago
yxw b3729c3a3b 占用管理码查询报表 1 year ago
王杰 e1ee8211d4 嘉兴 mes 看板 1 year ago
yxw 5221589839 出货检验项目新增、编辑接口修改 1 year ago
yxw 4ee5ca4f54 工单查询接口修改 1 year ago
yxw 8dde8181f4 扭矩管理查询数据有误 1 year ago
yxw 75e34ed10d 38506 23032—PCN端【Q管理作业】，项目排序增加：若改点检项已存在结果，则排序放置最后 
38507 23032—PCN端【扭矩管理作业】项目排序增加：若改点检项已存在结果，则排序放置最后。
 1 year ago
王杰 acb67d09b7 看板 1 year ago
yxw 14e99be0de 批量启用/禁用工序信息 1 year ago
yxw 0afee7b357 批量启用禁用工序信息 1 year ago
王杰 202fca78c0 看板 1 year ago
yxw 79232c522f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
yxw 4bcf4e46bc 设备点检查询 1 year ago
王杰 aa1964420e 看板 1 year ago
王杰 1ca09aadc8 jx mes 产线运行看板 1 year ago
王杰 2538d2e917 BI 1 year ago
王杰 2e7cf645f9 mes 生产线运行看板 1 year ago
王杰 5bbfd470d3 停开机人员管理信息 1 year ago
王杰 22f0600776 jx mes BI 1 year ago
yxw a1c62ab5a6 Q管理点检 1 year ago
yxw 9010f98800 工单范围绑定条码 1 year ago
yxw 7d4f92000f 松下工位节拍PLC配置表 1 year ago
yxw c2ba0dd8a4 松下工位节拍采集记录报表 1 year ago
yxw 4fdc139fd3 松下工位节拍PLC配置 1 year ago
yxw 1a3101f282 松下工位节拍采集记录报表 1 year ago
yxw 9cae4b0884 松下工位节拍PLC配置 1 year ago
yxw 55cc86a9ac 松下工位节拍PLC配置 1 year ago
yxw 3af19e5765 松下工位节拍PLC配置 1 year ago
王杰 6681dd3ac0 mes 1 year ago
王杰 f4b770f198 mes 1 year ago
yxw 34b5108144 修复产线班次固定作业内容信息时间重复校验逻辑有误 1 year ago
王杰 d59e25ada9 jx mes 物料信息导入 1 year ago
王杰 37885c1962 jx mes 生产线运行看板 工序平衡可视化 1 year ago
王杰 6ba8a84a42 jx mes 生产线运行看板 工序平衡可视化 1 year ago
王杰 2a51392cd9 物料 1 year ago
王杰 2bcd23eed4 jx mes 工序平衡可视化 1 year ago
yxw b2d40c433d 增加包装条码现品票打印类 1 year ago
yxw 3ec57a1497 【工单自动发布物料】导入功能 修改错误提示】 1 year ago
yxw efa8f3d48a 1、38151 23032—PC端【工单自动发布物料】导入功能，导入后，未存导入物料数据 
2、38132 23032—PC端【出货检验项目】界面增加字段“欠点值”，位于“判定基准”之后，新增，编辑，导入都需增加相应字段
 1 year ago
王杰 3a778366da 时间段合并 1 year ago
王杰 c4deb833d7 时间段合并 1 year ago
王杰 777743541c 时间段合并 1 year ago
王杰 94616b4a08 生产线班次分时统计 1 year ago
王杰 35ffbaaa1c 嘉兴 看板小数产量 是要时间长度计算 1 year ago
王杰 d70c927c07 嘉兴 看板小数产量 是要时间长度计算 1 year ago
王杰 cf0d3930bc jx 看板 1 year ago
yxw 72cd59cb89 智能监控看板数据查询有误 1 year ago
yxw cb20da8db9 智能监控看板数据查询有误 1 year ago
yxw 431a62f51e BOM生效报错信息取WMS 1 year ago
王杰 7d2477e8bb jx mes 看板 1 year ago
yxw de3fac5a34 Q管理检验标准不能为空 1 year ago
yxw 1a11a065a5 【fix 38071 23032—Q管理作业实际使用场景中存在同一工序、同一物料、同一管理类型、同一检测信息、同一检测标准的情况下不同重要安全部品的检测项目，需将重要安全部品加入至校验唯一性中。】 1 year ago
yxw 74f262c201 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
yxw 315c946699 【fix 38071 23032—Q管理作业实际使用场景中存在同一工序、同一物料、同一管理类型、同一检测信息、同一检测标准的情况下不同重要安全部品的检测项目，需将重要安全部品加入至校验唯一性中。】 1 year ago
王杰 76d68b5860 jx pmc 看板 1 year ago
yxw f5eb7928c8 BOM生效 1 year ago
王杰 d607f51cc3 jx mes 2 years ago