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

1308 Commits (c343f0bda6539ebb9d4ac56b1c1757911eb6656d)
 

Author SHA1 Message Date
王杰 c343f0bda6 合并 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
王杰 d6749ca871 merge 44316 bom是否启动bomVersion 解决冲突 10 months ago
王杰 2469dba755 Merge branch 'dev-temp-xw-202412261219-44576' into test 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
王杰 36660c865f Merge branch 'uat-temp-wj-20241223-44377' into test 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
王杰 1e83f4ef07 Merge branch 'dev-temp-castle-241223-44172' into test 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