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

1570 Commits (70bd1fd55b7c17b78168ed006c9fcc73b89f3496)

Author SHA1 Message Date
王杰 70bd1fd55b Merge branch 'uat-temp-castle-2412250942-44253' into dev 10 months ago
王杰 8ba822d174 Merge branch 'uat-temp-wj-2412260000-44069' into dev 10 months ago
王杰 4e6102f15f 44609 油漆线增加一套打印模版 10 months ago
王杰 1dd4c179f6 Merge branch 'uat-temp-wj-2412241000-44315-44425' into dev 10 months ago
王杰 4d5d0cfb52 Merge branch 'uat-temp-wj-2412240000-44246' into dev 10 months ago
王杰 0d0205d48f Merge branch 'uat-temp-copydevorderservice' into dev 10 months ago
王杰 375b196b3f 合并dev-temp-castle-2412201550-44316 存在冲突 fork uat 后 copy dev 的工单类 后 再copy 44316改动的地方 10 months ago
王杰 414021eee0 44246 每件正常做完，背景变蓝，而报错时背景闪红 10 months ago
castle.zang b335bdd105 修复bug 44253 同Pisces，零件发运组/发运组明细可以实现“前道工艺”校验 10 months ago
王杰 b75199dadc 44425 当有多个线边库位的情况，电子化检验的来源库位如何获取 10 months ago
王杰 d0b86456de Merge branch 'uat-temp-castle-20241224-44242-new' into dev 10 months ago
castle.zang 29cf5385d9 设置扫描的是包装 10 months ago
王杰 5c568266d8 Merge branch 'dev-temp-castle-2412200948-44429' into dev 10 months ago
王杰 70f24a27b4 Merge branch 'uat-temp-xw-2412241000-44315' into test 10 months ago
castle.zang 2837839ff6 统一记录errorMsg 10 months ago
王杰 069890b9c5 uat-temp-xw-2412241000-44315; uat-temp-castle-20241224-44242-new 10 months ago
xiangwei.zhang 6d5faf79cd 二次电子化初检，需要区分批次和单件 10 months ago
castle.zang 4002a1ac61 fix bug 44242 PCN:装箱防错，已经关箱的箱条码，如果重复扫描，不需要重置，可以扫描下一个需要装箱的条码 10 months ago
王杰 c54f8c7f37 Merge branch 'uat-temp-wj-241223-44507' into dev 10 months ago
王杰 3626cdb3ce 44507 发运校验，大小写校验去除、需要启用“扫描方式判断” 10 months ago
王杰 cff7de02c1 Merge branch 'dev-temp-castle-2412191916-44449' into dev 10 months ago
王杰 4d64f91d2c 44449 新增Leo接口，通过报工条码查询零件号 10 months ago
王杰 ece7a67bab Merge branch 'dev-temp-castle-2412191916-44449' into dev 10 months ago
castle.zang 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
 10 months ago
castle.zang bd44cdb016 Merge branch 'dev-temp-castle-241223-44258' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
castle.zang d410d31d3f fix bug 44242 PCN:装箱防错，已经关箱的箱条码，如果重复扫描，不需要重置，可以扫描下一个需要装箱的条码 10 months ago
castle.zang 3a5316bf48 fix bug 44242 PCN:装箱防错，已经关箱的箱条码，如果重复扫描，不需要重置，可以扫描下一个需要装箱的条码 10 months ago
王杰 b59d0a114f Merge branch 'uat-temp-wj-241223-44507' into dev 10 months ago
王杰 0d6824c1db 44507 发运校验，大小写校验去除、需要启用“扫描方式判断” 10 months ago
castle.zang 20b69531e1 fix bug 44258 芜湖发运单打印 10 months ago
王杰 d6a455ba77 Merge branch 'dev-temp-wj-2412200000-00000' into test 10 months ago
王杰 9972bcec04 合并44480 扫描一个设备ID, 显示的还是所有的点检单, 不是这个设备的点检单 (dev_temp_xw_20241220140000_44480) 解决冲突 10 months ago
王杰 e12c33f573 Merge branch 'dev-temp-workorder-report' into test 10 months ago
王杰 93a996260a Merge branch 'dev-temp-wj-2412200000-00000' into dev 10 months ago
王杰 a35ae3fab0 44486 MES:加工管理工位补充加工记录：打印件,自进自出,未加工完成未知后,再次扫描被误识别为外协件 10 months ago
王杰 0047ba39ac 44423 返工作业页面增加排序拆解按钮 10 months ago
王杰 340da17f68 44315 条码需要完成质检,再重新录入电子化检验 10 months ago
王杰 e0a2cbd9e2 44315 条码需要完成质检,再重新录入电子化检验 10 months ago
xiangwei.zhang cc88f3dd79 条码需要完成质检,再重新录入电子化检验 10 months ago
王杰 31136522f5 Merge branch 'dev-temp-wj-2412200000-00000' into dev 10 months ago
王杰 ed809a616d 44480 扫描一个设备ID, 显示的还是所有的点检单, 不是这个设备的点检单 10 months ago
王杰 1dca0cb3f3 打印件,自进自出,未加工完成未知后,再次扫描被误识别为外协件的问题修复 10 months ago
xiangwei.zhang a611078a51 合并代码冲突问题 10 months ago
王杰 8689e54762 Merge branch 'dev-temp-workorder-report' into dev 10 months ago
王杰 7892031fa8 合并 dev-temp-xw-2412201000-44315 解决冲突 10 months ago
王杰 63c285faa8 解决冲突 10 months ago
王杰 6e83356ec4 排序拆解 10 months ago
xiangwei.zhang 523991461e 重复报工导致报错修改 10 months ago
xiangwei.zhang ea51058c7b 条码需要完成质检,再重新录入电子化检验 10 months ago
castle.zang 600ca579b3 fix bug 44429,报工异常保存到加工结果报表中 10 months ago