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

2197 Commits (0327f6382884e841930ed1a6c927722942d9d9b9)

Author SHA1 Message Date
jason 32c647ec66 Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev 2 months ago
jason 5c1c222e2a 修改工位类型的枚举，避免名称重复 2 months ago
xiangwei.zhang 41d63d1beb 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] 2 months ago
jason ca64d811ed Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev 2 months ago
jason 6390c6b7b5 修改工位类型的枚举，避免名称重复 2 months ago
xiangwei.zhang a19b5b43b2 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] 2 months ago
jason 92d28e9baa Merge remote-tracking branch 'origin/uat-temp-nht-2505260000-47177' into mes-dev 2 months ago
jason 7e7ef291a8 47177 PCN-装箱放错，扫描已经封箱的箱条码，目前只能显示十行已扫描的明细，没有按照实际扫描数量显示 2 months ago
jason a4d30a11d9 Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev 2 months ago
jason b268c7804e 47122 PCN-成都发运单打印加载发运单明细，增加按位置号排序 2 months ago
jason 0766d4e2c6 Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev 2 months ago
jason d731205471 47122 PCN-成都发运单打印加载发运单明细 2 months ago
jason 1b6728d26f Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java
 2 months ago
jason 57fa03f81f 46824 客退电子化检验，NC处理拆解需按照pisces功能按工序退回 2 months ago
jason 958edd3435 46824 客退电子化检验，NC处理拆解需按照pisces功能按工序退回 2 months ago
jason bbdd17796b Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev 2 months ago
jason 083baffc93 47122 PCN-成都发运单打印加载发运单明细 2 months ago
王杰 bb6e82d64f Merge branch 'mes-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into mes-dev 2 months ago
王杰 f6eee29e82 Merge branch 'mes-test-batch-report-bug' into mes-dev 2 months ago
王杰 641a8d5fbd Merge branch 'mes-test-batch-report-bug' into mes-test 2 months ago
王杰 352221cceb Merge branch 'mes-uat-temp-47040' into mes-test 2 months ago
王杰 967cde9401 批量汇报未完成数计数不准bug 2 months ago
jason 3f59ebf496 Merge remote-tracking branch 'origin/uat-temp-nht-2505210000-chengdu-custpart' into mes-dev 2 months ago
jason 72ca534717 合并成都打印及条码生成客户零件号取待开票物料中的客户零件号 2 months ago
王杰 e3d5501b05 合并46894 MES PCN: 吉翔下线条码，客户零件号优先取客户待开票物料 uat-temp-nht202505120000-46757 2 months ago
王杰 ed99eb4389 合并46894 MES PCN: 吉翔下线条码，客户零件号优先取客户待开票物料 uat-temp-nht202505120000-46757 2 months ago
王杰 ce4fce0b7f Merge remote-tracking branch 'origin/uat-temp-nht-2505200000-47042' into mes-test 2 months ago
王杰 375ace3baa Merge remote-tracking branch 'origin/uat-temp-nht-2505160000-46987' into mes-test 2 months ago
王杰 059f00eca3 Merge branch 'mes-uat-temp-47040' into mes-dev 2 months ago
王杰 209911bbdb Merge remote-tracking branch 'origin/uat-temp-nht-2505160000-46987' into mes-dev 2 months ago
王杰 888275dd6b 选择产成零件按钮 2 months ago
王杰 438e4d88df Merge branch 'mes-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into mes-dev 2 months ago
王杰 b665ffbe66 回头46981 电子化检验 NC判定 虚结构不可录入 需求总部不同意变更 2 months ago
王杰 5a8339521b 回头46981 电子化检验 NC判定 虚结构不可录入 需求总部不同意变更 2 months ago
jason 6aa9febaad Merge branch 'uat-temp-nht-2505200000-47042' into mes-dev 2 months ago
jason 73df0409ad 47042 MES: PCN发运校验：发运单明细，优先校验客户待开票物料中对应的零件关系主数据 2 months ago
王杰 a159411fb1 合并 46981 电子化检验 NC判定 虚结构不可录入 解决冲突 2 months ago
jason 7680553d4e 46987 MES&PCN-装箱防错功能，增加配置开关 “包装码中是否为客户零件号”，默认逻辑关闭，为是则包装条码中的零件号为客户零件号。 2 months ago
王杰 a91d27ad85 合并 46981 电子化检验 NC判定 虚结构不可录入 解决冲突 2 months ago
jason 1a2c6efd58 46987 MES&PCN-装箱防错功能，增加配置开关 “包装码中是否为客户零件号”，默认逻辑关闭，为是则包装条码中的零件号为客户零件号。 2 months ago
王杰 c31d5e44c6 合并 46881 PCN：龙兴发运看板优化 解决冲突 2 months ago
王杰 566a91562e 合并 46881 PCN：龙兴发运看板优化 解决冲突 2 months ago
王杰 f41ae22e28 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion' into mes-test 2 months ago
王杰 4c89c16a09 Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into mes-test 2 months ago
王杰 0f576159dc Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into mes-dev 2 months ago
王杰 20c13d6f82 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion' into mes-dev 2 months ago
王杰 300e73dbe2 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into mes-dev 2 months ago
王杰 0c0cdd2465 第二天自动创建工单汇报 生产版本问题 逻辑调整 2 months ago
王杰 0cca6a1765 Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46970' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak 2 months ago
xiangwei.zhang 335dbb8e52 46970 返工拆解查询装配件条码，不能根据装配件条码而要根据id去查询并且修改 2 months ago
王杰 3dbbf23a99 Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46970' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak 2 months ago
xiangwei.zhang e608665df9 46970 返工拆解查询装配件条码，不能根据装配件条码而要根据id去查询并且修改 2 months ago
jason dbf8e91547 46987 MES&PCN-装箱防错功能，增加配置开关 “是否校验工厂代码”，默认逻辑开启，需要校验，字段为空也为校验 2 months ago
jason beee1d6277 46881 PCN：发运看板开启多个导致CPU很高，优化查询SQL 2 months ago
王杰 bee1c8e17c 合并46970礼嘉测试环境批量返工报废不需要从责任人库位移到正常库位，保持不动 解决冲突 2 months ago
xiangwei.zhang 2a0cb8222a 46970 礼嘉测试环境批量返工报废不需要从责任人库位移到正常库位，保持不动 2 months ago
xiangwei.zhang 82556d70a1 46824 [PCN] 1. 增加校验电子化检验次数功能需求; 2. 客退电子化检验，NC处理拆解需按照pisces功能按工序退回 2 months ago
王杰 7576219ed8 合并宁德发运 2 months ago
王杰 b0f2c2cc61 Merge remote-tracking branch 'origin/uat-temp-nht-2504020000-3520' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
王杰 a7e48f928c Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-publish0415' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
王杰 6daaf09684 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
王杰 f1f8f0b68b Merge remote-tracking branch 'origin/uat-temp-nht-202505090001-46746' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
王杰 2284e39a86 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
王杰 f13c1b960a Merge remote-tracking branch 'origin/dev_temp_xw_202505120000_46850' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
王杰 5b67c38b3a Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-lijiabatchreport' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
jason a181c3c0d9 修复宁德二次发运写入JIS_SHIPPING表逻辑 3 months ago
王杰 373dd1e038 大小写问题 3 months ago
王杰 2e08809199 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46428' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
王杰 a2d756cb40 大小写问题 3 months ago
jason 6b67fa78df 46757 代开票业务支持条码打印 3 months ago
jason 4fb98f07a6 修复替换装配件后的查询问题 3 months ago
王杰 7742daad31 46428 PCN：龙兴条码打印直接从数据库里取，不走redis 3 months ago
jason eeacec72bf 修复条码强过后，检验这个条码是不是扫过了 3 months ago
jason edb53d3384 修复替换装配件后的查询问题 3 months ago
xiangwei.zhang 2d06f12771 46850 排序报工慢的问题 3 months ago
jason 5f88ad674a 46746 PCN：在生产控制页面增加“替换装配件”按钮，参考返工作业的“替换装配件”功能 3 months ago
jason ebaebe449e 46746 PCN：在生产控制页面增加“替换装配件”按钮，参考返工作业的“替换装配件”功能 3 months ago
王杰 ce0e486efb Merge branch 'uat-temp-wj-chongqingdaqu-prod-lijiabatchreport' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
王杰 8d4ac268c6 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
王杰 1d18681b40 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 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 ace1efd6d9 46708 PCN-龙兴发运看板增加折线图，和现有看板页面定时翻页显示 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 6aafc9c317 修改成都条码生成策略的CustPartNo取值逻辑 3 months ago
王杰 5f8b5d042e 临时提交 3 months ago
jason 36918bbbfc 46708 PCN-龙兴发运看板增加折线图，和现有看板页面定时翻页显示 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
王杰 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