Commit Graph

1563 Commits (dev)
 

Author SHA1 Message Date
王杰 3db69d968e 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 4 months ago
臧学普 bc76beab75 43316 4 months ago
王杰 5856d21492 merge uat-temp-wj-2412270000-44628 解决冲突 4 months ago
王杰 6c54c40e68 44628 生产工单重新打印目视单,数据不对 4 months ago
王杰 95f55d8df7 merge dev-temp-castle-241223-44022 解决冲突 4 months ago
王杰 54adc62fdc 44316 bom是否启动bomVersion merge 解决冲突 4 months ago
王杰 ebfbe36dfa Merge branch 'uat-temp-castle-2412251631-44430' into dev 4 months ago
王杰 5601754a02 Merge branch 'uat-temp-wj-2412240000-44335' into test 4 months ago
王杰 407de709fc 44022 芜湖正式:产线看板,需要关联显示异常停线时间 merge 解决冲突 4 months ago
王杰 e11a9e7ffc Merge branch 'uat-temp-wj-20241223-44377' into test 4 months ago
王杰 4bd1ea7aac Merge branch 'dev-temp-castle-2412191445-44381' into test 4 months ago
王杰 4ca5148569 merge 44316 bom是否启动bomVersion 解决冲突 4 months ago
王杰 d6749ca871 merge 44316 bom是否启动bomVersion 解决冲突 4 months ago
王杰 2469dba755 Merge branch 'dev-temp-xw-202412261219-44576' into test 4 months ago
xiangwei.zhang a774301a9a 44576 BTO工单看板查询
44510 bom失效查询问题
4 months ago
臧学普 549e8023f5 43316 5 months ago
臧学普 8074411c3c 43316 5 months ago
xiangwei.zhang ffa70f634e bom信息查询失效时间修改 5 months ago
臧学普 559a1c456a 43316 5 months ago
xiangwei.zhang efa93153a5 bom信息查询失效时间修改 5 months ago
臧学普 ed761df83d 需求 44430 待开票业务方案 5 months ago
王杰 97703e2960 Merge branch 'uat-temp-wj-2412240000-44335' into dev 5 months ago
王杰 f824ce25ee 44335 非排序加工规则页面,在“设备代码”列后增加“设备名称”列 5 months ago
王杰 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
王杰 36660c865f Merge branch 'uat-temp-wj-20241223-44377' into test 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
王杰 1e83f4ef07 Merge branch 'dev-temp-castle-241223-44172' into test 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