Commit Graph

1371 Commits (6b3edf90ac6e2d5bd0b977e872068b7fb8930b5c)

Author SHA1 Message Date
臧学普 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
王杰 e0525ff78a Merge branch 'dev-temp-castle-2412181729-44421' into dev 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
王杰 7650769d8b 合并冲突 5 months ago
臧学普 ef0e52289b POM逻辑修改 5 months ago
王杰 93d9c8e7f2 44336 PC-非排序加工规则-需要支持维护一个进料对应多个产成 和多个进料对应一个产成 5 months ago
王杰 ae7afeda60 44334 生产工单页面工单排序逻辑优化 5 months ago
王杰 38b5c63ef8 Merge branch 'dev-temp-wj-2412120000-44252' into dev 5 months ago
王杰 3a6c27a3ce Merge branch 'dev-temp-wj-2412120000-00001' into dev 5 months ago
王杰 23de55a6eb 解决冲突 5 months ago
王杰 151c3820a6 Merge branch 'dev-temp-wj-2412110000-44273' into dev 5 months ago
王杰 5e7b8e4356 查询BOM信息考虑失效时间 5 months ago
王杰 cd2aa7005c 代码回退 5 months ago
王杰 32dfbdc8d7 点检删除功能 发现代码错误 少了一个感叹号 5 months ago
王杰 0608896664 设备数据查询报表提示信息提示 生产线[%s]工位[%s]为查询到设备信息:?,? 问题修复 5 months ago
王杰 f04c95c785 44252 产线屏放在边端,无需登录 5 months ago
王杰 1d7f753064 44252 产线屏放在边端,无需登录 5 months ago
jun ba92f57af1 查询bom信息考虑失效时间 5 months ago
王杰 ac41c050a5 44273 生产工单页面增加上/下线时间查询条件 5 months ago
xiangwei.zhang 010ea9ce0c BTO单零件生产组明细重复问题 5 months ago
臧学普 ca3b8decb0 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
臧学普 5c9366e6ef ptr P单优先及开始和结束的GA号 5 months ago
xiangwei.zhang 3533263701 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
xiangwei.zhang 19de68d741 BTO看板 5 months ago
王杰 831b8cf815 产线看板 剔除P单数据 修改了2个接口, 5 months ago
王杰 4f6d9e68ce 发运明细 报表 5 months ago
jun 5b4afbfaa8 点检单生成,单号规则生成逻辑调整 5 months ago
jun 13c8d90437 MES工单推送给WMSJOB 未查询到未同步数据直接返回 5 months ago
jun 709cd4abb4 MES工单推送给WMS日志提示信息修改 5 months ago
jun 68be6deb15 点检设置关联零件明细,新增如果选择同一个物料会覆盖更新问题修复 5 months ago
jun 99c87bd8bc Merge remote-tracking branch 'origin/dev' into dev 5 months ago
jun 215b62a601 同步脚本本地备份 5 months ago
jun c5987d3bd8 武汉cockpit发运防错按照散件方式写入 5 months ago
xiangwei.zhang 603d84d5a6 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
xiangwei.zhang 368b04fe68 BTO看板 5 months ago
xiangwei.zhang acab8131a0 对账单信息 5 months ago
jun 86bf0387a6 WMS发运调用CBR负报工接口逻辑修改 5 months ago
jun 30e98fb248 工单加工记录报表增加工单标识字段查询条件 5 months ago
王杰 a186bb7d63 拉动组明细 接口加查询条件 6 months ago
王杰 da514d59d9 Merge branch 'dev' into dev-wuhan 6 months ago
臧学普 651fb28a10 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 d53d41b1a3 线末大屏看板-黄色修改为橙色-43940 6 months ago
王杰 94eb8aa5fc 打印 目视单 6 months ago
王杰 162cee7c19 关闭工单 时 同时关闭JIS SPS QUEUE[创建] 单据 目视单打印队列 6 months ago
jun f1a2bc3cd3 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun 041e3ab40d 手工查单,工单类型按照选择的类型赋值 6 months ago
王杰 90f4502454 关闭工单 时 同时关闭JIS SPS QUEUE[创建] 单据 6 months ago
jun 3f466e59b6 脚本本地备份 6 months ago
jun a244b350f2 产品加工记录增加工单状态查询 6 months ago
jun 300d9114cf Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun e42891c570 手工查单问题修复 6 months ago
王杰 41cd843f32 打印目视单 6 months ago
王杰 55afdefd2f 排除产品加工规则 生产线 like ; 发运查询 发运单号 like 6 months ago
jun 2d98ac7c86 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun d2c977b5de 点检功能点优化 6 months ago
王杰 0f8dcbfc75 Merge branch 'dev' into dev-wuhan 6 months ago
王杰 59502ee279 工单管理排序 6 months ago
臧学普 0250db7d47 零件发运组--客户工厂与信息点联动 6 months ago
王杰 a57679591f Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 6 months ago
王杰 046cfd8b52 主数据: PTR零件查询 发运单查询条件 修改 6 months ago
xiangwei.zhang 762880e567 统一都用生产版本工作中心 6 months ago
臧学普 2854686dde 修改看板逻辑 6 months ago
臧学普 5432c0400c 如果装配件有展示顺序,在ptr替换是需要替换目视项 6 months ago
臧学普 bcabf20313 如果装配件有展示顺序,在ptr替换是需要替换目视项 6 months ago
xiangwei.zhang 6943238b6d Merge remote-tracking branch 'origin/dev' into dev 6 months ago
xiangwei.zhang 41cfa4e252 BTO报工用生产版本工作中心 6 months ago
王杰 188284ab69 增加http接口 pcn调用 用于将数据自动初始化到工位按钮表 6 months ago
臧学普 5f75e8cfb1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 694ed06b59 客户零件号需要从零件生产组中获取 6 months ago
jun 0c2edd3b55 工单页面查询报错 6 months ago
jun 537e117303 自定义脚本同步 6 months ago
jun 05a1f10218 发运单查询时间条件不生效 6 months ago
臧学普 97118b9857 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 9a9799a1c6 看板调整产量计算公式 6 months ago
jun ca3b8b9fe2 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
jun eac136850f 武汉CBR负报工 6 months ago
臧学普 78dfc1657f 目视单PTR转P 6 months ago
jun 91ba35debe BTO工单新增报错 6 months ago
臧学普 e077cdb0e5 目视单增加车型备注 6 months ago
臧学普 66db54816c 目视单增加车型备注 6 months ago
臧学普 ab3151da6f 看板调整及目视单打印调整 6 months ago
臧学普 f95006915e 看板调整 6 months ago
臧学普 1a86c4d7b0 目视单打印 6 months ago
臧学普 e1e8106db7 PTR逻辑修改 6 months ago
臧学普 66dcc038b2 PTR逻辑修改 6 months ago
臧学普 901cb3e00c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 3a2fa64bbd PTR逻辑修改 6 months ago
王杰 d97e9be49d docker 6 months ago
臧学普 20bd304728 离线装配件表校验 cfgOfflineRao表中是否已经存在了客户零件号,如果存在则跳过 防止多个零件生产组生成相同的数据 6 months ago
臧学普 8922c24857 离线装配件表校验 cfgOfflineRao表中是否已经存在了客户零件号,如果存在则跳过
防止多个零件生产组生成相同的数据
6 months ago
臧学普 0e891ccb14 PTR逻辑及F单逻辑修改 6 months ago
jun 5d06663578 SPS单据打印优化,增加每次查询条数 6 months ago
jun d2cc32a6e7 Merge branch 'dev' into dev-wuhan 6 months ago
jun 9cd5fec986 SPS单据打印车型名称 6 months ago
jun 92587bd4f5 CBR负报工接口添加日志 6 months ago
jun 96dec1f462 CBR负报工接口添加日志 6 months ago
jun 57b20494ea Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
jun 862da84fd6 43683 发运单明细显示:需要显示物料名称,及正序排序客户排序信息 6 months ago
xiangwei.zhang 35ff11fb98 点检单,删除逻辑修改 6 months ago
臧学普 f72dbdeef4 bom不生效时,只生成工单不生产装配件及物料清单 6 months ago
臧学普 ae5acb76b1 bom不生效时,只生成工单不生产装配件及物料清单 6 months ago
臧学普 68908190ed 生产零件号是用来查找生产版本与bom 存在于零件生产组中 6 months ago
jun d6bddfff1a PC排序汇报问题修复 6 months ago
臧学普 3c92dbb3ff 离线打印字段确认 6 months ago
臧学普 6f975db843 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 487c683569 离线打印字段确认 6 months ago
jun 1e85f2c093 Merge remote-tracking branch 'origin/dev' into dev-wuhan 6 months ago
jun cfb57c094d 工单同步wms功能开发 6 months ago
xiangwei.zhang 079cbf07cb 设备点检导入 6 months ago
xiangwei.zhang f0c9b5b424 对账单信息 6 months ago
臧学普 81ca92c4e1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago