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

984 Commits (8a0ccc46f9e927f20288cf8bca3aff42f5de2430)

Author SHA1 Message Date
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
jun 2d7e14e916 原材料防错，提交逻辑优化(代码回退) 9 months ago
jun 463a365660 非排序 返工拆解流程开发 9 months ago
jun e8395e2062 非排序 返工拆解流程开发 9 months ago
jun 8dc523d83d PCN和网页端的工单页面做批量报工，生成的条码规则不需要取物料扩展属性的条码规则，取一个固定的规则即可（8位年月日+4位流水号） 9 months ago
jun 9b7c9e4bb2 原材料防错，提交逻辑优化 9 months ago
jun c927a4f9e0 发运单中装车单字段赋值 9 months ago
jun 3d7358c134 设备点检，点检类型：设备点检、工艺参数点检，点击开始点检后，需要强制扫描/输入设备ID 9 months ago
jun 045414d98d 点检功能，工艺参数点检，目前无法完整使用该功能。 9 months ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 9 months ago
jun 4e61e55de5 汇总工单发送SAP逻辑调整 9 months ago
王杰 48d268e2e1 发送设备加工参数, 物料取值变更 9 months ago
王杰 cb2f68baf8 扫描装配件工步 魔鬼数字 改枚举 9 months ago
gsz 5245e00ca9 工位参数按钮事件接口实现【设备停机】FUNCTION_EQU_DOWNTIME 9 months ago
王杰 5f6a79b122 71 239 配置文件 9 months ago
王杰 9d91db16b3 工步操作redis 方法去动词； 读加工结果 增加shot 9 months ago
jun 96924514fb 装配件替换，提示信息优化 9 months ago
jun 603123568f 返工，装配件替换问题修复 9 months ago
gsz 53b5928add 报工job修改 9 months ago
jun 59f9023c23 Merge remote-tracking branch 'origin/dev' into dev 9 months ago
jun 8361a745e6 42786 电子化检验质检完成后，进入NC判定后未记录判定操作人 
42782 装配件替换，目前是选择复选框后，需要按照顺序进行扫描
 9 months ago
gsz d2ef4c8a4a newMesProductOffLine赋值修改SapWorkCenter--祥卫 9 months ago
jun 697d0933ae PDA产品加工记录查询，查询速度优化 9 months ago
jun 5dc8837436 Merge remote-tracking branch 'origin/dev' into dev 9 months ago
jun dac6b80993 生产版本和工作中心绑定关系取消 9 months ago
王杰 9147f38645 读设备工步 优化提示 9 months ago
王杰 c37cd5ee60 新增场景：扫主 扫装 生成零件号 9 months ago
王杰 95827228de 扫描装配件2 生成零件号2 新增场景:扫主存在多个加工规则场景的解决方案 9 months ago
jun fa3772b9d0 Merge remote-tracking branch 'origin/dev' into dev 9 months ago
jun 5cb72f5c38 接口映射，自定义脚本页面开发 9 months ago
gsz 95b689b2a1 创建的工单号写到设备加工记录表--唐08-22变更 9 months ago
jun 573d95cbd6 返工打印新条码记录 9 months ago
jun 1ebecd579f Merge remote-tracking branch 'origin/dev' into dev 9 months ago
jun 3399bd2d9a 42660 SAP生计划完成率更新 9 months ago
xiangwei.zhang 6b0e3bca88 判断可疑 9 months ago
jun 2657180fea NC处理，单件条码转正常不校验条码是否存在 9 months ago
jun 3d06845ba9 外部解析条码长度卡控 9 months ago
jun f0f4c667e4 Merge remote-tracking branch 'origin/dev' into dev 9 months ago