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
王杰 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
xiangwei.zhang c9d8fc9fb3 Merge branch 'dev_temp_xw_202504170000_45858' into yfai-20250418-dev 3 months ago
xiangwei.zhang ccd313952d 45858 MES：电子化检验初判和终判批量导入 3 months ago
王杰 0cddd49849 MesCommonYear2Service 3 months ago
王杰 7727b7feb4 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into uat-temp-wj-chongqingdaqu-prod-temp-merge-all 3 months ago
王杰 c68e77815a 46281 PCN-按工位统计产量信息 3 months ago
王杰 3a06434acf Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-denglizi' into uat-temp-wj-chongqingdaqu-prod-temp-merge-chengdu 3 months ago
王杰 a1240198eb 46281 PCN-按工位统计产量信息 3 months ago
王杰 b47163bc31 等离子多汇报问题解决 3 months ago
王杰 88837ac681 46420 试制单在工步中默认不汇报 3 months ago
xiangwei.zhang e69d160c0c Merge branch 'dev_temp_xw_202503260000_45858' into dev_temp_xw_202504170000_45858 3 months ago
王杰 24b84acaf0 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into uat-temp-wj-chongqingdaqu-prod-temp-merge-chengdu 3 months ago
王杰 b92a3052ec Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into uat-temp-wj-chongqingdaqu-prod-temp-merge-chengdu 3 months ago
王杰 2c696e89d1 Merge branch 'uat-temp-nht-chengdu-publish' into uat-temp-wj-chongqingdaqu-prod-temp-merge-chengdu 3 months ago
xiangwei.zhang 690b21b224 45858 MES：电子化检验初判和终判批量导入 3 months ago
王杰 8ee6747873 46363 MES: 宁德新条码需要对应模板的开发方法 3 months ago
王杰 aa935176ff 46363 MES: 宁德新条码需要对应模板的开发方法 3 months ago
王杰 f460e311fd 46256 PCN：返工作业页面，点击返工完成后，数量字段为0，产线代码为空 3 months ago
jason adef68a81d 46317 PCN：发运看板最近发运VIN流水号、当天整车数、生产JPH问题解决 3 months ago
jason 824517b558 合并成都Volvo发运单及装车单打印功能 3 months ago
jason 93ea4e647d 合并成都Volvo排序发运功能 3 months ago
王杰 77ddb2cc7c 装配件匹配工步 提示信息优化 3 months ago
王杰 e74aaa03af 控制工单数量 3 months ago
王杰 c623014a76 装配件匹配工步 提示信息优化 3 months ago
王杰 185807b910 调整部分代码涉及到大小写比对的问题 3 months ago
王杰 713fab421f 46319 PCN：装配件时效性规则需要支持大小写 3 months ago
jason 2f9c19ee6b Merge branch 'uat-temp-nht-2504100000-46214' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
jason 3993b18a0e 46214 PCN：发运校验界面，写入发运队列表时，需要配置进行卡控 3 months ago
jason e809114d2c Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
jason d89c2ab784 解决排序发运后装车无装车单问题 3 months ago
王杰 06f83b65f8 test 3 months ago
王杰 d0909faaed 46281 PCN-按工位统计产量信息 4 months ago
王杰 ea0d8b0188 46281 PCN-按工位统计产量信息 4 months ago
王杰 bb93d155e3 控制加工单数量 新表 4 months ago
jason 0a4562c3f5 Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 4 months ago
jason 284bed70e7 解决排序发运后装车无装车单问题 4 months ago
王杰 14e5f7ef2f l临时提交 4 months ago
王杰 59d75d5ae3 临时保存 4 months ago
jason fe6781eadc Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 4 months ago
jason c5e83d7b1c 合并bug46139代码 4 months ago
王杰 3ee2bcece0 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-logic-20250410-46141' into uat-temp-wj-chongqingdaqu-prod-temp-merge 4 months ago
王杰 9ba8c0622d 临时保存 4 months ago
王杰 cfdcbe30b1 临时保存 4 months ago
logic.fang 7855af58a4 46141 PCN：赛力斯JIS单接收日志和赛力斯JIS队列接收日志增加零件类查询条件模糊查询 4 months ago
jason 7546a0a3c2 Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 4 months ago
jason 55c8b6b619 装车校验支持按不同发运组进行顺序卡控 4 months ago
王杰 08fa65f0c1 Merge remote-tracking branch 'origin/dev_temp_xw_202504100000_46256' into uat-temp-wj-chongqingdaqu-prod-temp-merge 4 months ago
王杰 3a81376e60 临时保存 4 months ago
xiangwei.zhang 8b4febd729 46229 PCN：客退品电子化检验，排序线需要支持扫描客户条码和工单号 4 months ago
xiangwei.zhang ad4c284b58 46229 PCN：客退品电子化检验，排序线需要支持扫描客户条码和工单号 4 months ago
王杰 43b301401a 礼嘉提出 可复用条码 再重选工单的时候 需要进行失效 4 months ago
xiangwei.zhang 64b9c12fa2 46256 PCN：返工作业页面，点击返工完成后，数量字段为0，产线代码为空 4 months ago
xiangwei.zhang dd59470280 46256 PCN：返工作业页面，点击返工完成后，数量字段为0，产线代码为空 4 months ago
王杰 6fcb521343 Merge remote-tracking branch 'origin/uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 4 months ago
王杰 caf61b21cb merge 45787 PDA 点检界面，工单排序顺序：新工单需要显示最前面 4 months ago
王杰 1763659468 Merge remote-tracking branch 'origin/dev_temp_xw_202503310000_45843' into uat-temp-wj-chongqingdaqu-prod-temp-merge 4 months ago
jason 948ff54ba1 装车单支持多发运组 4 months ago
jason b3e340d251 装车单支持多发运组 4 months ago
王杰 952cbdbae0 排序线 加工记录汇报状态 只看当前工位的装配件的汇报状态 4 months ago
王杰 ce2f10fe98 排序线 加工记录汇报状态 只看当前工位的装配件的汇报状态 4 months ago
jason 9528d539c0 宁德二次装箱 4 months ago
王杰 845a7aba45 龙兴排序目视单增加打印属性 工单号 4 months ago
王杰 fc93cba1f8 发运rfid工位逻辑变更 增加人工模式 4 months ago
jason f4069c4698 宁德二次装箱 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 9265f4db7e 修复龙兴发运校验问题 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
王杰 4e31c06716 装配件前道防错 4 months ago
王杰 cf2f4fa9af 拍照工位 增加参数 4 months ago
王杰 946d82a776 平行工位 4 months ago
王杰 6dfcc536ef 平行工位的问题处理 4 months ago
xiangwei.zhang 541ce42f21 45858 MES：电子化检验初判和终判批量导入 4 months ago
王杰 f26fe123e3 发运单打印 标题 4 months ago
王杰 c430761019 工艺验证 4 months ago
王杰 f26be6835a Merge branch 'uat-temp-wj-chongqingdaqu-dev-craft-check' into uat-temp-wj-chongqingdaqu-prod 4 months ago
jason 11ffcf1174 宁德二次装箱防错 4 months ago
jason ea375e468b Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java
 4 months ago
jason 558d50f47a 修改发运单打印重复打印问题 4 months ago
王杰 3684f7bbf5 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev-craft-check 4 months ago
王杰 1bc8002b88 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
王杰 b920d30445 重庆 显示前道所有装配件 配置 考虑平行与后端的数据过滤 4 months ago
xiangwei.zhang 40ad390f91 45843 
1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工
2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在
 4 months ago
xiangwei.zhang f70b94e327 45843 
1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工
2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在
 4 months ago
xiangwei.zhang 282e8a6b99 45843 
1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工
2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在
 4 months ago
jason db65d2b1d8 修改发运单打印返回前端提示 4 months ago
xiangwei.zhang 5673649ce4 45843 
1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工
2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在
 4 months ago
王杰 151b4ab534 前道防错 4 months ago
jason c4154e0696 修复成都排序工单打印问题 4 months ago
logic.fang 4248e91bb2 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 22e987369d 赛力斯报表部分迁移至工位端-添加查询条件 4 months ago
王杰 6fb94e98e0 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason 29f053bfb3 Merge branch 'uat-temp-nht-2503280000-cdpartsprint' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 367cfa8964 赛力斯报表部分迁移至工位端-优化 4 months ago
jason e88ea56493 修复成都排序工单打印问题 4 months ago
jason 079a8aad8e 修复成都排序工单打印问题 4 months ago
王杰 ee4b2496ce Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 77ef72b2f4 赛力斯报表部分迁移至工位端 4 months ago