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

1375 Commits (6d160bfc2e6f25592e1a07663091178f296895bd)
 

Author SHA1 Message Date
xiangwei.zhang 6d160bfc2e Merge remote-tracking branch 'origin/dev' into dev 9 months ago
xiangwei.zhang a16cf1e759 Merge branch 'dev-temp-xw-202501130000-44813' into dev 9 months ago
xiangwei.zhang 6ff07cd721 44813 PC: 缺陷类型与零件类型关系导入后，没有关联显示出来缺陷类型名称和零件类型名称 9 months ago
王杰 d283381dd5 Merge branch 'uat-temp-wj-2501090000-44517' into dev 9 months ago
王杰 d4725e67c2 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 d953cb8202 Merge branch 'uat-temp-wj-2501090000-44746' into dev 9 months ago
王杰 29026a1051 44746 产量统计报表增加报工调整数据查询 9 months ago
王杰 bb794935c9 Merge branch 'uat-temp-wj-2501090000-44746' into dev 9 months ago
王杰 c0b76c9800 44746 产量统计报表增加报工调整数据查询 9 months ago
王杰 10315bedcf Merge branch 'uat-temp-wj-2501090000-44746' into dev 9 months ago
王杰 99386ba5a0 44746 产量统计报表增加报工调整数据查询 9 months ago
王杰 8c6178ffbb Merge branch 'uat-temp-wj-2501090000-44517' into dev 9 months ago
王杰 346a5b6049 Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into dev 9 months ago
王杰 e9cc89e278 Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into dev 9 months ago
castle.zang 1b61155d64 fix bug 44817 离线生成的装配件数据缺少 9 months ago
xiangwei.zhang b6889e8bb6 Merge branch 'dev-temp-xw-202501090000-44270' into dev 10 months ago
xiangwei.zhang 9cdc9c3b1c 44270 非排序产品加工规则的批量导入 10 months ago
xiangwei.zhang fc20661b2b Merge remote-tracking branch 'origin/dev' into dev 10 months ago
王杰 7c92d43739 Merge branch 'uat-temp-wj-2501090000-44746' into dev 10 months ago
王杰 46e28e7efe 44746 产量统计报表增加报工调整数据查询 10 months ago
王杰 ffa9deb112 revert 7831a81822 
revert  44746 产量统计报表增加报工调整数据查询
 10 months ago
王杰 77144820fa Merge remote-tracking branch 'origin/dev-temp-ljs-202501091824-44656' into dev 10 months ago
xiangwei.zhang 0bb9335720 Merge branch 'dev-temp-xw-202501090000-44270' into dev 10 months ago
xiangwei.zhang 42721ff26b 44270 非排序产品加工规则的批量导入 10 months ago
jun 4d34673835 44656 报工调整报表中原因为空 10 months ago
王杰 7831a81822 44746 产量统计报表增加报工调整数据查询 10 months ago
王杰 7a2d89eda0 44517 装箱防错后吐条码需求（芜湖） 10 months ago
王杰 f9fcde7687 Merge remote-tracking branch 'origin/uat-temp-castle-2501090952-44747' into dev 10 months ago
王杰 19c2acaacb Merge branch 'dev-temp-xw-202501061909-44756' into dev 10 months ago
castle.zang 87ef87ccc9 fix bug 44747 同一个原零件对应多个PTR逻辑优化 10 months ago
xiangwei.zhang 40d041a3cd 44670 PC: 模板导入时报错问题 10 months ago
xiangwei.zhang b9b38e7e4f 44756 零件生产组配置-启用Bom版本号”逻辑优化 10 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
 10 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
 10 months ago
xiangwei.zhang 6905574055 Merge branch 'dev-temp-xw-202501071939-44728' into dev 10 months ago
xiangwei.zhang 5e233d6d65 44728: 包装定义明细菜单需要导入按钮 10 months ago
王杰 a02631e51c 44756-零件生产组配置-“启用Bom版本号”逻辑优化 merge dev-temp-xw-202501061909-44756 解决冲突 10 months ago
xiangwei.zhang 21ceb1064d 44756 零件生产组配置-“启用Bom版本号”逻辑优化 10 months ago
王杰 486d1a4102 Merge branch 'dev-temp-xw-202412301219-44255' into dev 10 months ago
xiangwei.zhang a0b0442720 44756-零件生产组配置-“启用Bom版本号”逻辑优化 10 months ago
xiangwei.zhang c735e3068c 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 10 months ago
王杰 64b892966a Merge branch 'uat-temp-wj-2501030000-00000' into dev 10 months ago
王杰 ddecc828f7 44704 PC-批量报工和报工调整，根据生效时间和bom_code查询时，bom_code查询条件未生效 10 months ago
王杰 39b0a5ab24 Merge branch 'uat-temp-wj-2412300000-44653' into dev 10 months ago
王杰 ac1971ff16 Merge remote-tracking branch 'origin/uat-temp-xw-202412311219-hotfix' into dev 10 months ago
王杰 b75b23e6f0 44653 电子化检验输入数量支持小数点输入 10 months ago
xiangwei.zhang f3e7ec6eaf hotfix-报工工作中心不对 10 months ago
xiangwei.zhang 947b02ffae Merge branch 'dev-temp-xw-202412301219-44255' into dev 10 months ago
xiangwei.zhang 191704bbae 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 10 months ago
xiangwei.zhang 9317426969 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 10 months ago