Commit Graph

1288 Commits (8e6ea7bd53e499798031ddf234353d1d36daf8d1)
 

Author SHA1 Message Date
王杰 8e6ea7bd53 Merge branch 'uat-temp-wj-20241223-44377' into dev 5 months ago
王杰 b2fec000c5 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 5 months ago
王杰 6c83b4cefb Merge branch 'uat-temp-wj-20241223-44377' into dev 5 months ago
王杰 955a5c8d8b 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 5 months ago
臧学普 144edb05ad Merge branch 'dev-temp-castle-241223-44172' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 5 months ago
臧学普 74aa08e9ee Merge branch 'dev-temp-castle-241223-44022' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 5 months ago
臧学普 2be5ccc1e4 fix bug PC-发运明细报表:增加vin和条码的查询条件-44172 5 months ago
臧学普 e53ddfa6ef fix bug 44022 芜湖正式:产线看板,需要关联显示异常停线时间 5 months ago
王杰 b6aa88449d 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 5 months ago
臧学普 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
5 months ago
xiangwei.zhang ac05a41dc2 BTO工单完成数量报表修改和bom失效时间修改 5 months ago
臧学普 ee8c085bb0 fix bug 44022 芜湖正式:产线看板,需要关联显示异常停线时间 5 months ago
王杰 d7ceca9535 Merge branch 'uat-temp-wj-20241223-44377' into dev 5 months ago
王杰 adb0cf7a8b 44376 武汉 加工记录统计报表 需求变更 5 months ago
王杰 3a3bfc3c6c Merge branch 'dev-temp-castle-2412191445-44381' into dev 5 months ago
王杰 17fb826dd7 merge dev-temp-castle-2412131528-44316 解决冲突 5 months ago
王杰 ced040beb2 Merge branch 'dev-temp-castle-241223-44172' into uat 5 months ago
王杰 4e58ef3930 Merge branch 'dev-temp-castle-241223-44172' into dev 5 months ago
臧学普 42033f7d57 fix bug 44172 PC-发运明细报表:增加vin和条码的查询条件 5 months ago
臧学普 e74faf5db2 积单颜色 5 months ago
臧学普 101f359f32 积单颜色 5 months ago
臧学普 69a47d9a77 bom是否启动bomVersion 5 months ago
臧学普 402a961a1f bom是否启动bomVersion 5 months ago
臧学普 889a6516e1 通用客户CBR 5 months ago
臧学普 e1a6521c00 通用客户CBR 5 months ago
王杰 a8df173fa3 Merge branch 'test' into uat 5 months ago
王杰 e0525ff78a Merge branch 'dev-temp-castle-2412181729-44421' into dev 5 months ago
王杰 37827fb343 Merge branch 'dev-temp-ljs-20241219141200-44437' into uat 5 months ago
臧学普 c5b6d239e7 修复bug 44421 PTR逻辑优化 5 months ago
王杰 e7ecccdbf4 Merge branch 'dev-temp-ljs-20241219141200-44437' into dev 5 months ago
王杰 2955dccadb Merge branch 'test' into dev 5 months ago
jun 030c731427 44437 CKPT安全件信息导出 5 months ago
王杰 0431e3c860 BOM查询条件是否携带effEndTime,根据系统配置MES_REPORT_FIND_BOM_WITH_EFFENDTIME,维护1则携带 5 months ago
王杰 361ccc63b4 Merge branch 'test' into dev 5 months ago
王杰 bdf60eeb03 BOM查询条件是否携带effEndTime,根据系统配置MES_REPORT_FIND_BOM_WITH_EFFENDTIME,维护1则携带 5 months ago
王杰 a08defc46c Merge branch 'test' into dev 5 months ago
王杰 d32999bef2 BOM查询条件是否携带effEndTime,根据系统配置MES_REPORT_FIND_BOM_WITH_EFFENDTIME,维护1则携带 5 months ago
王杰 8f86f5aa89 Merge branch 'dev-temp-castle-2412181729-44421' into dev 5 months ago
臧学普 64002c88f4 修复bug 44421 PTR逻辑优化 5 months ago
王杰 f5a85d3364 Merge branch 'dev-temp-wj-2412160000-00001' into dev 5 months ago
王杰 79dc62a687 产量统计报表 5 months ago
王杰 f0e6a7522a 71 5 months ago
王杰 ab386358a3 Merge branch 'dev-temp-wj-2412160000-00001' into dev 5 months ago
王杰 a122d33853 Merge branch 'master' into dev 5 months ago
王杰 1b0d0c5756 产量统计报表 5 months ago
王杰 195f7dae2a 产量统计报表 5 months ago
臧学普 d900d3e55f 线末大屏看板颜色替换 5 months ago
王杰 622280c66b 排序工单 关闭 队列未改成未同步 5 months ago
王杰 2f388460cc 加工记录统计报表 5 months ago
王杰 e2bd615eb5 Merge branch 'dev-temp-wj-2412130000-44336' into dev 5 months ago