jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
1,956 Commits
55 Branches
28 Tags
11 MiB
uat-temp-wj-chongqingdaqu-dev
uat-temp-wj-2502060000-chongqing-step
uat-temp-nht-2503130000-chengdu-shipping
uat-temp-wj-chongqingdaqu-prod
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623
dev
uat-temp-nht-25027-chengdu
dev_temp_xw_202503120000_45558
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
dev_temp_xw_202503100000_45411
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
dev_temp_xw202503020000_45316
uat
test
uat-temp-nht-250226-lijia
uat-temp-wj-lijia-prod
uat-temp-nht-202502180000-shippingkanban
uat-temp-nht-202502270000-45335
test-temp-wj-45329
uat-temp-nht-202502260000-customprint
dev-temp-xw-202502170000-45135
uat_temp_xw_202502100000_44424
uat-temp-wj-longxin-prod
dev-temp-nht-202502180000-customprint
uat-temp-nht-2502200000-lijia-sn-print
uat-temp-xw-20250220-45119
dev-temp-xw-202502170000-111111
uat-work-order-temp
uat-temp-nht-2502110000-45028
test-temp-wj-2501170000-44435
uat_temp_castle_250213_44248
uat-temp-castle-250211-44248
uat_temp-xw-202502110000-45034
uat-temp-castle-250209-kitting
dev-temp-xw-202502050000-44881
uat-temp-wj-250210-45015
uat-temp-wj-250208-manycellbug
uat-temp-wj-250208-44424
uat-temp-nht-2502060000-44953
uat-temp-wj-250124-equ-check-step
uat-temp-xw-202501250000-44863
test-temp-wj-250117-pack
test-demp-ljs-202501181621-44904
dev-temp-nht-202501160000-44744
dev-temp-xw-202501150000-44838
master
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 '28e6f3fc1c'
${ noResults }
Commit Graph

1931 Commits (28e6f3fc1c30cd55b8e02851254441051533e84d)

Author SHA1 Message Date
jason 28e6f3fc1c Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 2 months ago
jason e024483504 修复Bug：45420，修复批量并发操作卡控问题 2 months ago
jason 5ffe3ed58a Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45556' into dev 2 months ago
jason e5d8013c66 修复Bug：45556，PCN-电子化检验、条码打印的零件查询开窗，要用unit关联 2 months ago
jason 6513564010 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 2 months ago
jason a5df54bc98 修复bug：45420，操作的NC处理，2个人同时操作，产生2笔move数据。 2 months ago
jason 3848cf1545 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into dev 2 months ago
jason 325b82d949 新增看板 2 months ago
臧学普 ed432c6fe1 Merge branch 'uat-temp-castle-2502241152-fordFetchWeb' into dev 2 months ago
臧学普 37843777b5 福特抓取网页 2 months ago
臧学普 0ed0d4e43f 福特抓取网页 2 months ago
王杰 53330ff307 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 2 months ago
jason eadbd49ec2 Merge remote-tracking branch 'origin/uat-temp-nht-2502140000-part-print' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java
 2 months ago
jason 76f10afa80 去除条码生成规则的零件条码参数卡控逻辑 2 months ago
王杰 613625ce19 代码优化 2 months ago
臧学普 8d7fed8bbc 福特抓取网页 2 months ago
王杰 8ca9f3fad1 排序推单 3 months ago
jason b809ff0a7c Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into dev 3 months ago
jason 4bf1931b39 新增成都条码打印生产时间获取 3 months ago
王杰 50a78c8f08 排序推单展示组件 3 months ago
王杰 a9cb79ff8b 排序推单 3 months ago
王杰 ccd746fa64 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 3 months ago
王杰 c3bfa9dc28 工步判可疑 来源库位 代码错误 修正 3 months ago
王杰 64380a5f5a 工步判可疑 来源库位 代码错误 修正 3 months ago
jason aec8a2d3e3 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into dev 3 months ago
jason f55139b42e 修改龙兴发运看板 3 months ago
王杰 283cc58820 发运RFID 3 months ago
jason 982f95191a Merge remote-tracking branch 'origin/uat-temp-nht-202502270000-45335' into dev 3 months ago
jason ab6f09114a 45335 修复cockpit发运校验明细数据，扫描跳过码后，往mes_jis_shipping表写入数据问题 3 months ago
王杰 9f7aa32198 Merge branch 'test-temp-wj-45329' into dev 3 months ago
王杰 e8ec0688dc 45329 PCN：SPS物料拉动，扫描强过码后报系统异常，导致现场无法正常扫描 3 months ago
王杰 b5a9e63d0a Merge branch 'uat-temp-wj-250208-44424' into uat-temp-wj-2502060000-chongqing-step 3 months ago
王杰 1db013d028 合并44424解决冲突 3 months ago
王杰 db21e38959 Merge branch 'uat-temp-wj-250208-44424' into test 3 months ago
王杰 653e9f192b Merge remote-tracking branch 'origin/uat-temp-nht-202502260000-customprint' into test 3 months ago
王杰 cae8f9af41 排序推单 3 months ago
jason 17b7c10a7a 重新提交自定义打印功能，用于合并test 3 months ago
王杰 2ed8052a73 Merge remote-tracking branch 'origin/test-demp-ljs-202501181621-44904' into test 3 months ago
王杰 734b6642ba Merge branch 'test-temp-wj-2501170000-44435' into test 3 months ago
王杰 14dba4b720 排序推单 3 months ago
jason 84c3d427f2 完成龙兴发运看板 3 months ago
xiangwei.zhang c52f12a042 Merge branch 'dev-temp-xw-202502170000-45135' into dev 3 months ago
xiangwei.zhang 6f9f8f71cc 45135 武汉待排序总成问题 3 months ago
xiangwei.zhang 58575c43db Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 65c13bdc8f 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 3 months ago
xiangwei.zhang c651c7ef78 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 8eaa0261ba 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 3 months ago
jason ff7b11e271 完成龙兴发运看板 3 months ago
jason cb50635c6c 完成龙兴发运看板 3 months ago
王杰 933eef1adb 排序推单 3 months ago