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

1941 Commits (0fe38648c45b4548f332d6ff9f05d3535dbb5fe2)

Author SHA1 Message Date
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
jason 0dc14ff147 修改龙兴发运看板 3 months ago
xiangwei.zhang 9c79411f52 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 68b186e431 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 3 months ago
xiangwei.zhang 42ab17b031 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 8b3bf424aa 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 3 months ago
臧学普 9953e8a9ac Merge remote-tracking branch 'origin/uat' into uat 3 months ago
王杰 96e5b5ca58 不可用规则, 排序线 工位设备一对多关系, 代码对应调整 3 months ago
xiangwei.zhang 203ac5a768 Merge remote-tracking branch 'origin/dev' into dev 3 months ago
王杰 95af0ecaca 排序推单 3 months ago
王杰 a6c556fd17 排序推单 3 months ago
jason 83ecd84119 Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 3 months ago
jason ee8360f5fe 修复工步打印问题 3 months ago
jason d765e02a4b 新增龙兴发运看板 3 months ago
xiangwei.zhang 4583b5e931 Merge branch 'dev-temp-xw-202502170000-45135' into dev 3 months ago
xiangwei.zhang a276255718 45135 武汉待排序总成问题 3 months ago
xiangwei.zhang 0a8a7287dc Merge remote-tracking branch 'origin/dev' into dev 3 months ago
jason de53859b0c Merge remote-tracking branch 'origin/uat-temp-nht-2502200000-lijia-sn-print' into dev 3 months ago
jason b30a42946a 新增礼嘉标签模板打印策略 3 months ago
王杰 863ef779fe Merge remote-tracking branch 'origin/uat-temp-castle-250209-kitting' into test 3 months ago
jason b5f2a06b49 新增礼嘉条码打印策略 3 months ago
xiangwei.zhang 7027284179 Merge remote-tracking branch 'origin/dev' into dev 3 months ago
王杰 fdba01de69 裁片包装模版维护 报错提示信息修改 3 months ago
王杰 54413462d8 裁片包装模版维护 报错提示信息修改 3 months ago
王杰 26b923b3ca 合并 45034 45035 解决冲突 3 months ago
王杰 9774e051f1 合并45028 批量手动报工页面增加“过账日期”选择条件 解决冲突 3 months ago
jason 20451aafcc Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 3 months ago
jason 01bdfa295b 修复自定义打印补打问题 3 months ago
王杰 07f55b5967 排序工单显示 优化 3 months ago
xiangwei.zhang 7c0951c37b Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang cb3d4821a3 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 3 months ago
jason 54ce53f638 新增龙兴发运看板 3 months ago
xiangwei.zhang 34eed4efe4 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang f15bcc4d74 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 3 months ago
jason 7d44248a45 Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 3 months ago
jason 0038093c07 修复自定义打印问题 3 months ago
王杰 cacbf941b3 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 3 months ago
王杰 526cdc2bb0 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago
王杰 808f999454 打包 3 months ago
jason 0dc4d80053 修复自定义打印问题 3 months ago
臧学普 53c609b4c2 Merge branch 'uat-temp-castle-250209-kitting' into dev 3 months ago
王杰 11348964e4 45151 PCN:电子化检验操作会突然退出登录 3 months ago
王杰 d706a2ed4c 合并解决冲突 3 months ago
xiangwei.zhang 456ecfe23d Merge branch 'dev-temp-xw-202502170000-45135' into dev 3 months ago
xiangwei.zhang def2ab6318 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang f55285ef76 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 3 months ago
xiangwei.zhang f2bc641b5f 45135 PCN：武汉待排序总成问题 3 months ago
王杰 6948872ca3 批次防错:不可用规则 作用于菜单功能中的换件 3 months ago
xiangwei.zhang 5ec10ea186 Merge branch 'dev-temp-xw-202502170000-111111' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
 3 months ago
xiangwei.zhang 0ea05632ed 待排序发运 3 months ago
xiangwei.zhang 03d835ab7b Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 7526830899 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 3 months ago
王杰 a005f627d8 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago
jason 48423a2f67 新增产品二维码生成策略 3 months ago
jason 44a3b7c7de 新增产品二维码生成策略 3 months ago
xiangwei.zhang 0ef0cbb325 待排序发运 3 months ago
王杰 6a833dd6a3 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago
王杰 601e1b1b05 根据读取条码生成条码工步 3 months ago
王杰 6caf273050 Mt:erge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago
王杰 8b701a9620 打包 空指针异常修复 3 months ago
王杰 ddbc3f2978 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago
王杰 cc84bd5b50 演示 问题修复 3 months ago
王杰 b8ad4d5a8b 发运写入发运队列 3 months ago
王杰 d6e646c26e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago
王杰 b768efd78d 零件打包 缺少工单号字段值 3 months ago
王杰 70648bb380 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago
王杰 098688f669 打包进度 3 months ago
王杰 b6940676b1 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago
王杰 43780c26d2 电子化检验弹框提示信息 3 months ago
王杰 08aa170d99 同步dev 工单类 因为存在冲突 3 months ago
王杰 94c675700a 解决冲突 3 months ago
王杰 28078b3a74 45028 批量手动报工页面增加“过账日期”选择条件 - 二次修改, 发现了其他代码BUG: 超工单情况下改工单状态完成 不生效; 超工单报错情况下会偶发缓存问题导致篡改DB的工单信息 3 months ago
王杰 f936c32dc8 Merge branch 'test-temp-wj-2501170000-44435' into dev 3 months ago
王杰 f21eb3380c 44435 PCN：排序下线条码打印配置follow Pisces 3 months ago
王杰 e2fc1a5acb Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into dev 3 months ago
臧学普 4b92608fc5 修复bug 44248 https图片问题 3 months ago
王杰 4c85ebc1b4 Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-chongqing-step' into dev 3 months ago
王杰 c67e6c85b2 Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into dev 3 months ago
臧学普 13066579fa 修复bug 44248 https图片问题 3 months ago
王杰 ddab9dd2f7 合并重庆大区功能: 发运rfid; 工步批次防错; 工单零件级别顺序防错; 3 months ago
王杰 922cffab1c Merge branch 'test-temp-wj-2501170000-44435' into dev 3 months ago
王杰 3a2a5a8e1b Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 3 months ago
Janson 1c147d44fc Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-45028' into dev 3 months ago
王杰 4721c5e1ba 批次防错 3 months ago
臧学普 7afdc57541 Merge remote-tracking branch 'origin/uat' into uat 3 months ago
臧学普 dd0cf7f1b1 修复bug 44248 https图片问题 3 months ago
Janson cdf657f6d0 发运单数据发送到发运队列 3 months ago
Janson 57d8fbab91 45028 批量手动报工页面增加“过账日期”选择条件 3 months ago
王杰 4241dcd230 shipping rfid 3 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
 3 months ago
xiangwei.zhang 8612803152 45034 PCN：排序报工数据边端汇报了，云端显示未汇报 
45035   PCN：前一天汇总报工job，日志提示错误后，没有将错误原因放在加工记录表备注列
 3 months ago