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

1466 Commits (954bc8660cafc64497f76f756674737bc08efc2e)

Author SHA1 Message Date
xiangwei.zhang c600dbedf7 44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件 3 months ago
xiangwei.zhang a0e07ca940 44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件 3 months ago
王杰 599ae54988 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 58f87b6e85 打包 4 months ago
王杰 4cf0a5a7b9 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 fdae8a1b45 Merge branch 'uat-temp-wj-250122-44907' into dev 4 months ago
王杰 fb9282ed55 44907 MES：检验产品数据总报表报错 4 months ago
xiangwei.zhang 9bd8ecee92 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang fba028267d 44905 MES-发运异常处理 4 months ago
xiangwei.zhang 58ea818942 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang 5fcef2d14f 44905 MES-发运异常处理 4 months ago
xiangwei.zhang c3abf292e1 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang a4d6e8009a 44905 MES-发运异常处理 4 months ago
xiangwei.zhang 890bd1472b Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang 939c515fc2 44905 MES-发运异常处理 4 months ago
xiangwei.zhang 10456e74a9 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang 463ec92cbf 44905 MES-发运异常处理 4 months ago
xiangwei.zhang 6b5432d5b9 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang be1749fb92 44905 MES-发运异常处理 4 months ago
王杰 6ef72a6bee 打包 4 months ago
xiangwei.zhang 3c7d252537 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang b633fbaeb9 44838 MES:裁片补片逻辑更新＆裁片报表 4 months ago
王杰 d152a464ca 打包 4 months ago
xiangwei.zhang 08301bc9a2 44905 MES-发运异常处理 4 months ago
xiangwei.zhang e834732d74 44838 MES:裁片补片逻辑更新＆裁片报表 4 months ago
王杰 ec7f396e33 重庆打包 4 months ago
xiangwei.zhang 45c7fe23da Merge branch 'dev-temp-ljs-202501091824-44656' into dev 4 months ago
王杰 bf114910e2 Merge branch 'uat-temp-wj-2501090000-44517' into test 4 months ago
王杰 585a8edc62 Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into test 4 months ago
王杰 1c33dce687 Merge remote-tracking branch 'origin/dev-temp-xw-202501130000-44813' into test 4 months ago
xiangwei.zhang a1b3d04f30 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang f6b3a36560 44838 MES:裁片补片逻辑更新＆裁片报表 4 months ago
xiangwei.zhang 973ff08b91 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang 338dd627ca 44838 MES:裁片补片逻辑更新＆裁片报表 4 months ago
xiangwei.zhang 1815794e04 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang 6e756d0065 44813 PC: 缺陷类型与零件类型关系导入后，没有关联显示出来缺陷类型名称和零件类型名称 4 months ago
xiangwei.zhang 10131f750e 44838 MES:裁片补片逻辑更新＆裁片报表 4 months ago
王杰 87f42674da Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into test 4 months ago
王杰 132f7d53d7 Merge branch 'uat-temp-wj-2501090000-44746' into test 4 months ago
王杰 f3dd964e48 Merge remote-tracking branch 'origin/dev-temp-xw-202501071939-44728' into test 4 months ago
王杰 d7e9810924 Merge remote-tracking branch 'origin/dev-temp-xw-202501151600-44670' into test 4 months ago
王杰 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 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
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
臧学普 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
xiangwei.zhang 6905574055 Merge branch 'dev-temp-xw-202501071939-44728' into dev 4 months ago
xiangwei.zhang 5e233d6d65 44728: 包装定义明细菜单需要导入按钮 4 months ago
王杰 a02631e51c 44756-零件生产组配置-“启用Bom版本号”逻辑优化 merge dev-temp-xw-202501061909-44756 解决冲突 4 months ago
xiangwei.zhang 21ceb1064d 44756 零件生产组配置-“启用Bom版本号”逻辑优化 4 months ago
王杰 486d1a4102 Merge branch 'dev-temp-xw-202412301219-44255' into dev 4 months ago
xiangwei.zhang a0b0442720 44756-零件生产组配置-“启用Bom版本号”逻辑优化 4 months ago
xiangwei.zhang c735e3068c 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 4 months ago
王杰 b8977cffb8 Merge branch 'uat-temp-wj-2501030000-00000' into test 4 months ago
王杰 64b892966a Merge branch 'uat-temp-wj-2501030000-00000' into dev 4 months ago
王杰 ddecc828f7 44704 PC-批量报工和报工调整，根据生效时间和bom_code查询时，bom_code查询条件未生效 4 months ago
王杰 39b0a5ab24 Merge branch 'uat-temp-wj-2412300000-44653' into dev 4 months ago
王杰 ac1971ff16 Merge remote-tracking branch 'origin/uat-temp-xw-202412311219-hotfix' into dev 4 months ago