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

1099 Commits (ad2a7f8722337db227025f1b771ca63ca6500062)

Author SHA1 Message Date
yxw 550fcee7aa 裁片功能优化 10 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 10 months ago
yxw e9d2615935 裁片功能优化 10 months ago
yxw ab9f3dde09 裁片功能优化 10 months ago
yxw e783d75ae2 裁片功能优化 10 months ago
xiangwei.zhang 213e349773 新增bomCode 10 months ago
jun d2d1d98281 43072 加料防错 料箱自动初始化 10 months ago
jun 2322cc606c 43063 PDA点检重复扫描了同一个条码，希望提示清晰 10 months ago
yxw ab3fd934cf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 312a57c4be 裁片工单标签打印接口开发 10 months ago
jun ca7e6bb915 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun f4ebfa030e 包装解绑功能开发 10 months ago
yxw e798943bfe 裁片工单标签打印工步修改 10 months ago
yxw cab28f1ba8 裁片箱标签打印参数增加时间 10 months ago
yxw 8a0ccc46f9 裁片箱条码打印工步增加修改裁片工单状态为已打印逻辑 10 months ago
yxw 6e90772d0f 裁片箱条码打印 10 months ago
yxw babf855266 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
 10 months ago
yxw a6a399205d 裁片箱条码打印 10 months ago
yxw 226ee0be3f 裁片方案、工单增加属性 10 months ago
jun b387f9c11e 增加常量3定义 10 months ago
jun c454fa84a3 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
 10 months ago
jun e931661d01 包装解绑功能开发 10 months ago
yxw c658a8a5b8 裁片打印策略类 10 months ago
yxw 5ea796fb79 裁片打印工步 10 months ago
王杰 d83d750632 排序装配件确认方式：通用自制件补条码字符 10 months ago
王杰 984a761881 前道防错， 顺序防错 逻辑调整 10 months ago
王杰 da07938e34 扫描主条码 工步 剔除排序场景 10 months ago
王杰 ac408df8b5 排序 设备加工参数工步 10 months ago
王杰 c5d1382724 生产线增加字段 是否忽略 工单质量状态 10 months ago
王杰 d51bcd2278 排序 显示装配件扫描项 10 months ago
王杰 f1f1d8fcdf 前道防错 10 months ago
王杰 ebc7bcd0b4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
王杰 377e8aa2e9 工步弹框 10 months ago
yxw 63cd8c2671 裁片功能 10 months ago
yxw 641c881f94 裁片功能-》弹框展示成品列表Function 10 months ago
xiangwei.zhang 55984cee69 判断可疑 10 months ago
yxw 70de9c9b15 裁片功能-》弹框展示成品列表Function 10 months ago
yxw b99fded8f5 裁片功能-》弹框展示成品列表Function 10 months ago
yxw 4b6d081ede Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw f105f37d7f 裁片功能-》弹框展示成品列表Function 10 months ago
王杰 89c1240140 合并dev 10 months ago
gsz b36912724c SPS物料拉动PCN扫描页面2 10 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 10 months ago
jun 2f3b3b0761 number同时存在大于小于某个字段问题修复 10 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 33cbf3d537 等离子功能开发 10 months ago
gsz 430d3556da 把拉动单打印产线 拉动组多选 10 months ago
gsz 03bf31ef50 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
gsz bc7d209620 SPS物料拉动PCN扫描页面1 10 months ago
jun 96f6e5cdd6 返工拆解逻辑调整 10 months ago
jun 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 8680ee4e9b 原箱进原箱出逻辑开发 10 months ago
王杰 2314130e5a 上下文 物料 10 months ago
王杰 5e1f6de520 工步弹框 10 months ago
王杰 2af9d8f125 工步弹框 10 months ago
jun 59c44cb199 发运单，装车单跳过逻辑调整 10 months ago
jun 17a2254f3a 站点信息基础数据 10 months ago
jun e22af55524 装车单跳过，是否要将装车单关联的发运单也一并完成，同时一并发给WMS 10 months ago
jun bf49601ad1 扫描可回用包装开发 10 months ago
yxw 47dee04a69 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw ae725102b7 保存裁片加工记录 10 months ago
jun d883d077fd 料包绑定增加外协件逻辑 10 months ago
王杰 59fc125885 通用顺序防错工步 10 months ago
jun 0cd56db811 返工代码优化 10 months ago
jun 91ff86f2d3 返工完成方法名事务问题修改 10 months ago
yxw 428e0bdce6 修改原材料长度 10 months ago
jun a63247efc8 返工拆解inspection表里，nc_status增加拆解功能 10 months ago
jun 8a08eaaf53 发运单中默认不写装车单信息，需要反查 10 months ago
jun fd46d3ab15 发运跳过逻辑优化 10 months ago
yxw 54bc6daf7f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw add6da8105 修复原材料防错记录修改长度履历时修改类型不对问题 10 months ago
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 10 months ago
王杰 959eb9aa11 设备计数验证shotCounter 10 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 1e8f6672cf 裁片功能 10 months ago
jun 05d89d34bb Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 2ef4f1e2f0 料包绑定功能开发 10 months ago
yxw df3f552348 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw f6e0ae2118 裁片原材料防错增加长度修改记录 10 months ago
王杰 5cf100bce8 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
王杰 c2b94c2ad6 生成零件号 可复用 10 months ago
王杰 b2325f6ce0 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
王杰 8d704d6a9e 排序顺序防错 10 months ago
yxw 65b902f4ba Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 82db0d1594 10.193.30.22 服务器配置文件 10 months ago
jun b98c50a6e8 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 408911ff1b 返工拆解，查询树形装配件，增加id,pid关联 10 months ago
王杰 3cf7ef6096 Merge branch 'dev' into dev-wuhan 10 months ago
王杰 8789532066 PcnRepositoryAspect 10 months ago
jun d76ad89328 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 3a5e4d844e 重新检测生成单据，同步标识重置 10 months ago
gsz 58811fff06 42984 初检创建时修改人和修改时间不能赋值 10 months ago
yxw 78514c8beb Merge remote-tracking branch 'origin/dev' into dev-wuhan 10 months ago
yxw 2a6bcfc4dc Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 487c627bf8 裁片工单生成问题修复 10 months ago
jun adfcb960c9 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun a4a612bd9c 点检单同步标识未修改 10 months ago
王杰 f894210e6f Merge branch 'dev' into dev-wuhan 10 months ago
王杰 0c88633bfa 删除无用的备份工步 10 months ago
王杰 90e6ff708d Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
王杰 ba80057ac8 读设备数据 写日志 增加 10 months ago
jun 05ccf6501f Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun b731d10d44 电子化检验拆解功能开发 10 months ago
yxw bcf15b1eaa 修改原材料修改记录表 10 months ago
yxw d5d51e0585 Merge remote-tracking branch 'origin/dev' into dev-wuhan 10 months ago
王杰 fae918112f Merge branch 'dev' into dev-wuhan 10 months ago
王杰 f06716eec8 生产零件号 可复用 报错 问题修复 10 months ago
王杰 a2c80f138d 代码写错 10 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 10 months ago
王杰 27b40d6709 设备查询点位数据去除事务 10 months ago
jun bc60e1a2c1 电子化检验拆解功能开发 10 months ago
yxw 9f6afe14fd 解决代码冲突 10 months ago
yxw 92f9a79e97 PCN长度修改类型获取接口 10 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
 10 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
 10 months ago
jun 5a6b1f1d2a Merge remote-tracking branch 'origin/dev' into dev 10 months ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw a8db4e761c 裁片原材料防错 10 months ago
yxw 6537f792ef 裁片原材料防错 10 months ago
jun 43ba2569c1 非排序拆解功能 10 months ago
王杰 a5dd6cf0f3 常量 睡眠2s改500ms 10 months ago
王杰 8e321c50ff wuhan 工单 工步 10 months ago
xiangwei.zhang 25b01eb43c 判断可疑 10 months ago
xiangwei.zhang 17cc0df013 判断可疑 10 months ago
gsz 1ae2f9a3f2 42925 原材料防错优化 10 months ago
yxw 38c4fa0907 裁片功能主数据表 10 months ago
gsz 7fd1e0aa7a Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
gsz 6179c4b4b1 电子化检验 质量状态发生变化后，同步标识改为未同步 10 months ago
jun 2d7e14e916 原材料防错，提交逻辑优化(代码回退) 10 months ago
jun 463a365660 非排序 返工拆解流程开发 10 months ago
jun e8395e2062 非排序 返工拆解流程开发 10 months ago
jun 8dc523d83d PCN和网页端的工单页面做批量报工，生成的条码规则不需要取物料扩展属性的条码规则，取一个固定的规则即可（8位年月日+4位流水号） 10 months ago
jun 9b7c9e4bb2 原材料防错，提交逻辑优化 10 months ago
jun c927a4f9e0 发运单中装车单字段赋值 10 months ago
jun 3d7358c134 设备点检，点检类型：设备点检、工艺参数点检，点击开始点检后，需要强制扫描/输入设备ID 10 months ago
jun 045414d98d 点检功能，工艺参数点检，目前无法完整使用该功能。 10 months ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 10 months ago
jun 4e61e55de5 汇总工单发送SAP逻辑调整 10 months ago
王杰 48d268e2e1 发送设备加工参数, 物料取值变更 10 months ago
王杰 cb2f68baf8 扫描装配件工步 魔鬼数字 改枚举 10 months ago
gsz 5245e00ca9 工位参数按钮事件接口实现【设备停机】FUNCTION_EQU_DOWNTIME 10 months ago
王杰 5f6a79b122 71 239 配置文件 10 months ago
王杰 9d91db16b3 工步操作redis 方法去动词； 读加工结果 增加shot 10 months ago
jun 96924514fb 装配件替换，提示信息优化 10 months ago
jun 603123568f 返工，装配件替换问题修复 10 months ago
gsz 53b5928add 报工job修改 10 months ago
jun 59f9023c23 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 8361a745e6 42786 电子化检验质检完成后，进入NC判定后未记录判定操作人 
42782 装配件替换，目前是选择复选框后，需要按照顺序进行扫描
 10 months ago
gsz d2ef4c8a4a newMesProductOffLine赋值修改SapWorkCenter--祥卫 10 months ago
jun 697d0933ae PDA产品加工记录查询，查询速度优化 10 months ago