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

1281 Commits (74aa08e9ee66fac6585e5bf4d63136bdf3ffdb6f)
 

Author SHA1 Message Date
castle.zang 74aa08e9ee Merge branch 'dev-temp-castle-241223-44022' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 10 months ago
castle.zang e53ddfa6ef fix bug 44022 芜湖正式：产线看板，需要关联显示异常停线时间 10 months ago
castle.zang 7471ceb503 Merge branch 'dev-temp-castle-241223-44022' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/board/MesWorkCenterBoardController.java
 10 months ago
xiangwei.zhang ac05a41dc2 BTO工单完成数量报表修改和bom失效时间修改 10 months ago
castle.zang ee8c085bb0 fix bug 44022 芜湖正式：产线看板，需要关联显示异常停线时间 10 months ago
王杰 d7ceca9535 Merge branch 'uat-temp-wj-20241223-44377' into dev 10 months ago
王杰 adb0cf7a8b 44376 武汉 加工记录统计报表 需求变更 10 months ago
王杰 3a3bfc3c6c Merge branch 'dev-temp-castle-2412191445-44381' into dev 10 months ago
王杰 17fb826dd7 merge dev-temp-castle-2412131528-44316 解决冲突 10 months ago
王杰 ced040beb2 Merge branch 'dev-temp-castle-241223-44172' into uat 10 months ago
王杰 4e58ef3930 Merge branch 'dev-temp-castle-241223-44172' into dev 10 months ago
castle.zang 42033f7d57 fix bug 44172 PC-发运明细报表：增加vin和条码的查询条件 10 months ago
castle.zang e74faf5db2 积单颜色 10 months ago
castle.zang 101f359f32 积单颜色 10 months ago
castle.zang 69a47d9a77 bom是否启动bomVersion 10 months ago
castle.zang 402a961a1f bom是否启动bomVersion 10 months ago
castle.zang 889a6516e1 通用客户CBR 10 months ago
castle.zang e1a6521c00 通用客户CBR 10 months ago
王杰 a8df173fa3 Merge branch 'test' into uat 10 months ago
王杰 e0525ff78a Merge branch 'dev-temp-castle-2412181729-44421' into dev 10 months ago
王杰 37827fb343 Merge branch 'dev-temp-ljs-20241219141200-44437' into uat 10 months ago
castle.zang c5b6d239e7 修复bug 44421 PTR逻辑优化 10 months ago
王杰 e7ecccdbf4 Merge branch 'dev-temp-ljs-20241219141200-44437' into dev 10 months ago
王杰 2955dccadb Merge branch 'test' into dev 10 months ago
jun 030c731427 44437 CKPT安全件信息导出 10 months ago
王杰 0431e3c860 BOM查询条件是否携带effEndTime,根据系统配置MES_REPORT_FIND_BOM_WITH_EFFENDTIME,维护1则携带 10 months ago
王杰 361ccc63b4 Merge branch 'test' into dev 10 months ago
王杰 bdf60eeb03 BOM查询条件是否携带effEndTime,根据系统配置MES_REPORT_FIND_BOM_WITH_EFFENDTIME,维护1则携带 10 months ago
王杰 a08defc46c Merge branch 'test' into dev 10 months ago
王杰 d32999bef2 BOM查询条件是否携带effEndTime,根据系统配置MES_REPORT_FIND_BOM_WITH_EFFENDTIME,维护1则携带 10 months ago
王杰 8f86f5aa89 Merge branch 'dev-temp-castle-2412181729-44421' into dev 10 months ago
castle.zang 64002c88f4 修复bug 44421 PTR逻辑优化 10 months ago
王杰 f5a85d3364 Merge branch 'dev-temp-wj-2412160000-00001' into dev 10 months ago
王杰 79dc62a687 产量统计报表 10 months ago
王杰 f0e6a7522a 71 10 months ago
王杰 ab386358a3 Merge branch 'dev-temp-wj-2412160000-00001' into dev 10 months ago
王杰 a122d33853 Merge branch 'master' into dev 10 months ago
王杰 1b0d0c5756 产量统计报表 10 months ago
王杰 195f7dae2a 产量统计报表 10 months ago
castle.zang d900d3e55f 线末大屏看板颜色替换 10 months ago
王杰 622280c66b 排序工单 关闭 队列未改成未同步 10 months ago
王杰 2f388460cc 加工记录统计报表 10 months ago
王杰 e2bd615eb5 Merge branch 'dev-temp-wj-2412130000-44336' into dev 10 months ago
王杰 7650769d8b 合并冲突 10 months ago
castle.zang ef0e52289b POM逻辑修改 10 months ago
王杰 93d9c8e7f2 44336 PC-非排序加工规则-需要支持维护一个进料对应多个产成 和多个进料对应一个产成 10 months ago
王杰 ae7afeda60 44334 生产工单页面工单排序逻辑优化 10 months ago
王杰 38b5c63ef8 Merge branch 'dev-temp-wj-2412120000-44252' into dev 10 months ago
王杰 3a6c27a3ce Merge branch 'dev-temp-wj-2412120000-00001' into dev 10 months ago
王杰 23de55a6eb 解决冲突 10 months ago