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

1021 Commits (2dcadee21bcdca0856be68964ee9a98b0ca87611)

Author SHA1 Message Date
王杰 c5d1382724 生产线增加字段 是否忽略 工单质量状态 8 months ago
王杰 d51bcd2278 排序 显示装配件扫描项 8 months ago
王杰 f1f1d8fcdf 前道防错 8 months ago
王杰 ebc7bcd0b4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 377e8aa2e9 工步弹框 8 months ago
yxw 63cd8c2671 裁片功能 8 months ago
yxw 641c881f94 裁片功能-》弹框展示成品列表Function 8 months ago
xiangwei.zhang 55984cee69 判断可疑 8 months ago
yxw 70de9c9b15 裁片功能-》弹框展示成品列表Function 8 months ago
yxw b99fded8f5 裁片功能-》弹框展示成品列表Function 8 months ago
yxw 4b6d081ede Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw f105f37d7f 裁片功能-》弹框展示成品列表Function 8 months ago
王杰 89c1240140 合并dev 8 months ago
gsz b36912724c SPS物料拉动PCN扫描页面2 8 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 8 months ago
jun 2f3b3b0761 number同时存在大于小于某个字段问题修复 8 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 33cbf3d537 等离子功能开发 8 months ago
gsz 430d3556da 把拉动单打印产线 拉动组多选 8 months ago
gsz 03bf31ef50 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz bc7d209620 SPS物料拉动PCN扫描页面1 8 months ago
jun 96f6e5cdd6 返工拆解逻辑调整 8 months ago
jun 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 8680ee4e9b 原箱进原箱出逻辑开发 8 months ago
王杰 2314130e5a 上下文 物料 8 months ago
王杰 5e1f6de520 工步弹框 8 months ago
王杰 2af9d8f125 工步弹框 8 months ago
jun 59c44cb199 发运单，装车单跳过逻辑调整 8 months ago
jun 17a2254f3a 站点信息基础数据 8 months ago
jun e22af55524 装车单跳过，是否要将装车单关联的发运单也一并完成，同时一并发给WMS 8 months ago
jun bf49601ad1 扫描可回用包装开发 8 months ago
yxw 47dee04a69 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw ae725102b7 保存裁片加工记录 8 months ago
jun d883d077fd 料包绑定增加外协件逻辑 8 months ago
王杰 59fc125885 通用顺序防错工步 8 months ago
jun 0cd56db811 返工代码优化 8 months ago
jun 91ff86f2d3 返工完成方法名事务问题修改 8 months ago
yxw 428e0bdce6 修改原材料长度 8 months ago
jun a63247efc8 返工拆解inspection表里，nc_status增加拆解功能 8 months ago
jun 8a08eaaf53 发运单中默认不写装车单信息，需要反查 8 months ago
jun fd46d3ab15 发运跳过逻辑优化 8 months ago
yxw 54bc6daf7f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw add6da8105 修复原材料防错记录修改长度履历时修改类型不对问题 8 months ago
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 8 months ago
王杰 959eb9aa11 设备计数验证shotCounter 8 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 1e8f6672cf 裁片功能 8 months ago
jun 05d89d34bb Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 2ef4f1e2f0 料包绑定功能开发 8 months ago
yxw df3f552348 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw f6e0ae2118 裁片原材料防错增加长度修改记录 8 months ago
王杰 5cf100bce8 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 8 months ago
王杰 c2b94c2ad6 生成零件号 可复用 8 months ago
王杰 b2325f6ce0 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 8d704d6a9e 排序顺序防错 8 months ago
yxw 65b902f4ba Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 82db0d1594 10.193.30.22 服务器配置文件 8 months ago
jun b98c50a6e8 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun 408911ff1b 返工拆解，查询树形装配件，增加id,pid关联 8 months ago
王杰 3cf7ef6096 Merge branch 'dev' into dev-wuhan 8 months ago
王杰 8789532066 PcnRepositoryAspect 8 months ago
jun d76ad89328 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun 3a5e4d844e 重新检测生成单据，同步标识重置 8 months ago
gsz 58811fff06 42984 初检创建时修改人和修改时间不能赋值 8 months ago
yxw 78514c8beb Merge remote-tracking branch 'origin/dev' into dev-wuhan 8 months ago
yxw 2a6bcfc4dc Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 487c627bf8 裁片工单生成问题修复 8 months ago
jun adfcb960c9 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun a4a612bd9c 点检单同步标识未修改 8 months ago
王杰 f894210e6f Merge branch 'dev' into dev-wuhan 8 months ago
王杰 0c88633bfa 删除无用的备份工步 8 months ago
王杰 90e6ff708d Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 8 months ago
王杰 ba80057ac8 读设备数据 写日志 增加 8 months ago
jun 05ccf6501f Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun b731d10d44 电子化检验拆解功能开发 8 months ago
yxw bcf15b1eaa 修改原材料修改记录表 8 months ago
yxw d5d51e0585 Merge remote-tracking branch 'origin/dev' into dev-wuhan 8 months ago
王杰 fae918112f Merge branch 'dev' into dev-wuhan 8 months ago
王杰 f06716eec8 生产零件号 可复用 报错 问题修复 8 months ago
王杰 a2c80f138d 代码写错 8 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 8 months ago
王杰 27b40d6709 设备查询点位数据去除事务 8 months ago
jun bc60e1a2c1 电子化检验拆解功能开发 8 months ago
yxw 9f6afe14fd 解决代码冲突 8 months ago
yxw 92f9a79e97 PCN长度修改类型获取接口 8 months ago
yxw abc8599d73 Merge remote-tracking branch 'origin/dev' into dev-wuhan 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
 8 months ago
yxw 9841ac7cde Merge remote-tracking branch 'origin/dev' into dev-wuhan 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCollectContext.java
 8 months ago
jun 5a6b1f1d2a Merge remote-tracking branch 'origin/dev' into dev 8 months ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw a8db4e761c 裁片原材料防错 8 months ago
yxw 6537f792ef 裁片原材料防错 8 months ago
jun 43ba2569c1 非排序拆解功能 8 months ago
王杰 a5dd6cf0f3 常量 睡眠2s改500ms 8 months ago
王杰 8e321c50ff wuhan 工单 工步 8 months ago
xiangwei.zhang 25b01eb43c 判断可疑 9 months ago
xiangwei.zhang 17cc0df013 判断可疑 9 months ago
gsz 1ae2f9a3f2 42925 原材料防错优化 9 months ago
yxw 38c4fa0907 裁片功能主数据表 9 months ago
gsz 7fd1e0aa7a Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 9 months ago
gsz 6179c4b4b1 电子化检验 质量状态发生变化后，同步标识改为未同步 9 months ago