jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
1,720 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 '03645c13f3'
${ noResults }
Commit Graph

1720 Commits (03645c13f3f4818c04b73c5c905da71adb23a602)
 

Author SHA1 Message Date
王杰 051f8674f9 Merge branch 'dev-temp-xw-2412201000-44315' into dev 5 months ago
xiangwei.zhang 6d5faf79cd 二次电子化初检，需要区分批次和单件 5 months ago
xiangwei.zhang 28c9d5f7b7 二次电子化初检，需要区分批次和单件 5 months ago
臧学普 4002a1ac61 fix bug 44242 PCN:装箱防错，已经关箱的箱条码，如果重复扫描，不需要重置，可以扫描下一个需要装箱的条码 5 months ago
王杰 c54f8c7f37 Merge branch 'uat-temp-wj-241223-44507' into dev 5 months ago
王杰 3626cdb3ce 44507 发运校验，大小写校验去除、需要启用“扫描方式判断” 5 months ago
王杰 cff7de02c1 Merge branch 'dev-temp-castle-2412191916-44449' into dev 5 months ago
王杰 4d64f91d2c 44449 新增Leo接口，通过报工条码查询零件号 5 months ago
王杰 ece7a67bab Merge branch 'dev-temp-castle-2412191916-44449' into dev 5 months ago
臧学普 73d5b9e71b Merge branch 'dev-temp-castle-2412231549-44242' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java
 5 months ago
臧学普 bd44cdb016 Merge branch 'dev-temp-castle-241223-44258' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 5 months ago
臧学普 d410d31d3f fix bug 44242 PCN:装箱防错，已经关箱的箱条码，如果重复扫描，不需要重置，可以扫描下一个需要装箱的条码 5 months ago
臧学普 3a5316bf48 fix bug 44242 PCN:装箱防错，已经关箱的箱条码，如果重复扫描，不需要重置，可以扫描下一个需要装箱的条码 5 months ago
王杰 b59d0a114f Merge branch 'uat-temp-wj-241223-44507' into dev 5 months ago
王杰 0d6824c1db 44507 发运校验，大小写校验去除、需要启用“扫描方式判断” 5 months ago
臧学普 20b69531e1 fix bug 44258 芜湖发运单打印 5 months ago
王杰 d6a455ba77 Merge branch 'dev-temp-wj-2412200000-00000' into test 5 months ago
王杰 9972bcec04 合并44480 扫描一个设备ID, 显示的还是所有的点检单, 不是这个设备的点检单 (dev_temp_xw_20241220140000_44480) 解决冲突 5 months ago
王杰 e12c33f573 Merge branch 'dev-temp-workorder-report' into test 5 months ago
王杰 93a996260a Merge branch 'dev-temp-wj-2412200000-00000' into dev 5 months ago
王杰 a35ae3fab0 44486 MES:加工管理工位补充加工记录：打印件,自进自出,未加工完成未知后,再次扫描被误识别为外协件 5 months ago
王杰 0047ba39ac 44423 返工作业页面增加排序拆解按钮 5 months ago
王杰 340da17f68 44315 条码需要完成质检,再重新录入电子化检验 5 months ago
王杰 e0a2cbd9e2 44315 条码需要完成质检,再重新录入电子化检验 5 months ago
xiangwei.zhang cc88f3dd79 条码需要完成质检,再重新录入电子化检验 5 months ago
王杰 31136522f5 Merge branch 'dev-temp-wj-2412200000-00000' into dev 5 months ago
王杰 ed809a616d 44480 扫描一个设备ID, 显示的还是所有的点检单, 不是这个设备的点检单 5 months ago
王杰 1dca0cb3f3 打印件,自进自出,未加工完成未知后,再次扫描被误识别为外协件的问题修复 5 months ago
xiangwei.zhang a611078a51 合并代码冲突问题 5 months ago
王杰 8689e54762 Merge branch 'dev-temp-workorder-report' into dev 5 months ago
王杰 7892031fa8 合并 dev-temp-xw-2412201000-44315 解决冲突 5 months ago
王杰 63c285faa8 解决冲突 5 months ago
王杰 6e83356ec4 排序拆解 5 months ago
xiangwei.zhang 523991461e 重复报工导致报错修改 5 months ago
xiangwei.zhang ea51058c7b 条码需要完成质检,再重新录入电子化检验 5 months ago
臧学普 600ca579b3 fix bug 44429,报工异常保存到加工结果报表中 5 months ago
臧学普 03f6e6fbce 新增Leo接口，通过报工条码查询零件号 5 months ago
王杰 f95fbce203 Merge branch 'dev-temp-caslte-241218-44247' into dev-temp-workorder-report 5 months ago
王杰 b44d897cb6 Merge branch 'dev-temp-workorder-report-wj-202412190000-00000' into dev 5 months ago
王杰 2112aa63e9 Merge branch 'dev-temp-caslte-241218-44247' into dev 5 months ago
王杰 379aad9ba4 bom 查询条件 增加配置 5 months ago
臧学普 c3324d4736 fix bug 44247 装箱防错分外协件和自制件，自制件的情况下可以不用维护扫描规则 5 months ago
王杰 0994ffd413 Merge branch 'dev-temp-wj-2412180000-44399' into dev 5 months ago
王杰 4a3e42f31f 44399 工位表的工位图的file_ID取 mes_media_file_cfg表的ID 5 months ago
王杰 103f2dcd07 44399 工位表的工位图的file_ID取 mes_media_file_cfg表的ID 5 months ago
王杰 fab425a2db Merge branch 'dev-temp-caslte-241218-44247' into dev 5 months ago
王杰 644a60aacf merge dev-temp-wj-2412180000-00000 :pda产品加工记录查询报表修改 解决冲突 5 months ago
王杰 dd3dddd97f 产品加工记录 查询 报表 页面数据展示优化 (增加当前条码的最新状态工位质量等信息, 修复加工记录列表零件状态空的问题) 5 months ago
臧学普 35a7dce7f9 fix bug 44247 装箱防错分外协件和自制件，自制件的情况下可以不用维护扫描规则 5 months ago
王杰 c391180ce7 Merge branch 'dev-temp-castle-20241217-44178' into dev 5 months ago