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

1543 Commits (5bba6ba5155170fa8a16e5062e91947f19d41296)
 

Author SHA1 Message Date
王杰 8e29e74429 merge dev-temp-ljs-202501091824-44656 解决冲突 4 months ago
xiangwei.zhang d8fcc8abfd 44670 PC: 模板导入时报错问题 4 months ago
xiangwei.zhang 471967fd7e 44756 版本回退 4 months ago
王杰 3c152132ca Merge remote-tracking branch 'origin/uat-temp-castle-2501090952-44747' into test 4 months ago
王杰 663f430d23 Merge branch 'dev-temp-xw-202412301219-44255' into test 4 months ago
王杰 5faa656bd2 Merge branch 'dev-temp-xw-202412301219-44255' into test 4 months ago
王杰 4f5f24f84a Merge branch 'uat-temp-wj-2412300000-44653' into test 4 months ago
王杰 f1294f551c Merge branch 'uat-temp-wj-2412300000-44615' into test 4 months ago
jun cf77b07eda Merge remote-tracking branch 'origin/dev' into dev 4 months ago
jun e42cdd4f76 44656 报工调整报表中原因为空 测试问题修复 4 months ago
xiangwei.zhang 06cb051548 Merge branch 'dev-temp-xw-202412301219-44255' into dev 4 months ago
xiangwei.zhang 620ae11ebd 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 4 months ago
xiangwei.zhang 732d8acea6 Merge branch 'dev-temp-xw-202501090000-44270' into dev 4 months ago
xiangwei.zhang 6d160bfc2e Merge remote-tracking branch 'origin/dev' into dev 4 months ago
xiangwei.zhang a16cf1e759 Merge branch 'dev-temp-xw-202501130000-44813' into dev 4 months ago
xiangwei.zhang 6ff07cd721 44813 PC: 缺陷类型与零件类型关系导入后，没有关联显示出来缺陷类型名称和零件类型名称 4 months ago
xiangwei.zhang ce6e53fd72 44270 PC：非排序产品加工规则的批量导入 4 months ago
jun f08ab29045 44656 报工调整报表中原因为空 提示信息错误 4 months ago
王杰 d283381dd5 Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 d4725e67c2 44517 装箱防错后吐条码需求（芜湖） 4 months ago
王杰 d953cb8202 Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 29026a1051 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 bb794935c9 Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 c0b76c9800 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 10315bedcf Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 99386ba5a0 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 8c6178ffbb Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 346a5b6049 Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into dev 4 months ago
王杰 e9cc89e278 Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into dev 4 months ago
臧学普 1b61155d64 fix bug 44817 离线生成的装配件数据缺少 4 months ago
xiangwei.zhang b6889e8bb6 Merge branch 'dev-temp-xw-202501090000-44270' into dev 4 months ago
xiangwei.zhang 9cdc9c3b1c 44270 非排序产品加工规则的批量导入 4 months ago
xiangwei.zhang fc20661b2b Merge remote-tracking branch 'origin/dev' into dev 4 months ago
王杰 7c92d43739 Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 46e28e7efe 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 ffa9deb112 revert 7831a81822 
revert  44746 产量统计报表增加报工调整数据查询
 4 months ago
王杰 77144820fa Merge remote-tracking branch 'origin/dev-temp-ljs-202501091824-44656' into dev 4 months ago
xiangwei.zhang 0bb9335720 Merge branch 'dev-temp-xw-202501090000-44270' into dev 4 months ago
xiangwei.zhang 42721ff26b 44270 非排序产品加工规则的批量导入 4 months ago
王杰 41c65e0c3a Merge remote-tracking branch 'origin/dev-temp-ljs-202501091824-44656' into dev 4 months ago
jun 4d34673835 44656 报工调整报表中原因为空 4 months ago
王杰 7831a81822 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 7a2d89eda0 44517 装箱防错后吐条码需求（芜湖） 4 months ago
王杰 f9fcde7687 Merge remote-tracking branch 'origin/uat-temp-castle-2501090952-44747' into dev 4 months ago
王杰 19c2acaacb Merge branch 'dev-temp-xw-202501061909-44756' into dev 4 months ago
臧学普 87ef87ccc9 fix bug 44747 同一个原零件对应多个PTR逻辑优化 4 months ago
xiangwei.zhang 40d041a3cd 44670 PC: 模板导入时报错问题 4 months ago
xiangwei.zhang b9b38e7e4f 44756 零件生产组配置-启用Bom版本号”逻辑优化 4 months ago
xiangwei.zhang 822a48d1ee Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java
 4 months ago
xiangwei.zhang cae71e76cc Merge branch 'dev-temp-xw-202501061909-44756' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java
 4 months ago