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

2023 Commits (588b014422f8dd2df58e669328bf12c2f3098c00)
 

Author SHA1 Message Date
jason 588b014422 Merge branch 'uat-temp-nht-2504140000-46317' into uat-temp-wj-chongqingdaqu-dev 3 months ago
jason 273e022117 修复装车单校验完成后同步标志未变更问题 3 months ago
jason 497cec6e10 Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java
 3 months ago
jason 3408ec22d4 Merge branch 'uat-temp-nht-2504070000-46139' into uat-temp-wj-chongqingdaqu-dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
 3 months ago
jason 9cb395d33d 修复装车单校验完成后同步标志未变更问题 3 months ago
jason adef68a81d 46317 PCN：发运看板最近发运VIN流水号、当天整车数、生产JPH问题解决 3 months ago
jason d89c2ab784 解决排序发运后装车无装车单问题 3 months ago
jason e70c057aa3 Merge branch 'uat-temp-nht-2504100000-46214' into uat-temp-wj-chongqingdaqu-dev 3 months ago
jason 7eb393a508 46214 PCN：发运校验界面，写入发运队列表时，需要配置进行卡控 3 months ago
jason 284bed70e7 解决排序发运后装车无装车单问题 3 months ago
jason 7df592150a Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev 3 months ago
jason 3b7562db16 修复发运校验是否记忆功能 3 months ago
jason c5e83d7b1c 合并bug46139代码 3 months ago
jason 55c8b6b619 装车校验支持按不同发运组进行顺序卡控 3 months ago
王杰 3e8bdb0a23 merge 45787 PDA 点检界面，工单排序顺序：新工单需要显示最前面 3 months ago
jason 880edbdede Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-dev 3 months ago
jason 948ff54ba1 装车单支持多发运组 3 months ago
jason d0bb4145d3 Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
 3 months ago
jason b3e340d251 装车单支持多发运组 3 months ago
王杰 952cbdbae0 排序线 加工记录汇报状态 只看当前工位的装配件的汇报状态 3 months ago
王杰 ce2f10fe98 排序线 加工记录汇报状态 只看当前工位的装配件的汇报状态 3 months ago
jason 6ef5597926 Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev 3 months ago
jason e5bee3dfcd 装车单支持多发运组 3 months ago
xiangwei.zhang 0b2cc11778 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev 3 months ago
xiangwei.zhang 4cc3d98011 Merge branch 'dev_temp_xw_202504090000_46196' into uat-temp-wj-chongqingdaqu-dev 3 months ago
xiangwei.zhang 240080eb58 46196 MES-PCN:返工作业-替换装配件查询应根据product_sn进行查询，不能使用cust_sn 3 months ago
王杰 7619d98390 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 845a7aba45 龙兴排序目视单增加打印属性 工单号 4 months ago
王杰 103480a43c Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 ae9582d18d Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-rfid' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason 89e94c65c1 Merge remote-tracking branch 'origin/uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason 1892779240 修复成都发运扫位置码条码判断问题 4 months ago
jason bf11d54c1e Merge remote-tracking branch 'origin/uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason 4bcdf788f8 修复成都发运Vin号判断问题 4 months ago
王杰 fc93cba1f8 发运rfid工位逻辑变更 增加人工模式 4 months ago
jason 0630bd420f Merge branch 'uat-temp-nht-2504070000-46139' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason 2be53f46ac 46139 CN：发运单的状态增加“已装车”枚举（50），完成装车防错校验后更新为“已装车”状态。 4 months ago
xiangwei.zhang 9135368cc8 45843 
1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工
2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在
 4 months ago
xiangwei.zhang c17d1fb871 Merge branch 'dev_temp_xw_202503310000_45843' into uat-temp-wj-chongqingdaqu-dev 4 months ago
xiangwei.zhang 2ef7005f16 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 a553f8f955 Merge branch 'uat-temp-wj-chongqingdaqu-dev-bak' into uat-temp-wj-chongqingdaqu-prod-temp-rfid 4 months ago
王杰 ba8dd50989 读条码记录日志 去重复 4 months ago
王杰 98cfd3847a 排序线 拍照 工位允许完成状态的工单通过 4 months ago
jason 4ab3775e0d Merge branch 'uat-temp-nht-2504040000-lx' into uat-temp-wj-chongqingdaqu-dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java
 4 months ago
jason 9265f4db7e 修复龙兴发运校验问题 4 months ago
jason 121c55a82f 修复龙兴发运校验问题 4 months ago
王杰 c04b47f955 排序装配件显示列表 增加显示规则逻辑 4 months ago
王杰 1594454f9d Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-pingxinggongwei' into uat-temp-wj-chongqingdaqu-prod 4 months ago
王杰 1b531af014 平行工位问题 4 months ago
王杰 a873f9aeb3 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 4 months ago