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

2164 Commits (7e993be18bb1cccdb0b7e9c24c6aa6cefefd437d)

Author SHA1 Message Date
jason 079a8aad8e 修复成都排序工单打印问题 7 months ago
王杰 ee4b2496ce Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev 7 months ago
logic.fang 77ef72b2f4 赛力斯报表部分迁移至工位端 7 months ago
jason 77a4eee9d4 Merge branch 'uat-temp-nht-2503280000-cdpartsprint' into uat-temp-wj-chongqingdaqu-dev 7 months ago
jason c91f8efba6 修复成都排序工单打印问题 7 months ago
王杰 5e6bd2e36e 排序工单验证工步 bug 7 months ago
王杰 b07c046e4e 排序目视单打印 7 months ago
王杰 27e636b1e5 小鹏新编码规则 7 months ago
王杰 03f0b24ac2 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev-bak 7 months ago
logic.fang 126a694f00 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev 7 months ago
logic.fang bd105b0c8b Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev 7 months ago
jason 6e5173aaab Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev 7 months ago
jason a3c5d923d9 修复成都Volvo发运单打印PCN端问题 7 months ago
王杰 d61f098384 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev-bak 7 months ago
王杰 d0ca6a26eb Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev-bak 7 months ago
王杰 b5c9523665 外库问题 7 months ago
logic.fang d677eef35b 45822 库位与责任关系增加责任关系（拆分优化） 7 months ago
logic.fang 9647eac5cc Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev 7 months ago
logic.fang 4d6b8b5be6 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev 7 months ago
logic.fang 6e877925b6 45822 库位与责任关系增加责任关系 7 months ago
logic.fang 51e4f3663d 45820 电子化检验-NC处理界面（检验人查询优化） 7 months ago
王杰 362dafa25e 扫描可回用包装条码工步 7 months ago
logic.fang bf1030accf Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev 7 months ago
logic.fang 8f1aa79ea0 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev 7 months ago
王杰 23bbd63a4b Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 7 months ago
王杰 463bdf1a40 工位队列接收工步 7 months ago
jason 7c9a93154d Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev 7 months ago
jason 5d1633b833 成都Volvo标签打印修改 7 months ago
王杰 14a601a1c4 深汕工单 7 months ago
jason 766fe359bd 45859:龙兴发运看板无法根据发运组保存数据问题修复 7 months ago
jason d19d75cb54 Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev 7 months ago
jason d9cf70a6f3 Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev 7 months ago
logic.fang 9575ece40c 45820 电子化检验-NC处理界面 7 months ago
王杰 9216019a64 合并深汕工单 7 months ago
王杰 1a456976b1 深汕工单验证 7 months ago
王杰 68769974ee 深汕工单 7 months ago
jason 8240890921 成都标签打印 7 months ago
jason 74f8d654b9 成都发运创建asn问题修复 7 months ago
王杰 ab0229a38f 推单 7 months ago
王杰 0b9b1c2e73 深汕工单 7 months ago
王杰 a535d418f5 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev-bak 7 months ago
王杰 ee1728ee62 合并45135PCN：武汉待排序总成问题 7 months ago
王杰 9281d47101 合并45135PCN：武汉待排序总成问题 7 months ago
王杰 ad4a948e0c Merge remote-tracking branch 'origin/dev-temp-xw-202502170000-45135' into test 7 months ago
王杰 470aff1fd6 45573 PCN-打印方法：customFieldPrintStrategy 修复没有打印出八位年月日的日期 7 months ago
王杰 033319d59f Merge remote-tracking branch 'origin/dev_temp_xw_202503120000_45558' into uat-temp-wj-chongqingdaqu-dev-bak 7 months ago
王杰 c7c99cbe77 Merge remote-tracking branch 'origin/dev_temp_xw_202503120000_45558' into test 7 months ago
王杰 b6fa6e7922 Merge remote-tracking branch 'origin/dev_temp_xw202503020000_45316' into uat-temp-wj-chongqingdaqu-dev-bak 7 months ago
王杰 22a4892215 Merge remote-tracking branch 'origin/dev_temp_xw202503020000_45316' into test 7 months ago
王杰 ae921145f4 Merge remote-tracking branch 'origin/dev_temp_xw_202503100000_45411' into uat-temp-wj-chongqingdaqu-dev-bak 7 months ago
王杰 e662f73c69 Merge remote-tracking branch 'origin/dev_temp_xw_202503100000_45411' into test 7 months ago
王杰 29ee1aed93 龙兴排序平行工位 7 months ago
王杰 fbd6b0cea5 生产线开班只允许开个班组 7 months ago
王杰 4c811b0c9b 礼嘉工位零件打印配置 7 months ago
王杰 8f7a6ad150 非排序打印 增加打印机配置, 是否取物料的打印机 7 months ago
王杰 8080df155a 深汕工单 7 months ago
王杰 d36ada5454 rfid 匹配工步 不用 去掉特殊字符进行比对 7 months ago
王杰 7c42d15787 rfid 匹配工步 不用 去掉特殊字符进行比对 7 months ago
王杰 a07ebfb545 深汕工单 7 months ago
王杰 ab96cf0c6a 龙兴发运单 7 months ago
王杰 de0d2f188e 深汕工单验证 7 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
 7 months ago
jason a8568af626 成都发运代码提交 7 months ago
王杰 e2b2f1ce05 排序发运打印 龙兴 7 months ago
王杰 af973db0c1 深汕工单验证 7 months ago
jason 1d689e8075 成都发运，临时提交 7 months ago
王杰 0d73181b92 龙兴发运单 7 months ago
王杰 8cdb942b89 发运打印 7 months ago
王杰 804b34cd56 pcn发运单打印 7 months ago
王杰 7a4a4db923 pcn 发运单打印 7 months ago
jason ab2a49e0c8 成都发运，临时提交 7 months ago
王杰 fc1c59a8c6 推单 7 months ago
王杰 f8dcad0633 深汕工单 7 months ago
jason 40ae22240f 成都发运，临时提交 7 months ago
王杰 6ebbed58bc 深汕工单验证 7 months ago
王杰 a2972fac11 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 b48a13fd26 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623' into uat-temp-wj-chongqingdaqu-prod 7 months ago
logic.fang 41a2096367 45623 PCN-龙兴装配目视单模板取值调整-新增龙兴方法 7 months ago
logic.fang 7477087af8 Revert "45623 PCN-龙兴装配目视单模板取值调整" 
This reverts commit dca737d9c8.
 7 months ago
王杰 3137abbfa9 推单 7 months ago
王杰 bc1bb87025 推单 7 months ago
王杰 7ed7b181e6 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu-prod 7 months ago
jason 74fd70db6f 成都新增条码生成策略，年份只格式化两位 7 months ago
logic.fang dca737d9c8 45623 PCN-龙兴装配目视单模板取值调整 7 months ago
xiangwei.zhang 57c54e2892 45558 PCN：排序报工job针对非排序报工时有工单和无工单需要分开处理。 7 months ago
xiangwei.zhang 242a3558a7 45558 PCN：排序报工job针对非排序报工时有工单和无工单需要分开处理。 7 months ago
王杰 a7676fa89e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 a562648201 Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45555' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 7960bc7b22 推单 7 months ago
jason dffc97d764 修复Bug：45555，修复写入队列状态改为创建 7 months ago
王杰 31cad1bc26 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 3f72d858e3 推单 7 months ago
王杰 71a7a18e7c Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45555' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 6731579689 解决冲突 7 months ago
王杰 0ef4d6834e 代码占位符写错 修复 7 months ago
王杰 0f0694e116 Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 43ff4c7863 合并 7 months ago
王杰 bc68293588 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 5a0a850499 Merge branch 'uat-temp-wj-shenshanorder' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 1ec300a921 空腔码 bug 在重庆大区改 ,成都工厂尝鲜bug 7 months ago
王杰 b8431e3ec4 合并解决冲突 7 months ago
王杰 8ad85034e9 Merge remote-tracking branch 'origin/uat-temp-logic-20250307-45527' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 25e8681d3f 推单 7 months ago
logic.fang 5f0eb647af 45527 礼嘉福特发运单打印-assyCode排序优化 7 months ago
jason f3f739e8e2 修复Bug45555，零件发运组,扫描确认零件方式增加“扫描目视单”枚举，实现扫描目视单发运校验方式 7 months ago
王杰 6b3145bbaa 合并 uat-temp-nht-2502140000-part-print 解决冲突 7 months ago
王杰 fdc82c4da0 Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 123cac3d14 Merge remote-tracking branch 'origin/uat-temp-wj-250208-manycellbug' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 e232ab0992 推单 7 months ago
王杰 60858c597a 推单 7 months ago
王杰 0a4e306a06 推单 7 months ago
王杰 0c1f4a1545 推单 7 months ago
xiangwei.zhang 4d158194c7 45411 MES: 拉动单拉打印完成后，边端显示已打印，云端未更新 7 months ago
王杰 46a3ea1bd8 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 7caad41035 推单 7 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 7 months ago
王杰 7b04194349 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into uat-temp-wj-chongqingdaqu-prod 7 months ago
jason 4742fb1583 修复bug：45560，根据发运组编码进行配置匹配。 7 months ago
王杰 7d1d6149fc Merge remote-tracking branch 'origin/uat-temp-castle-2502241152-fordFetchWeb' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 4668055c23 推单 7 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
 7 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
 7 months ago
castle.zang d42f88d77a 福特抓取网页增加分页 7 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
 7 months ago
jason 7ac587c05f Merge remote-tracking branch 'origin/uat-temp-logic-20250307-45527' into uat-temp-nht-2502110000-chongqing-step 7 months ago
jason 0c6e965bf0 修复bug：45560，增加系统参数配置MES_SHIPPING_QUEUE_SAVE_CFG，发运组配置后写入mes_shipping_queue，没有配置则不写入。 7 months ago
logic.fang 5dd7bb7eee 45550 PDA-MES-PDA发运扫描排序方式修改（序号提示优化） 7 months ago
王杰 486ed45033 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 1afc3574d8 发运RFI去特殊字符 7 months ago
logic.fang d9c2b6c8b1 45550 PDA-MES-PDA发运扫描排序方式修改 7 months ago
王杰 9dfff1db6e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 4cbaf37b13 发运RFID 7 months ago
王杰 228aa76db7 推单 7 months ago
王杰 98311a5c2d 设备加工参数【排序】发送异常问题修复 7 months ago
王杰 17ec31db78 设备加工参数【排序】发送异常问题修复 7 months ago
王杰 0819b960e2 排序推单 7 months ago
logic.fang 2592f341fe 45527 礼嘉福特发运单打印-优化 7 months ago
logic.fang a53f97b8a0 45527 礼嘉福特发运单打印 7 months ago
王杰 0cf312c04e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 346f8a7bac 推单 7 months ago
王杰 ef30d1db83 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 7b5ffeb7d4 推单 7 months ago
jason 325b82d949 新增看板 7 months ago
王杰 512c06b5dc 龙兴 排序客户条码打印策略 7 months ago
castle.zang 37843777b5 福特抓取网页 7 months ago
castle.zang 0ed0d4e43f 福特抓取网页 7 months ago
王杰 e6e061967b 重庆大区 7 months ago
jason 76f10afa80 去除条码生成规则的零件条码参数卡控逻辑 7 months ago
王杰 ef97dbd871 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu 7 months ago
王杰 613625ce19 代码优化 7 months ago
castle.zang 8d7fed8bbc 福特抓取网页 7 months ago
王杰 8ca9f3fad1 排序推单 7 months ago
jason 4bf1931b39 新增成都条码打印生产时间获取 7 months ago
xiangwei.zhang 36d259b7fa 45316 裁片加工记录表条码对应的数量为1200，生产汇报需要按照1200数量汇报，不能按照数量为1汇报 8 months ago
王杰 50a78c8f08 排序推单展示组件 8 months ago
王杰 84aa53b820 Merge remote-tracking branch 'origin/uat-temp-nht-202502270000-45335' into test 8 months ago
王杰 a9cb79ff8b 排序推单 8 months ago
jason ff3cd4e496 修改礼嘉条码打印包含时分秒的生产日期为条码的创建时间 8 months ago
王杰 25e4d011fe Merge branch 'uat' into uat-temp-wj-lijia-prod 8 months ago
王杰 7036e0f1b4 礼嘉 从重庆分支中单独拉取 根据读条码生成条码工步 8 months ago
王杰 64380a5f5a 工步判可疑 来源库位 代码错误 修正 8 months ago
jason 47233e04c4 修复礼嘉条码打印策略丢失问题 8 months ago
jason f55139b42e 修改龙兴发运看板 8 months ago
王杰 283cc58820 发运RFID 8 months ago
jason ab6f09114a 45335 修复cockpit发运校验明细数据，扫描跳过码后，往mes_jis_shipping表写入数据问题 8 months ago
王杰 e8ec0688dc 45329 PCN：SPS物料拉动，扫描强过码后报系统异常，导致现场无法正常扫描 8 months ago
王杰 b5a9e63d0a Merge branch 'uat-temp-wj-250208-44424' into uat-temp-wj-2502060000-chongqing-step 8 months ago
王杰 1db013d028 合并44424解决冲突 8 months ago
王杰 db21e38959 Merge branch 'uat-temp-wj-250208-44424' into test 8 months ago
王杰 653e9f192b Merge remote-tracking branch 'origin/uat-temp-nht-202502260000-customprint' into test 8 months ago
王杰 cae8f9af41 排序推单 8 months ago
jason 17b7c10a7a 重新提交自定义打印功能，用于合并test 8 months ago
jason b79ad22d6e Merge remote-tracking branch 'origin/uat-temp-nht-2502200000-lijia-sn-print' into uat-temp-nht-250226-lijia 8 months ago
王杰 2ed8052a73 Merge remote-tracking branch 'origin/test-demp-ljs-202501181621-44904' into test 8 months ago
王杰 734b6642ba Merge branch 'test-temp-wj-2501170000-44435' into test 8 months ago
王杰 14dba4b720 排序推单 8 months ago
jason 84c3d427f2 完成龙兴发运看板 8 months ago
xiangwei.zhang 6f9f8f71cc 45135 武汉待排序总成问题 8 months ago
xiangwei.zhang 65c13bdc8f 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
xiangwei.zhang 8eaa0261ba 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
jason ff7b11e271 完成龙兴发运看板 8 months ago
jason cb50635c6c 完成龙兴发运看板 8 months ago
王杰 933eef1adb 排序推单 8 months ago
jason 0dc14ff147 修改龙兴发运看板 8 months ago
xiangwei.zhang 68b186e431 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
xiangwei.zhang 8b3bf424aa 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
castle.zang 9953e8a9ac Merge remote-tracking branch 'origin/uat' into uat 8 months ago
王杰 96e5b5ca58 不可用规则, 排序线 工位设备一对多关系, 代码对应调整 8 months ago
王杰 95af0ecaca 排序推单 8 months ago
王杰 a6c556fd17 排序推单 8 months ago
jason d765e02a4b 新增龙兴发运看板 8 months ago
xiangwei.zhang a276255718 45135 武汉待排序总成问题 8 months ago
jason b30a42946a 新增礼嘉标签模板打印策略 8 months ago
王杰 863ef779fe Merge remote-tracking branch 'origin/uat-temp-castle-250209-kitting' into test 8 months ago
jason b5f2a06b49 新增礼嘉条码打印策略 8 months ago
王杰 fdba01de69 裁片包装模版维护 报错提示信息修改 8 months ago
王杰 26b923b3ca 合并 45034 45035 解决冲突 8 months ago
王杰 9774e051f1 合并45028 批量手动报工页面增加“过账日期”选择条件 解决冲突 8 months ago
王杰 07f55b5967 排序工单显示 优化 8 months ago
xiangwei.zhang cb3d4821a3 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
jason 54ce53f638 新增龙兴发运看板 8 months ago
xiangwei.zhang f15bcc4d74 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
王杰 808f999454 打包 8 months ago
王杰 11348964e4 45151 PCN:电子化检验操作会突然退出登录 8 months ago
xiangwei.zhang f55285ef76 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
xiangwei.zhang f2bc641b5f 45135 PCN：武汉待排序总成问题 8 months ago
王杰 6948872ca3 批次防错:不可用规则 作用于菜单功能中的换件 8 months ago
xiangwei.zhang 0ea05632ed 待排序发运 8 months ago
xiangwei.zhang 7526830899 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
jason 48423a2f67 新增产品二维码生成策略 8 months ago
jason 44a3b7c7de 新增产品二维码生成策略 8 months ago
xiangwei.zhang 0ef0cbb325 待排序发运 8 months ago
王杰 601e1b1b05 根据读取条码生成条码工步 8 months ago
王杰 8b701a9620 打包 空指针异常修复 8 months ago
王杰 cc84bd5b50 演示 问题修复 8 months ago
王杰 b8ad4d5a8b 发运写入发运队列 8 months ago
王杰 b768efd78d 零件打包 缺少工单号字段值 8 months ago
王杰 098688f669 打包进度 8 months ago
王杰 43780c26d2 电子化检验弹框提示信息 8 months ago
王杰 08aa170d99 同步dev 工单类 因为存在冲突 8 months ago
王杰 28078b3a74 45028 批量手动报工页面增加“过账日期”选择条件 - 二次修改, 发现了其他代码BUG: 超工单情况下改工单状态完成 不生效; 超工单报错情况下会偶发缓存问题导致篡改DB的工单信息 8 months ago
王杰 f21eb3380c 44435 PCN：排序下线条码打印配置follow Pisces 8 months ago
castle.zang 4b92608fc5 修复bug 44248 https图片问题 8 months ago
castle.zang 13066579fa 修复bug 44248 https图片问题 8 months ago
王杰 3a2a5a8e1b Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 8 months ago
王杰 4721c5e1ba 批次防错 8 months ago
castle.zang 7afdc57541 Merge remote-tracking branch 'origin/uat' into uat 8 months ago
castle.zang dd0cf7f1b1 修复bug 44248 https图片问题 8 months ago
Janson cdf657f6d0 发运单数据发送到发运队列 8 months ago
Janson 57d8fbab91 45028 批量手动报工页面增加“过账日期”选择条件 8 months ago
王杰 4241dcd230 shipping rfid 8 months ago
xiangwei.zhang 8612803152 45034 PCN：排序报工数据边端汇报了，云端显示未汇报 
45035   PCN：前一天汇总报工job，日志提示错误后，没有将错误原因放在加工记录表备注列
 8 months ago
xiangwei.zhang 628c219cfe 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
xiangwei.zhang e4a812ecf8 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
xiangwei.zhang c6c20e07c2 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
xiangwei.zhang fd5ceb1cbe 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
xiangwei.zhang a5cebd3818 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
castle.zang 4102d444db 深汕kitting 8 months ago
xiangwei.zhang 6e290c1f42 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
王杰 03f5ebc952 保存条码与工单对应关系工步 预留字段赋默认值 8 months ago
王杰 c9dc4b42d2 合并44881 MES:裁片补片逻辑更新 解决冲突 8 months ago
王杰 75d1df7604 Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 8 months ago
xiangwei.zhang f34311bcef 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
xiangwei.zhang ef2c01cbed 44881 MES:裁片补片逻辑更新＆裁片报表 8 months ago
王杰 523bc9810c Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 8 months ago
xiangwei.zhang b10add6bc4 44881 MES:裁片补片逻辑更新＆裁片报表 8 months ago
王杰 d7954e5961 Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 8 months ago
王杰 7c94176cda Merge branch 'uat-temp-wj-250210-45015' into test 8 months ago
王杰 21f0ed4b6c 45015 MES：SPS单据打印，拉动单上面按照库位地址升序 8 months ago
王杰 6c6bd255f5 Merge remote-tracking branch 'origin/dev-temp-nht-202501160000-44744' into test 8 months ago
王杰 9034a345ac 验证通过后切换分屏扫描框工步 系统异常 问题修复 8 months ago
王杰 3b391c1019 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
王杰 b46e6a6a8a 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
王杰 6f1fe719a0 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
王杰 c06eb67236 根据读取条码生成条码;保存条码与工单对应关系;装配件获取匹配工单 三个工步 第一版提交 8 months ago
王杰 3967b7acfd merge 红外焊超差预警 解决冲突 8 months ago
王杰 72998c5878 Merge branch 'test-temp-wj-250117-pack' into uat-temp-wj-2502060000-chongqing-step 8 months ago
王杰 1a5c2272e7 红外焊超差预警 8 months ago
xiangwei.zhang 4fb5c3d50b 44881 MES:裁片补片逻辑更新＆裁片报表 8 months ago
xiangwei.zhang 4e543f517f 44863 PCN-零件生产组增加“禁用Bom版本号”开关最终确认版逻辑优化 9 months ago
王杰 fcd7d440c5 包装补打印 9 months ago
王杰 dca4d89330 包装补打印 9 months ago
王杰 c59e47601d 包装补打印 9 months ago
王杰 712a6603d9 打包 9 months ago
王杰 5bfed2ca8e 打包 9 months ago
王杰 bc39704375 打包 9 months ago
王杰 32b9447a35 打包 9 months ago
王杰 17818f5ea2 打包 9 months ago
王杰 91fbdbed6a 打包 9 months ago
王杰 548ba84f08 44937 PCN：批量手动报工页面，排序方式按照工单号升序 9 months ago
王杰 bd4f18ed84 重庆打包 9 months ago
王杰 1f6fe5e4a0 零件打包 9 months ago
王杰 96f0278f47 Merge remote-tracking branch 'origin/uat-temp-xw-202501170000-44873' into uat 9 months ago
王杰 f241329b41 Merge remote-tracking branch 'origin/dev-temp-xw-202501160000-44858' into uat 9 months ago
王杰 e5cb750081 Merge remote-tracking branch 'origin/dev-temp-nht-202501150000-44584' into uat 9 months ago
王杰 7ea9817b27 打包 9 months ago
王杰 a7b4f79a5f Merge branch 'test-temp-wj-2501170000-00000' into test 9 months ago
王杰 6d4ed9fe69 44887 离线数据回传问题修复 9 months ago
王杰 5aacd09a61 打包 9 months ago
jun 6747c5f14b 44904 PCN-发运异常处理 9 months ago
王杰 2759a1c621 Merge remote-tracking branch 'origin/test-demp-ljs-202501081531-44896' into test 9 months ago
jun 15c86109d5 44896 生产汇报边端同步云端问题修复 9 months ago
王杰 6892759782 44435 PCN：排序下线条码打印配置follow Pisces 9 months ago
王杰 0c74c405de 重庆打包 9 months ago
xiangwei.zhang 2acd70ca6a 44873 PCN-批量报工页面，工单展示顺序基于工单序号正序排列显示 
44883 MES:PCN-批量报工，写入报工表中未写入bom_code
 9 months ago
王杰 5349353ca8 44887 离线数据回传问题修复 9 months ago
xiangwei.zhang db924c2dfa 44858 PCN:设备报废的数据在mes_part_inspection修改人为空，并且数据自动由可疑转正常，同时没有产生初判的移库 
44805 PCN：电子化检验选零件的页面增加单位
 9 months ago
Jason e1bc7f21a0 44744 修复同一条码完成返工后完成质检成功，后续无法再次操作电子化检验问题 9 months ago
王杰 51ba9f967f Merge remote-tracking branch 'origin/uat-temp-castle-2501090929-44791' into test 9 months ago
王杰 14939ea2e5 Merge branch 'uat-temp-wj-2501090000-44517' into test 9 months ago
王杰 712fb6b943 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 86a6b595fd 44517 装箱防错后吐条码需求（芜湖）临时保存提交 9 months ago
王杰 b695fc1742 44517 装箱防错后吐条码需求（芜湖）临时保存提交 9 months ago
Jason df7ac14ebe 44584 修复排序工单发运完成后，条码状态未更新为发运问题。 9 months ago
xiangwei.zhang b7020bb6f4 44838 MES:裁片补片逻辑更新＆裁片报表 9 months ago
王杰 3707bea56e Merge branch 'test-temp-wj-2501140000-44828' into test 9 months ago
王杰 f1f5a07862 Merge remote-tracking branch 'origin/dev-temp-xw-202501031636-44657' into test 9 months ago
王杰 a8ee0646d0 Merge branch 'uat-temp-wj-2412300000-44653' into test 9 months ago
王杰 315703f41d 44828 PCN: 装箱防错需要校验条码的状态 9 months ago
王杰 96900f5e7b 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 5e5e2b4de8 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 8daaa603bf 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 f9c6b5e81b 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 3bdc59534c 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 4a9dabfbf3 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 47e87b8fe1 44517 装箱防错后吐条码需求（芜湖） 9 months ago
castle.zang 8d8d54eafb 44791 迁移线末大屏看板到 pcn 9 months ago
xiangwei.zhang fd82011fab 该类改加工记录毫秒 回退版本 9 months ago
xiangwei.zhang f848b4bcbf Merge branch 'uat' into uat-temp-copydevorderservice 9 months ago
castle.zang eee50bfcdf 44791 迁移线末大屏看板到 pcn 9 months ago
xiangwei.zhang 057f5f0bb1 44729 PDA: 可疑转正常的条码，可以进行发运扫描。 9 months ago
xiangwei.zhang 7da60df921 Merge branch 'uat-temp-xw-2501030000-44701' into test 9 months ago
xiangwei.zhang 685431353d 44703 返工完成后，产生2笔不一样的事务 因合并代码问题修复 9 months ago
王杰 52ee8d84fa Merge branch 'uat-temp-wj-2501030000-44697' into test 9 months ago
王杰 78f658d183 44697 创建状态允许电子化检验 9 months ago
王杰 1edc7329f6 Merge branch 'uat-temp-wj-2412270000-44514' into uat 9 months ago
王杰 ffdf5491c4 Merge branch 'uat-temp-copydevorderservice' into uat 9 months ago
王杰 cd2fdd6026 Merge branch 'uat-temp-wj-2412310000-44666' into uat 9 months ago
王杰 93f6ee6188 Merge branch 'uat-temp-wj-2412300000-44631' into uat 9 months ago
王杰 f0a63f47fb Merge branch 'uat-temp-wj-2412270000-44586' into uat 9 months ago
王杰 b89c6e4775 Merge branch 'uat-temp-wj-2412280000-44630' into uat 9 months ago
王杰 1d4ac69a53 44509 需要边端开发和零件条码状态相关的报表，用来展示未知条码 merge uat-temp-castle-2412301006-44509 解决冲突 9 months ago
王杰 8501f466ea Merge branch 'uat-temp-castle-2412301037-44520&44635' into test 9 months ago
王杰 8e519ae585 Merge branch 'uat-temp-wj-2412270000-44514' into test 9 months ago
王杰 861ff14129 Merge branch 'uat-temp-copydevorderservice' into test 9 months ago
王杰 9f793bb1b8 Merge branch 'uat-temp-wj-2412310000-44673' into test 9 months ago
王杰 02043ac59f Merge branch 'uat-temp-wj-2412310000-44666' into test 9 months ago
王杰 8566676e9e Merge branch 'uat-temp-wj-2412300000-44631' into test 9 months ago
王杰 f1fa426dc5 Merge branch 'uat-temp-wj-2412270000-44586' into test 9 months ago
王杰 4b9beb099d Merge branch 'uat-temp-wj-2412280000-44630' into test 9 months ago
xiangwei.zhang f0ba25d59b 44657 报工前一天job 修改remark 9 months ago
王杰 8402aab2e1 44653 电子化检验输入数量支持小数点输入 9 months ago
王杰 e38af16025 44653 电子化检验输入数量支持小数点输入 9 months ago
王杰 ef4d9490c7 44631 生产过程控制D01CR01A产线，提示“系统异常” (第二次修改: 改工步枚举属性判断错误) 9 months ago
王杰 e01eaadf05 44666 PCN-CBR产成条码打印逻辑优化 10 months ago
xiangwei.zhang df366ba46b 44673 datasync同步与报工JOB同一秒执行同一条加工记录，导致云端为等待汇报，边端已经汇报完成 10 months ago
王杰 eb2878791f 44673 MES：datasync同步与报工JOB同一秒执行同一条加工记录，导致云端为等待汇报，边端已经汇报完成 10 months ago
王杰 144548665f 44666 PCN-CBR产成条码打印逻辑优化 10 months ago
王杰 03029876b6 44653 电子化检验输入数量支持小数点输入 10 months ago
castle.zang e59b940238 44509 查询条码状态-删除依赖的类 10 months ago
王杰 3f0a8b2d62 Merge branch 'uat-temp-wj-2412270000-44586' into uat-temp-wj-2412300000-44653 10 months ago
castle.zang c69884d16a 44509 查询条码状态 10 months ago
castle.zang 86f9128348 44509 查询条码状态 10 months ago
castle.zang e992c4de6d 44635 芜湖排序发运打印 10 months ago
xiangwei.zhang f71fb409d9 未完成数量计算错误-44633 10 months ago
王杰 66ec91c61a 44631 生产过程控制D01CR01A产线，提示“系统异常” 10 months ago
王杰 cc48d20729 44631 生产过程控制D01CR01A产线，提示“系统异常” 10 months ago
castle.zang b910521dc7 44509 pcn端条码报表 10 months ago
xiangwei.zhang 67c053c8bc 未完成数量计算错误 10 months ago
王杰 04f9abeb20 44632 零件发运组 明细不需要校验是否为空 10 months ago