Commit Graph

1371 Commits (6b3edf90ac6e2d5bd0b977e872068b7fb8930b5c)

Author SHA1 Message Date
xiangwei.zhang c735e3068c 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 9 months ago
王杰 64b892966a Merge branch 'uat-temp-wj-2501030000-00000' into dev 9 months ago
王杰 ddecc828f7 44704 PC-批量报工和报工调整,根据生效时间和bom_code查询时,bom_code查询条件未生效 9 months ago
王杰 39b0a5ab24 Merge branch 'uat-temp-wj-2412300000-44653' into dev 9 months ago
王杰 ac1971ff16 Merge remote-tracking branch 'origin/uat-temp-xw-202412311219-hotfix' into dev 9 months ago
王杰 b75b23e6f0 44653 电子化检验输入数量支持小数点输入 9 months ago
xiangwei.zhang f3e7ec6eaf hotfix-报工工作中心不对 9 months ago
xiangwei.zhang 947b02ffae Merge branch 'dev-temp-xw-202412301219-44255' into dev 9 months ago
xiangwei.zhang 191704bbae 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 9 months ago
xiangwei.zhang 9317426969 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 9 months ago
王杰 246a7d3269 合并 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 解决冲突: 使用origin/test 分支的MesWorkOrderService/MesCreateWorkOrderImpl 覆盖到dev 9 months ago
王杰 15066f676b merge dev-temp-castle-241223-44172 解决冲突 9 months ago
王杰 fada312113 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 9 months ago
王杰 49c072cc44 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 9 months ago
castle.zang 6a90f0f54d Merge remote-tracking branch 'origin/test' into test 9 months ago
castle.zang be6816c3dd 43316 修复bomVersion启用问题 9 months ago
王杰 bdc5db8ea2 Merge branch 'test-temp-castle-2412271558-44316' into test 10 months ago
王杰 60aa5a2272 Merge branch 'test-temp-castle-2412271558-44316' into dev 10 months ago
castle.zang f5f2a4b31d 43316 修复bomVersion启用问题 10 months ago
王杰 c343f0bda6 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 10 months ago
王杰 62d27d7b53 Merge branch 'uat-temp-wj-2412270000-44628' into test 10 months ago
王杰 219353cde2 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 10 months ago
王杰 3db69d968e 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 10 months ago
castle.zang bc76beab75 43316 10 months ago
王杰 5856d21492 merge uat-temp-wj-2412270000-44628 解决冲突 10 months ago
王杰 6c54c40e68 44628 生产工单重新打印目视单,数据不对 10 months ago
王杰 95f55d8df7 merge dev-temp-castle-241223-44022 解决冲突 10 months ago
王杰 54adc62fdc 44316 bom是否启动bomVersion merge 解决冲突 10 months ago
王杰 ebfbe36dfa Merge branch 'uat-temp-castle-2412251631-44430' into dev 10 months ago
王杰 5601754a02 Merge branch 'uat-temp-wj-2412240000-44335' into test 10 months ago
王杰 407de709fc 44022 芜湖正式:产线看板,需要关联显示异常停线时间 merge 解决冲突 10 months ago
王杰 e11a9e7ffc Merge branch 'uat-temp-wj-20241223-44377' into test 10 months ago
王杰 4bd1ea7aac Merge branch 'dev-temp-castle-2412191445-44381' into test 10 months ago
王杰 4ca5148569 merge 44316 bom是否启动bomVersion 解决冲突 10 months ago
王杰 d6749ca871 merge 44316 bom是否启动bomVersion 解决冲突 10 months ago
xiangwei.zhang a774301a9a 44576 BTO工单看板查询
44510 bom失效查询问题
10 months ago
castle.zang 549e8023f5 43316 10 months ago
castle.zang 8074411c3c 43316 10 months ago
xiangwei.zhang ffa70f634e bom信息查询失效时间修改 10 months ago
castle.zang 559a1c456a 43316 10 months ago
xiangwei.zhang efa93153a5 bom信息查询失效时间修改 10 months ago
castle.zang ed761df83d 需求 44430 待开票业务方案 10 months ago
王杰 97703e2960 Merge branch 'uat-temp-wj-2412240000-44335' into dev 10 months ago
王杰 f824ce25ee 44335 非排序加工规则页面,在“设备代码”列后增加“设备名称”列 10 months ago
王杰 8e6ea7bd53 Merge branch 'uat-temp-wj-20241223-44377' into dev 10 months ago
王杰 b2fec000c5 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 10 months ago
王杰 6c83b4cefb Merge branch 'uat-temp-wj-20241223-44377' into dev 10 months ago
王杰 955a5c8d8b 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 10 months ago
castle.zang 144edb05ad Merge branch 'dev-temp-castle-241223-44172' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 10 months ago
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 2be5ccc1e4 fix bug PC-发运明细报表:增加vin和条码的查询条件-44172 10 months ago
castle.zang e53ddfa6ef fix bug 44022 芜湖正式:产线看板,需要关联显示异常停线时间 10 months ago
王杰 b6aa88449d 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 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
王杰 e0525ff78a Merge branch 'dev-temp-castle-2412181729-44421' into dev 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
王杰 151c3820a6 Merge branch 'dev-temp-wj-2412110000-44273' into dev 10 months ago