jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
1,797 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 'uat-temp-nht-2503100000-45560'
${ noResults }
Commit Graph

501 Commits (uat-temp-nht-2503100000-45560)

Author SHA1 Message Date
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
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 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
王杰 0819b960e2 排序推单 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
王杰 e6e061967b 重庆大区 7 months ago
王杰 8ca9f3fad1 排序推单 7 months ago
jason 4bf1931b39 新增成都条码打印生产时间获取 7 months ago
王杰 50a78c8f08 排序推单展示组件 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
王杰 734b6642ba Merge branch 'test-temp-wj-2501170000-44435' into test 8 months ago
王杰 14dba4b720 排序推单 8 months ago
王杰 933eef1adb 排序推单 8 months ago
王杰 a6c556fd17 排序推单 8 months ago
王杰 b768efd78d 零件打包 缺少工单号字段值 8 months ago
王杰 28078b3a74 45028 批量手动报工页面增加“过账日期”选择条件 - 二次修改, 发现了其他代码BUG: 超工单情况下改工单状态完成 不生效; 超工单报错情况下会偶发缓存问题导致篡改DB的工单信息 8 months ago
王杰 4721c5e1ba 批次防错 8 months ago
王杰 4241dcd230 shipping rfid 8 months ago
xiangwei.zhang f34311bcef 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
王杰 6f1fe719a0 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 8 months ago
王杰 3967b7acfd merge 红外焊超差预警 解决冲突 8 months ago
王杰 1a5c2272e7 红外焊超差预警 8 months ago
王杰 17818f5ea2 打包 9 months ago
王杰 bd4f18ed84 重庆打包 9 months ago
王杰 1f6fe5e4a0 零件打包 9 months ago
王杰 6892759782 44435 PCN：排序下线条码打印配置follow Pisces 9 months ago
王杰 0c74c405de 重庆打包 9 months ago
王杰 14939ea2e5 Merge branch 'uat-temp-wj-2501090000-44517' into test 9 months ago
王杰 a8ee0646d0 Merge branch 'uat-temp-wj-2412300000-44653' into test 9 months ago
王杰 f9c6b5e81b 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 4a9dabfbf3 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 47e87b8fe1 44517 装箱防错后吐条码需求（芜湖） 9 months ago
王杰 b89c6e4775 Merge branch 'uat-temp-wj-2412280000-44630' into uat 9 months ago
王杰 4b9beb099d Merge branch 'uat-temp-wj-2412280000-44630' into test 9 months ago
王杰 03029876b6 44653 电子化检验输入数量支持小数点输入 9 months ago
王杰 75ef282bcf 44423 返工作业页面增加排序拆解按钮 merge 解决冲突 10 months ago
王杰 7462388c13 44630 读胎膜信号工步，无法适配柔性焊流程，需要优化 10 months ago
王杰 6e83356ec4 排序拆解 10 months ago
王杰 379aad9ba4 bom 查询条件 增加配置 10 months ago
王杰 644a60aacf merge dev-temp-wj-2412180000-00000 :pda产品加工记录查询报表修改 解决冲突 10 months ago