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

1346 Commits (0bb9335720cd7dad3b31f920e587888b3ffbb238)
 

Author SHA1 Message Date
xiangwei.zhang 0bb9335720 Merge branch 'dev-temp-xw-202501090000-44270' into dev 4 months ago
xiangwei.zhang 42721ff26b 44270 非排序产品加工规则的批量导入 4 months ago
xiangwei.zhang 40d041a3cd 44670 PC: 模板导入时报错问题 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
王杰 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
王杰 b75b23e6f0 44653 电子化检验输入数量支持小数点输入 4 months ago
xiangwei.zhang f3e7ec6eaf hotfix-报工工作中心不对 4 months ago
xiangwei.zhang 947b02ffae Merge branch 'dev-temp-xw-202412301219-44255' into dev 4 months ago
xiangwei.zhang 191704bbae 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 4 months ago
xiangwei.zhang 9317426969 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 4 months ago
王杰 246a7d3269 合并 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 解决冲突: 使用origin/test 分支的MesWorkOrderService/MesCreateWorkOrderImpl 覆盖到dev 4 months ago
王杰 15066f676b merge dev-temp-castle-241223-44172 解决冲突 4 months ago
王杰 fada312113 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 4 months ago
王杰 49c072cc44 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 4 months ago
臧学普 6a90f0f54d Merge remote-tracking branch 'origin/test' into test 4 months ago
臧学普 be6816c3dd 43316 修复bomVersion启用问题 4 months ago
王杰 bdc5db8ea2 Merge branch 'test-temp-castle-2412271558-44316' into test 4 months ago
王杰 60aa5a2272 Merge branch 'test-temp-castle-2412271558-44316' into dev 4 months ago
臧学普 f5f2a4b31d 43316 修复bomVersion启用问题 4 months ago
王杰 c343f0bda6 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 4 months ago
王杰 62d27d7b53 Merge branch 'uat-temp-wj-2412270000-44628' into test 4 months ago
王杰 219353cde2 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 4 months ago
王杰 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