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

1859 Commits (4583b5e93160f5dc715a83df064fadee7459475e)

Author SHA1 Message Date
王杰 f936c32dc8 Merge branch 'test-temp-wj-2501170000-44435' into dev 5 months ago
王杰 f21eb3380c 44435 PCN：排序下线条码打印配置follow Pisces 5 months ago
王杰 e2fc1a5acb Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into dev 5 months ago
臧学普 4b92608fc5 修复bug 44248 https图片问题 5 months ago
王杰 4c85ebc1b4 Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-chongqing-step' into dev 5 months ago
王杰 c67e6c85b2 Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into dev 5 months ago
臧学普 13066579fa 修复bug 44248 https图片问题 5 months ago
王杰 ddab9dd2f7 合并重庆大区功能: 发运rfid; 工步批次防错; 工单零件级别顺序防错; 5 months ago
王杰 922cffab1c Merge branch 'test-temp-wj-2501170000-44435' into dev 5 months ago
王杰 3a2a5a8e1b Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 5 months ago
Janson 1c147d44fc Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-45028' into dev 5 months ago
王杰 4721c5e1ba 批次防错 5 months ago
臧学普 dd0cf7f1b1 修复bug 44248 https图片问题 5 months ago
Janson cdf657f6d0 发运单数据发送到发运队列 5 months ago
Janson 57d8fbab91 45028 批量手动报工页面增加“过账日期”选择条件 5 months ago
王杰 4241dcd230 shipping rfid 5 months ago
xiangwei.zhang bdfa78da4f Merge branch 'uat_temp-xw-202502110000-45034' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
 5 months ago
xiangwei.zhang 8612803152 45034 PCN：排序报工数据边端汇报了，云端显示未汇报 
45035   PCN：前一天汇总报工job，日志提示错误后，没有将错误原因放在加工记录表备注列
 5 months ago
xiangwei.zhang 2f55883343 Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang 628c219cfe 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
xiangwei.zhang 306e3acc70 Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang e4a812ecf8 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
xiangwei.zhang c6c20e07c2 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
xiangwei.zhang 26e464b84b Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang fd5ceb1cbe 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
xiangwei.zhang 5766c6eebf Merge branch 'uat_temp_xw_202502100000_44424' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
 5 months ago
xiangwei.zhang a5cebd3818 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
臧学普 4102d444db 深汕kitting 5 months ago
xiangwei.zhang 8b0ce28a1c Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang 6e290c1f42 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
王杰 03f5ebc952 保存条码与工单对应关系工步 预留字段赋默认值 5 months ago
王杰 c9dc4b42d2 合并44881 MES:裁片补片逻辑更新 解决冲突 5 months ago
王杰 75d1df7604 Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 5 months ago
xiangwei.zhang 62e7ef5171 Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang f34311bcef 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
xiangwei.zhang ef2c01cbed 44881 MES:裁片补片逻辑更新＆裁片报表 5 months ago
王杰 523bc9810c Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 5 months ago
xiangwei.zhang 07937c4239 Merge branch 'dev-temp-xw-202502050000-44881' into dev 5 months ago
xiangwei.zhang b10add6bc4 44881 MES:裁片补片逻辑更新＆裁片报表 5 months ago
王杰 d7954e5961 Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 5 months ago
王杰 e3c7e1d282 Merge branch 'uat-temp-wj-250210-45015' into dev 5 months ago
王杰 7c94176cda Merge branch 'uat-temp-wj-250210-45015' into test 5 months ago
王杰 21f0ed4b6c 45015 MES：SPS单据打印，拉动单上面按照库位地址升序 5 months ago
王杰 6c6bd255f5 Merge remote-tracking branch 'origin/dev-temp-nht-202501160000-44744' into test 5 months ago
王杰 cd0c23b45d Merge branch 'uat-temp-wj-250208-manycellbug' into dev 5 months ago
王杰 9034a345ac 验证通过后切换分屏扫描框工步 系统异常 问题修复 5 months ago
王杰 3e91c6c0cb Merge branch 'uat-temp-wj-250208-44424' into dev 5 months ago
王杰 3b391c1019 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
王杰 8a459bea31 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 5 months ago
王杰 def94938db Merge branch 'uat-temp-wj-250208-44424' into dev 5 months ago
王杰 b46e6a6a8a 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
王杰 6f1fe719a0 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
王杰 c06eb67236 根据读取条码生成条码;保存条码与工单对应关系;装配件获取匹配工单 三个工步 第一版提交 5 months ago
Janson cbffd69ac3 Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into dev 5 months ago
Janson 90c099d055 44953 新增条码打印模板的字段支持自定义配置 5 months ago
王杰 3967b7acfd merge 红外焊超差预警 解决冲突 5 months ago
王杰 72998c5878 Merge branch 'test-temp-wj-250117-pack' into uat-temp-wj-2502060000-chongqing-step 5 months ago
王杰 a5788a338a 合并解决冲突 5 months ago
王杰 1a5c2272e7 红外焊超差预警 5 months ago
xiangwei.zhang bee36e00ec Merge branch 'dev-temp-xw-202502050000-44881' into dev 5 months ago
xiangwei.zhang 4fb5c3d50b 44881 MES:裁片补片逻辑更新＆裁片报表 5 months ago
xiangwei.zhang de73649c13 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
xiangwei.zhang 8a55afc42c Merge branch 'uat-temp-xw-202501250000-44863' into dev 5 months ago
xiangwei.zhang 4e543f517f 44863 PCN-零件生产组增加“禁用Bom版本号”开关最终确认版逻辑优化 5 months ago
王杰 21e3ad07d4 Merge branch 'test-temp-wj-250117-pack' into dev 5 months ago
王杰 fcd7d440c5 包装补打印 5 months ago
王杰 be895cc23a Merge branch 'test-temp-wj-250117-pack' into dev 5 months ago
王杰 dca4d89330 包装补打印 5 months ago
王杰 4c8f46dd44 Merge branch 'test-temp-wj-250117-pack' into dev 5 months ago
王杰 c59e47601d 包装补打印 5 months ago
王杰 27fb491e3e Merge branch 'test-temp-wj-250117-pack' into dev 5 months ago
王杰 712a6603d9 打包 5 months ago
王杰 61f6b12119 Merge branch 'test-temp-wj-250117-pack' into dev 5 months ago
王杰 5bfed2ca8e 打包 5 months ago
王杰 6f5b1e5de0 Merge branch 'test-temp-wj-250117-pack' into dev 5 months ago
王杰 bc39704375 打包 5 months ago
王杰 ba025d2f01 Merge branch 'test-temp-wj-250117-pack' into dev 5 months ago
王杰 32b9447a35 打包 5 months ago
王杰 941b979c49 Merge branch 'test-temp-wj-250117-pack' into dev 5 months ago
王杰 17818f5ea2 打包 5 months ago
王杰 b75e9198d9 revert c9e1ee1024 
revert 打包
 5 months ago
王杰 c9e1ee1024 打包 5 months ago
王杰 3b060d3496 Merge branch 'test-temp-wj-250117-pack' into dev 6 months ago
王杰 91fbdbed6a 打包 6 months ago
王杰 ebdb79e7bc Merge branch 'test-temp-wj-250117-pack' into dev 6 months ago
王杰 d8fd96cf28 Merge branch 'uat-temp-wj-250122-44937' into dev 6 months ago
王杰 548ba84f08 44937 PCN：批量手动报工页面，排序方式按照工单号升序 6 months ago
王杰 bd4f18ed84 重庆打包 6 months ago
王杰 1f6fe5e4a0 零件打包 6 months ago
王杰 96f0278f47 Merge remote-tracking branch 'origin/uat-temp-xw-202501170000-44873' into uat 6 months ago
王杰 f241329b41 Merge remote-tracking branch 'origin/dev-temp-xw-202501160000-44858' into uat 6 months ago
王杰 e5cb750081 Merge remote-tracking branch 'origin/dev-temp-nht-202501150000-44584' into uat 6 months ago
王杰 7ea9817b27 打包 6 months ago
王杰 a7b4f79a5f Merge branch 'test-temp-wj-2501170000-00000' into test 6 months ago
王杰 6893124d4c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 6 months ago
王杰 561e4c9c54 Merge branch 'test-temp-wj-2501170000-00000' into dev 6 months ago
王杰 6d4ed9fe69 44887 离线数据回传问题修复 6 months ago
王杰 5aacd09a61 打包 6 months ago
jun 908910e446 Merge branch 'test-demp-ljs-202501181621-44904' into dev 6 months ago
jun 6747c5f14b 44904 PCN-发运异常处理 6 months ago