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

2098 Commits (dev)

Author SHA1 Message Date
王杰 ab0229a38f 推单 4 months ago
王杰 a535d418f5 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 ee1728ee62 合并45135PCN：武汉待排序总成问题 4 months ago
王杰 9281d47101 合并45135PCN：武汉待排序总成问题 4 months ago
王杰 ad4a948e0c Merge remote-tracking branch 'origin/dev-temp-xw-202502170000-45135' into test 4 months ago
王杰 470aff1fd6 45573 PCN-打印方法：customFieldPrintStrategy 修复没有打印出八位年月日的日期 4 months ago
王杰 033319d59f Merge remote-tracking branch 'origin/dev_temp_xw_202503120000_45558' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 c7c99cbe77 Merge remote-tracking branch 'origin/dev_temp_xw_202503120000_45558' into test 4 months ago
王杰 b6fa6e7922 Merge remote-tracking branch 'origin/dev_temp_xw202503020000_45316' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 22a4892215 Merge remote-tracking branch 'origin/dev_temp_xw202503020000_45316' into test 4 months ago
王杰 ae921145f4 Merge remote-tracking branch 'origin/dev_temp_xw_202503100000_45411' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 e662f73c69 Merge remote-tracking branch 'origin/dev_temp_xw_202503100000_45411' into test 4 months ago
王杰 29ee1aed93 龙兴排序平行工位 4 months ago
王杰 fbd6b0cea5 生产线开班只允许开个班组 4 months ago
王杰 4c811b0c9b 礼嘉工位零件打印配置 4 months ago
王杰 8f7a6ad150 非排序打印 增加打印机配置, 是否取物料的打印机 4 months ago
王杰 d36ada5454 rfid 匹配工步 不用 去掉特殊字符进行比对 4 months ago
王杰 7c42d15787 rfid 匹配工步 不用 去掉特殊字符进行比对 4 months ago
王杰 ab96cf0c6a 龙兴发运单 4 months ago
jason 743e215893 Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' 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
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
 4 months ago
jason a8568af626 成都发运代码提交 4 months ago
王杰 e2b2f1ce05 排序发运打印 龙兴 4 months ago
jason 1d689e8075 成都发运，临时提交 4 months ago
王杰 0d73181b92 龙兴发运单 4 months ago
王杰 72076ac0a9 龙兴发运单 4 months ago
王杰 8cdb942b89 发运打印 4 months ago
王杰 804b34cd56 pcn发运单打印 4 months ago
王杰 7a4a4db923 pcn 发运单打印 4 months ago
jason ab2a49e0c8 成都发运，临时提交 4 months ago
王杰 fc1c59a8c6 推单 4 months ago
jason 40ae22240f 成都发运，临时提交 4 months ago
王杰 a2972fac11 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 b48a13fd26 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623' into uat-temp-wj-chongqingdaqu-prod 5 months ago
logic.fang 41a2096367 45623 PCN-龙兴装配目视单模板取值调整-新增龙兴方法 5 months ago
logic.fang 7477087af8 Revert "45623 PCN-龙兴装配目视单模板取值调整" 
This reverts commit dca737d9c8.
 5 months ago
王杰 3137abbfa9 推单 5 months ago
王杰 bc1bb87025 推单 5 months ago
王杰 7ed7b181e6 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu-prod 5 months ago
jason 0fe38648c4 Merge branch 'uat-temp-nht-25027-chengdu' into dev 5 months ago
jason 74fd70db6f 成都新增条码生成策略，年份只格式化两位 5 months ago
logic.fang dca737d9c8 45623 PCN-龙兴装配目视单模板取值调整 5 months ago
xiangwei.zhang f33390859e Merge branch 'dev_temp_xw_202503120000_45558' into dev 5 months ago
xiangwei.zhang 57c54e2892 45558 PCN：排序报工job针对非排序报工时有工单和无工单需要分开处理。 5 months ago
xiangwei.zhang 242a3558a7 45558 PCN：排序报工job针对非排序报工时有工单和无工单需要分开处理。 5 months ago
王杰 a7676fa89e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 a562648201 Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45555' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 7960bc7b22 推单 5 months ago
jason 24e92050f8 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 5 months ago
jason 9d601a3b3c 修复Bug：45420，修复批量并发操作卡控问题 5 months ago
jason dffc97d764 修复Bug：45555，修复写入队列状态改为创建 5 months ago
王杰 31cad1bc26 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 3f72d858e3 推单 5 months ago
王杰 71a7a18e7c Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45555' into uat-temp-wj-chongqingdaqu-prod 5 months ago
jason b36097d061 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 5 months ago
jason bf93405f1d 修复Bug：45420，修复批量并发操作卡控问题 5 months ago
王杰 6731579689 解决冲突 5 months ago
王杰 0ef4d6834e 代码占位符写错 修复 5 months ago
王杰 0f0694e116 Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 43ff4c7863 合并 5 months ago
王杰 bc68293588 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu-prod 5 months ago
jason 28e6f3fc1c Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 5 months ago
jason e024483504 修复Bug：45420，修复批量并发操作卡控问题 5 months ago
jason 5ffe3ed58a Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45556' into dev 5 months ago
王杰 5a0a850499 Merge branch 'uat-temp-wj-shenshanorder' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 1ec300a921 空腔码 bug 在重庆大区改 ,成都工厂尝鲜bug 5 months ago
jason e5d8013c66 修复Bug：45556，PCN-电子化检验、条码打印的零件查询开窗，要用unit关联 5 months ago
王杰 b8431e3ec4 合并解决冲突 5 months ago
王杰 8ad85034e9 Merge remote-tracking branch 'origin/uat-temp-logic-20250307-45527' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 25e8681d3f 推单 5 months ago
logic.fang 5f0eb647af 45527 礼嘉福特发运单打印-assyCode排序优化 5 months ago
jason f3f739e8e2 修复Bug45555，零件发运组,扫描确认零件方式增加“扫描目视单”枚举，实现扫描目视单发运校验方式 5 months ago
王杰 6b3145bbaa 合并 uat-temp-nht-2502140000-part-print 解决冲突 5 months ago
王杰 fdc82c4da0 Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 123cac3d14 Merge remote-tracking branch 'origin/uat-temp-wj-250208-manycellbug' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 e232ab0992 推单 5 months ago
王杰 60858c597a 推单 5 months ago
王杰 0a4e306a06 推单 5 months ago
王杰 0c1f4a1545 推单 5 months ago
xiangwei.zhang 4d158194c7 45411 MES: 拉动单拉打印完成后，边端显示已打印，云端未更新 5 months ago
王杰 46a3ea1bd8 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 7caad41035 推单 5 months ago
王杰 309a7ab848 Merge branch 'uat-temp-wj-chongqingdaqu-prod' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 7b04194349 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into uat-temp-wj-chongqingdaqu-prod 5 months ago
jason 4742fb1583 修复bug：45560，根据发运组编码进行配置匹配。 5 months ago
王杰 7d1d6149fc Merge remote-tracking branch 'origin/uat-temp-castle-2502241152-fordFetchWeb' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 4668055c23 推单 5 months ago
jason c64c73971f Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
 5 months ago
logic.fang ca85a6f637 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-logic-20250307-45527' into uat-temp-wj-chongqingdaqu-prod 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPartShippingGroupService.java
 5 months ago
臧学普 d42f88d77a 福特抓取网页增加分页 5 months ago
jason 6216692e39 Merge remote-tracking branch 'origin/uat-temp-logic-20250309-45550' into uat-temp-nht-2502110000-chongqing-step 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
 5 months ago
jason 7ac587c05f Merge remote-tracking branch 'origin/uat-temp-logic-20250307-45527' into uat-temp-nht-2502110000-chongqing-step 5 months ago
jason 0c6e965bf0 修复bug：45560，增加系统参数配置MES_SHIPPING_QUEUE_SAVE_CFG，发运组配置后写入mes_shipping_queue，没有配置则不写入。 5 months ago
jason 6513564010 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 5 months ago
jason a5df54bc98 修复bug：45420，操作的NC处理，2个人同时操作，产生2笔move数据。 5 months ago
logic.fang 5dd7bb7eee 45550 PDA-MES-PDA发运扫描排序方式修改（序号提示优化） 5 months ago
王杰 486ed45033 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 1afc3574d8 发运RFI去特殊字符 5 months ago
logic.fang d9c2b6c8b1 45550 PDA-MES-PDA发运扫描排序方式修改 5 months ago
王杰 9dfff1db6e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 4cbaf37b13 发运RFID 5 months ago