puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
2,200 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 'yfai-20250418-dev'
${ noResults }
Commit Graph

2160 Commits (yfai-20250418-dev)

Author SHA1 Message Date
王杰 1d18681b40 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
jason 24395a9b58 Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev 3 months ago
jason e1f8bca3c6 修复宁德二次发运问题 3 months ago
王杰 851df7994c Merge remote-tracking branch 'origin/uat-temp-nht-2505060001-46742' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 3 months ago
王杰 4997a5819d Merge remote-tracking branch 'origin/uat-temp-nht-2504240000-data-matrix' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 3 months ago
logic.fang 08e9c103cd 46601 电子化检验返工拆解时候需要全部进行拆解 3 months ago
王杰 ce7e467540 礼嘉缝纫批量汇报 3 months ago
王杰 d8186cb52f 礼嘉缝纫批量汇报 3 months ago
jason b83ea0c0e2 Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev 3 months ago
jason ace1efd6d9 46708 PCN-龙兴发运看板增加折线图，和现有看板页面定时翻页显示 3 months ago
jason 5d7b0c91cc Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev 3 months ago
jason 73e5cc9034 宁德二次发运问题修复 3 months ago
王杰 122cb3fa32 46751 MES：设备实时值查询，条码字段没有展示。 3 months ago
王杰 930acdd2af 46751 MES：设备实时值查询，条码字段没有展示。 3 months ago
王杰 60bd600fde 46751 MES：设备实时值查询，条码字段没有展示。 3 months ago
jason 6b47ba660f Merge branch 'uat-temp-nht-2505060001-46742' into yfai-20250418-dev 3 months ago
jason 6aafc9c317 修改成都条码生成策略的CustPartNo取值逻辑 3 months ago
jason 766393f95a 合并宁德二次发运功能 3 months ago
王杰 5f8b5d042e 临时提交 3 months ago
jason 6220d82369 Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev 3 months ago
jason 03c150420c Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into uat-temp-nht-2504300000-46708 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingKanbanCfgServiceImpl.java
 3 months ago
jason 36918bbbfc 46708 PCN-龙兴发运看板增加折线图，和现有看板页面定时翻页显示 3 months ago
jason 9a74a0ffab Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev 3 months ago
王杰 6165cfb243 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 3 months ago
王杰 b7999bbee5 Merge remote-tracking branch 'origin/uat-temp-nht-2505060001-46742' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 3 months ago
王杰 b16fe77a0a 合并龙兴发运看板 3 months ago
王杰 2e5f8e6919 合并龙兴发运 3 months ago
jason 67c3d79905 Merge branch 'uat-temp-nht-2505060001-46742' into yfai-20250418-dev 3 months ago
王杰 373c32d7c0 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 3 months ago
王杰 b06ae8cca3 merge cd 解决冲突 3 months ago
jason 664259ed22 46742 成都零件条码打印客户零件号取值逻辑修改，先取mes_cust_invoiced_part表中的客户零件号。 3 months ago
jason 700c8e6aeb Merge branch 'uat-temp-nht-2505060000-shippingScanSn' into yfai-20250418-dev 3 months ago
jason b1fc30cf85 修复发运排序扫描客户条码发运单明细barcode赋值错误问题 3 months ago
jason 37b2935bb8 Merge branch 'uat-temp-nht-2505060000-shippingScanSn' into yfai-20250418-dev 3 months ago
jason fc4dfeef2f 修复发运排序扫描客户条码发运单明细barcode赋值错误问题 3 months ago
jason 762ed54cf7 46708 PCN-龙兴发运看板增加折线图，和现有看板页面定时翻页显示 3 months ago
jason f60d22c2f2 修复龙兴发运看板生产JPH查询问题 3 months ago
王杰 41724faa8b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 3 months ago
王杰 0dc2272806 合并代码 3 months ago
王杰 a1c552ed75 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 3 months ago
王杰 86196f23c0 合并代码 3 months ago
王杰 af0c638397 Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 3 months ago
jason 5b4231bdc8 46499 MES-PCN: 宁德二次发运逻辑更新 3 months ago
王杰 3c382281b6 Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia' into yfai-20250418-dev 3 months ago
王杰 056b423c31 46664 裁切工单无法打印 3 months ago
王杰 466f7f83eb Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save' into yfai-20250418-dev 3 months ago
王杰 c0966141a2 46648 热板焊接3扫描速度慢 3 months ago
王杰 84990b0f30 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615' into yfai-20250418-dev 3 months ago
王杰 1b09e9a175 46615 MES-PCN：保存工艺参数JOB报错 3 months ago
王杰 e03ad02ae3 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-shipping-repeat-bug' into yfai-20250418-dev 3 months ago
王杰 4ceb411a94 46613 发运扫描条码重复提交问题修复 3 months ago
王杰 15e9bc41cb Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd 3 months ago
jason ddfbe5f0ab 修复二维码打印为dataMatrix格式 3 months ago
王杰 5c6e543f8c Merge remote-tracking branch 'origin/dev_temp_xw_202504170000_45858' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
王杰 5f5f021c9f Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
王杰 c80472d2e2 礼嘉 福特小件发运 第二个table空的异常问题修复 3 months ago
王杰 5dec26fcef 芜湖 设备可疑 系统异常 修复 3 months ago
王杰 d0505ffd72 芜湖 设备可疑 系统异常 修复 3 months ago
王杰 12cc0a015c 芜湖 设备可疑 系统异常 修复 3 months ago
王杰 670e0c8b17 Merge remote-tracking branch 'origin/uat-temp-nht-2504140000-46317' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd 3 months ago
王杰 a049b715c2 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into yfai-20250418-dev 3 months ago
王杰 fd74d045fb Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into yfai-20250418-dev 3 months ago
王杰 fb6f1f02a9 Merge remote-tracking branch 'origin/uat-temp-nht-2504140000-46317' into yfai-20250418-dev 3 months ago
王杰 9a1adf3285 工步方法优化 3 months ago
王杰 7abfa524fd 礼嘉发运单 打印 3 months ago
王杰 bb33823140 礼嘉发运单 打印 3 months ago
王杰 bc9ddc502b 46215 PCN：发运防错增加显示后续待发运单号信息 3 months ago
王杰 42f59c1d9f 46215 PCN：发运防错增加显示后续待发运单号信息 3 months ago
xiangwei.zhang c44d0cdcdf 46317 PCN：发运看板最近发运VIN流水号、当天整车数、生产JPH问题解决 3 months ago
王杰 4d9b9aef77 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into yfai-20250418-dev 3 months ago
王杰 0342d9f4ba 46503 PCN：排序发运卡控product_sn和cust_sn 3 months ago
王杰 0201fd95db Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-publish' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd 3 months ago
王杰 40044b6271 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-publish' into yfai-20250418-dev 3 months ago
王杰 3c1f866b57 Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-merge-cd' into yfai-20250418-dev 3 months ago
王杰 37db6694a3 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia 3 months ago
jason abee8487ec 修改发运单打印生产日期取值问题 3 months ago
jason 0afffbf8f9 修复龙兴发运看板生产JPH统计问题 3 months ago
王杰 673d726962 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-publish' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-merge-cd 3 months ago
jason 36f68e1772 修复创建Volvo 发运单打印生产日期问题 3 months ago
王杰 b5ae36a7ea Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-publish' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-merge-cd 3 months ago
王杰 84b898ce22 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping 3 months ago
王杰 4549c4937f Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping 3 months ago
王杰 6eb1e57e14 礼嘉发运单 3 months ago
王杰 6ddda38d9b merge 46348 排序汇报的汇报类型错误，显示“报工调整” 代码调整 3 months ago
王杰 f48929e914 Merge remote-tracking branch 'origin/dev_temp_xw_202504180000_46348' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 3 months ago
xiangwei.zhang ba847ea723 Merge branch 'dev_temp_xw_202504170000_45858' into yfai-20250418-dev 3 months ago
xiangwei.zhang 529efb5ea0 45858 MES：电子化检验初判和终判批量导入 3 months ago
王杰 489b624b3a Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into yfai-20250418-dev 3 months ago
王杰 0526434f16 加工零件统计Sheet页 3 months ago
xiangwei.zhang 54a681e8f9 Merge branch 'dev_temp_xw_202504180000_46348' into yfai-20250418-dev 3 months ago
xiangwei.zhang dea86d3e38 46348 PCN：排序汇报的汇报类型错误，显示“报工调整” 3 months ago
xiangwei.zhang 876dd2dcce Merge remote-tracking branch 'origin/yfai-20250418-dev' into yfai-20250418-dev 3 months ago
xiangwei.zhang 84d9ef2f57 Merge branch 'dev_temp_xw_202504170000_45858' into yfai-20250418-dev 3 months ago
xiangwei.zhang 06cd72a348 45858 MES：电子化检验初判和终判批量导入 3 months ago
王杰 874f127ea7 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-46420' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 3 months ago
王杰 118400e0dc Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-denglizi' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 3 months ago
王杰 bae43ce630 Merge remote-tracking branch 'origin/uat-temp-nht-2504140000-46317' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 3 months ago
王杰 aa49e3d9b3 merge 46139 3 months ago
王杰 9bc3922048 更新打印状态, 不改同步标志[如果打印在保存加工结果前面会导致未知状态同步到云] 3 months ago
王杰 4e27437e23 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into yfai-20250418-dev 3 months ago