puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
2,262 Commits
142 Branches
39 Tags
16 MiB
mes-uat-changshu0609
mes-test
spotbugs-0630
mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht
mes-uat-changshu0609-temp-wj-250616-xisu
uat-temp-nht-2506120000-jialiao
mes-dev
dev_temp_xw_202505150000_46824
mes-uat-temp-logic-20250609-47191
dev_temp_xw_20250624_ncdev
mes-uat-changshu0609-temp-logic-20250613-3533
uat_temp_xw_2050619_nc
uat-temp-nht-2506190000-47758
uat-temp-nht-2506050000-spotbugs
uat-temp-nht-2506120000-47592
dev_temp_xw_20250610_46906
uat-temp-nht-2506120000-dataMatrix
dev_temp_xw_202506090000_47023
uat-temp-nht-2506050000-47389
mes-test-temp-DM202504230012
mes-test-merge-daxiaoxie
mes-uat
mes-uat-temp-logic-20250529-47241
dev_temp_xw_202505230000_47023
mes-uat-temp-logic-20250526-47187
uat-temp-nht-2505260000-47177
uat-temp-nht-2505230000-47122
mes-test-batch-report-bug
uat-temp-nht-2505210000-chengdu-custpart
mes-uat-temp-47040
uat-temp-nht-2505200000-47042
yfai-20250418-dev
uat-temp-nht-2505160000-46987
uat-temp-wj-chongqingdaqu-prod-temp-logic-20250517-46981
uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion
uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak
mes-master
dev_temp_xw_202505150000_46970
uat-temp-nht-202505150000-46881
uat-temp-wj-chongqingdaqu-prod
dev_temp_xw_202505150000_46950
uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2
uat-temp-wj-chongqingdaqu-prod-temp-publish0415
uat-temp-nht-2504270000-46499
uat-temp-wj-chongqingdaqu-prod-huaweiyun
uat-temp-nht202505120000-46757
uat-temp-nht-202505090001-46746
uat-temp-wj-chongqingdaqu-prod-huaweiyun-46428
dev_temp_xw_202505120000_46850
uat-temp-wj-chongqingdaqu-prod-temp-logic-20250508-46601
uat-temp-wj-chongqingdaqu-prod-lijiabatchreport
uat-temp-nht-2504300000-46708
uat-temp-nht-2505060001-46742
uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd
uat-temp-nht-2505060000-shippingScanSn
uat-temp-nht-2505020000-shippingkanban
uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia
uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save
uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615
uat-temp-wj-chongqingdaqu-prod-huaweiyun-shipping-repeat-bug
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd
uat-temp-nht-2504240000-data-matrix
uat-temp-wj-chongqingdaqu-prod-temp-46319
uat-temp-wj-chongqingdaqu-prod-temp-46503
uat-temp-nht-2504140000-46317
uat-temp-nht-chengdu-publish
dev_temp_xw_202504210000_46466
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-merge-cd
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping
uat-temp-wj-chongqingdaqu-prod-merge-longxing
dev_temp_xw_202504170000_45858
uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty
dev_temp_xw_202504180000_46348
uat-temp
uat
uat-temp-wj-chongqingdaqu-prod-temp-merge-all
uat-temp-wj-chongqingdaqu-prod-temp-denglizi
uat-temp-wj-chongqingdaqu-prod-temp-46420
dev_temp_xw_202503260000_45858
uat-temp-wj-chongqingdaqu-dev
dev_temp_xw_202504160000_45524
uat-temp-nht-2503250001-twoshippingcheck
uat-temp-nht-2504070000-46139
uat-temp-wj-chongqingdaqu-prod-temp-merge
uat-temp-nht-2504100000-46214
uat-temp-nht-2504090000-46216
uat-temp-nht-2503130000-chengdu-shipping
uat-temp-wj-chongqingdaqu-prod-temp-logic-20250410-46141
dev_temp_xw_202504100000_46256
dev_temp_xw_202504090000_46196
uat-temp-nht-2504020000-3520
uat-temp-wj-chongqingdaqu-prod-temp-rfid
uat-temp-wj-chongqingdaqu-prod-chengdu
uat-temp-nht-2504040000-lx
uat-temp-wj-chongqingdaqu-prod-temp-pingxinggongwei
uat-temp-wj-45787
uat-temp-nht-2503200000-volvo-print
uat-temp-wj-chongqingdaqu-dev-craft-check
dev
dev_temp_xw_202503310000_45843
dev_temp_xw_202503280000_45843
uat-temp-wj-chongqingdaqu-dev-equcontext
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport
uat-temp-nht-2503280000-cdpartsprint
uat-dev
test
uat-temp-wj-chongqingdaqu-dev-bak
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820
uat-temp-nht-2503220000-45859
uat-temp-wj-2502060000-chongqing-step
uat-temp-ljx-chongqi-dev-20250318
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623
uat-temp-nht-25027-chengdu
uat-temp-nht-2503100000-45420
uat-temp-nht-2503110000-45555
uat-temp-wj-shenshanorder
uat-temp-nht-2503110000-45556
uat-temp-logic-20250307-45527
uat-temp-wj-chongqingdaqu
uat-temp-nht-2503100000-45560
uat-temp-castle-2502241152-fordFetchWeb
uat-temp-nht-2502110000-chongqing-step
uat-temp-logic-20250309-45550
uat-temp-nht-2502140000-part-print
uat-temp-nht-250226-lijia
uat-temp-wj-lijia-prod
uat-temp-nht-202502180000-shippingkanban
test-temp-wj-45329
uat-temp-nht-202502260000-customprint
uat-temp-wj-longxin-prod
dev-temp-nht-202502180000-customprint
uat-temp-nht-2502200000-lijia-sn-print
dev-temp-xw-202502170000-111111
uat_temp_castle_250213_44248
uat-temp-castle-250211-44248
uat-temp-wj-250208-manycellbug
uat-temp-nht-2502060000-44953
uat-temp-wj-250124-equ-check-step
test-temp-wj-250117-pack
master
yfai-pcn-ext-v4.2
yfai-pcn-ext-v4.1
yfai-pcn-ext-v4.0
yfai-pcn-ext-v3.9
yfai-pcn-ext-v3.8
yfai-pcn-ext-v3.7
yfai-pcn-ext-v3.6
yfai-pcn-ext-v3.55
yfai-pcn-ext-v3.5
yfai-pcn-ext-v3.45
yfai-pcn-ext-v3.4
yfai-pcn-ext-v3.2
yfai-pcn-ext-v3.11
yfai-pcn-ext-v3.1
yfai-pcn-ext-v2.9
yfai-pcn-ext-v2.82
yfai-pcn-ext-v2.81
yfai-pcn-ext-v2.8
yfai-pcn-ext-v2.76
yfai-pcn-ext-v2.75
yfai-pcn-ext-v2.7
yfai-pcn-ext-v2.6
yfai-pcn-ext-v2.51
yfai-pcn-ext-v2.5
yfai-pcn-ext-v2.4
yfai-pcn-ext-v2.3
yfai-pcn-ext-v2.2
yfai-pcn-ext-v2.1
yfai-pcn-ext-v2.0
yfai-pcn-ext-v1.9
yfai-pcn-ext-v1.8
yfai-pcn-ext-v1.7
yfai-pcn-ext-v1.6
yfai-pcn-ext-v1.5
yfai-pcn-ext-v1.4
yfai-pcn-ext-v1.3
yfai-pcn-ext-v1.2
yfai-pcn-ext-v1.1
yfai-pcn-ext-v1.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'mes-dev'
${ noResults }
Commit Graph

2262 Commits (mes-dev)
 

Author SHA1 Message Date
jason 5f09777ada Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev 4 weeks ago
jason 5a6d034d07 修复总成回退加工记录软删问题 4 weeks ago
jason 755c9a6d19 Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev 4 weeks ago
jason 1f4821052c 修复总成回退加工记录软删问题 4 weeks ago
logic.fang ffeb7bfdff Merge branch 'refs/heads/mes-uat-temp-logic-20250609-47191' into mes-dev 4 weeks ago
logic.fang a57f3e7cb5 47191 DM202504290012 龙兴工厂CKPT线排序信息拆单需求-EDI功能修改（扫描发运新增“校验是否末单”、“发送用户自定义指令至PLC点位”-优化） 4 weeks ago
xiangwei.zhang 16f94f85f1 Merge branch 'dev_temp_xw_20250624_ncdev' into mes-dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java
 4 weeks ago
xiangwei.zhang 51d56e8e70 Merge branch 'dev_temp_xw_202506090000_47023' into dev_temp_xw_20250624_ncdev 4 weeks ago
xiangwei.zhang e2d9af5960 Merge branch 'dev_temp_xw_202505150000_46824' into dev_temp_xw_20250624_ncdev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java
 4 weeks ago
xiangwei.zhang e4b6bab2de Merge remote-tracking branch 'origin/mes-dev' into mes-dev 1 month ago
xiangwei.zhang 5d7fc38fb9 Merge remote-tracking branch 'origin/dev_temp_xw_20250610_46906' into mes-dev 1 month ago
xiangwei.zhang 8245fb2112 nc处理更新质检单的责任方 1 month ago
jason 3506bf92bf Merge remote-tracking branch 'origin/uat-temp-nht-2506190000-47758' into mes-dev 1 month ago
jason 27ab9ec39b 47758 武汉裁片工单上需要显示对应的裁片代码 1 month ago
logic.fang dca41636a8 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev 1 month ago
logic.fang f0cd2ca1e3 47700 MES-PCN：站点容器绑定问题汇总：（优化） 1 month ago
logic.fang 3c80aa7d99 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev 1 month ago
logic.fang 9f0b69405c 47700 MES-PCN：站点容器绑定问题汇总：（优化） 1 month ago
logic.fang 37af94c1f2 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev 1 month ago
logic.fang 1a60f3cdca 47700 MES-PCN：站点容器绑定问题汇总： 1 month ago
logic.fang 0327f63828 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev 1 month ago
logic.fang 8c3a6b9f10 3533 主数据表设计与开发（容器条码与站点关系表-接口变更） 1 month ago
logic.fang 0408c2ef84 Revert "3533 主数据表设计与开发（容器条码与站点关系表-接口变更）" 
This reverts commit eaf858b684.
 1 month ago
logic.fang eaf858b684 3533 主数据表设计与开发（容器条码与站点关系表-接口变更） 1 month ago
logic.fang a5fc0bbeef Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev 1 month ago
logic.fang d91200dad9 3533 主数据表设计与开发（容器条码与站点关系表-软删除接口请求方式变更） 1 month ago
logic.fang 7886c85e1c 3533 主数据表设计与开发（容器条码与站点关系表） 1 month ago
logic.fang e181519b04 47191 DM202504290012 龙兴工厂CKPT线排序信息拆单需求-EDI功能修改（扫描发运新增“校验是否末单”、“发送用户自定义指令至PLC点位”） 1 month ago
jason f4aedad179 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-47592' into mes-dev 1 month ago
jason 59290bbedc 47592 MES-PCN: 装箱防错，未操作一个小时会自动退出 1 month ago
xiangwei.zhang 5129cddb77 46906 PCN: DM202504180005 电子化检验步骤优化 1 month ago
jason 6d9cdebdc0 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-dataMatrix' into mes-dev 1 month ago
jason ece6e4f88d 修复成都工位端打印DataMatrix格式问题 1 month ago
王杰 1f2bf0a276 Merge branch 'mes-test' into mes-uat-changshu0609 1 month ago
王杰 e73b501e70 打包 编码规则 策略变更 流水号递增不使用零件维度 1 month ago
xiangwei.zhang c95012370f Merge branch 'dev_temp_xw_20250610_46906' into mes-dev 1 month ago
xiangwei.zhang 2b94d171b9 Merge branch 'dev_temp_xw_202506090000_47023' into mes-dev 1 month ago
xiangwei.zhang ad24b7f21e 46906 PCN: DM202504180005 电子化检验步骤优化 1 month ago
xiangwei.zhang a84d2dbb0e 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] 1 month ago
jason 411e5f4b93 Merge remote-tracking branch 'origin/uat-temp-nht-2506050000-47389' into mes-dev 1 month ago
jason 60b5ea30d8 47389 成都零件标签打印模板修改 1 month ago
jason 7bf163abde Merge remote-tracking branch 'origin/uat-temp-nht-2506050000-47389' into mes-dev 2 months ago
jason 3f4e77dec4 47389 成都零件标签打印模板修改 2 months ago
jason 4589dd6fcf Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev 2 months ago
jason b1f6ded5e6 修复电子化检验演示问题 2 months ago
王杰 5d4aafd24b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into mes-test-merge-daxiaoxie 2 months ago
jason 94fedf1bbf Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev 2 months ago
jason 640d87bc3b 47318 电子化检验其他工位不良需报错提示，质检单赋值选择的产线 2 months ago
王杰 c4729819a8 Merge branch 'mes-test' into mes-dev 2 months ago
王杰 20c3601ae9 Merge branch 'mes-uat' into mes-test 2 months ago