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

386 Commits (6893124d4c1c1efe0b41b3814ff8a25fef8ff91e)

Author SHA1 Message Date
jun c9d4d0fa2f 排序汇报job开发 11 months ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 11 months ago
王杰 1cb80d9451 merge dev pom冲突 11 months ago
王杰 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 11 months ago
王杰 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 12 months ago
王杰 c39b5a9ab1 排序 保存工单装配件 12 months ago
王杰 413f68de13 保存加工结果 排序 12 months ago
jun b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 12 months ago
jun fc3e0bab38 排序发运功能开发 12 months ago
yxw ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp 12 months ago
yxw a9e45c3a00 装配目视单打印 12 months ago
王杰 9695bfae11 Merge branch 'master' into dev-wuhan-temp 12 months ago
王杰 a431455f9f 保存工艺参数工步 12 months ago
王杰 98843e2581 Merge branch 'master' into dev-wuhan-temp 12 months ago
王杰 c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 12 months ago
王杰 40f8d63189 设备点检 12 months ago
yxw ae996c361c PCN根据产线查询零件生产组信息集合 12 months ago
yxw 91f6148ac7 新增打印工单打印队列 12 months ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 12 months ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 12 months ago
王杰 6f590edc81 Merge branch 'dev-wuhan' into dev-wuhan-temp 12 months ago
王杰 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 12 months ago
王杰 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 12 months ago
王杰 05038cf65c 排序 匹配装配件工步 12 months ago
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 12 months ago
王杰 bbd0f74b5c Merge branch 'dev' 12 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 12 months ago
yxw 3c60fd4487 PCN裁片工单打印 12 months ago
yxw a78238b49c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 12 months ago
yxw e476c0c4dc 裁片相关pojo修改 12 months ago
gsz c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 12 months ago
gsz 932f06d023 JIS物料拉动PCN页面1 12 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 12 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
 12 months ago
jun e931661d01 包装解绑功能开发 12 months ago
王杰 f1f1d8fcdf 前道防错 12 months ago
xiangwei.zhang 55984cee69 判断可疑 12 months ago
yxw 4b6d081ede Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 12 months ago
yxw f105f37d7f 裁片功能-》弹框展示成品列表Function 12 months ago
王杰 89c1240140 合并dev 12 months ago
王杰 49549429cb 漏信号 优化 12 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 12 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 12 months ago
jun 33cbf3d537 等离子功能开发 12 months ago
gsz 03bf31ef50 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 12 months ago
gsz bc7d209620 SPS物料拉动PCN扫描页面1 12 months ago
jun 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 12 months ago
jun 8680ee4e9b 原箱进原箱出逻辑开发 12 months ago
王杰 2314130e5a 上下文 物料 12 months ago
jun e22af55524 装车单跳过，是否要将装车单关联的发运单也一并完成，同时一并发给WMS 1 year ago
jun bf49601ad1 扫描可回用包装开发 1 year ago
yxw 47dee04a69 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw ae725102b7 保存裁片加工记录 1 year ago
jun d883d077fd 料包绑定增加外协件逻辑 1 year ago
王杰 59fc125885 通用顺序防错工步 1 year ago
jun 91ff86f2d3 返工完成方法名事务问题修改 1 year ago
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 1 year ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw 1e8f6672cf 裁片功能 1 year ago
jun 2ef4f1e2f0 料包绑定功能开发 1 year ago
王杰 c2b94c2ad6 生成零件号 可复用 1 year ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 1 year ago
王杰 27b40d6709 设备查询点位数据去除事务 1 year ago
yxw 92f9a79e97 PCN长度修改类型获取接口 1 year 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
 1 year 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
 1 year ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw a8db4e761c 裁片原材料防错 1 year ago
jun 43ba2569c1 非排序拆解功能 1 year ago
王杰 8e321c50ff wuhan 工单 工步 1 year ago
jun 8dc523d83d PCN和网页端的工单页面做批量报工，生成的条码规则不需要取物料扩展属性的条码规则，取一个固定的规则即可（8位年月日+4位流水号） 1 year ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 1 year ago
王杰 9d91db16b3 工步操作redis 方法去动词； 读加工结果 增加shot 1 year ago
jun 8361a745e6 42786 电子化检验质检完成后，进入NC判定后未记录判定操作人 
42782 装配件替换，目前是选择复选框后，需要按照顺序进行扫描
 1 year ago
jun 3f4af68ed3 42602 发运后，客退品返工，生成并打印新条码 
42582 线边库存报表
 1 year ago
王杰 9ee803d5a1 读条码设置最大死循环读取次数配置(工位参数),不设置程序默认10次,超过后退出死循环并转给客户端后再次反复死循环读取 ; 读设备布尔类型,接口逻辑参考值支持True/1 ; False/2, 不区分大小写; 修复工位扫描日志读设备日志记录重复的问题 1 year ago
jun 7db20fcf4b AuthUtil修改为前端传参 1 year ago
jun e30b5fcbb5 装车，发运强过，跳过功能开发 1 year ago
王杰 23b8e9fc51 装配件匹配提示优化 1 year ago
jun fd2cf6d695 PDA产品加工记录查询&PCN报工功能调整 1 year ago
王杰 86f040de3a 时效性验证 1 year ago
jun a1b4eaee52 NC处理代码回退 1 year ago
jun 8c11e1e852 打印模板增加打印时间字段 1 year ago
王杰 0866a27027 查询加工记录表加工厂条件； 匹配加工规则 提示优化；增加配置允许其他工位的未知条码扫描的生产线配置；同零件条码同物料限制汇报一次 1 year ago
王杰 85bf50215e 设备发送加工参数 1 year ago
微笑着面对明天 df8cd11e67 报工问题修改 1 year ago
王杰 0439e49640 系统配置查询方法 1 year ago
jun 98bdb40d14 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun fb6aa9048c 问题清单修复 1 year ago
王杰 3c024dcb89 mes报表验证分表配置 1 year ago
王杰 29759184b6 mes报表验证分表配置 1 year ago
王杰 44d11aef0e mesmove 增加 erp生产线值 1 year ago
王杰 8ea2581ab3 装车单 发运单 问题修改 1 year ago
jun fd5dbfb7df Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 62a45210fd 问题清单修复 1 year ago
王杰 15c5f12837 设备日志 1 year ago
微笑着面对明天 41d8aae13f 报工问题修改 1 year ago
王杰 e66cf87495 工步问题修复 工步调用工步 必须使用 executeInState方法 1 year ago
微笑着面对明天 6506c4626e mqtt修改 1 year ago
微笑着面对明天 5307e78324 报工问题修改 1 year ago
微笑着面对明天 4e9dd5201c mqtt修改 1 year ago
微笑着面对明天 77b8304de0 报工问题修改 1 year ago
微笑着面对明天 486a7f9306 mqtt开发 1 year ago
微笑着面对明天 4ef60c5324 业务履历修改 1 year ago
微笑着面对明天 963a373b9c nc修改 1 year ago
jun ed557c79ab 点检功能优化 1 year ago
王杰 cfea02b3b7 顺序防错 1 year ago
jun 79a5fbbb1e 41794 MES-PDA：点检-新增点检单问题汇总 1 year ago
王杰 e4a5fce755 工艺防错 1 year ago
微笑着面对明天 b53ab28e86 条码履历和加工单履历 1 year ago
王杰 3ee38c6e7a 条码生成 1 year ago
administrator 6b9d3c4b53 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
administrator c5fa5f0127 补录日志--修改处理状态枚举 1 year ago
王杰 b431a1cf03 倒计时 1 year ago
administrator 099cb80f16 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 a443453c9c assemnly skip code 1 year ago
administrator bc901e7130 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 dc2da6c5ba step 1 year ago
王杰 1d6bd87867 时效性验证 1 year ago
微笑着面对明天 434c87fde3 报工问题修改 1 year ago
王杰 fa5046f056 工厂扫描 日志记录 1 year ago
jun 28a6c74ad8 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 1a101affa2 保存设备日志 1 year ago
王杰 c282a05088 设备日志 1 year ago
jun a16c50d568 追溯报表，生成pdf文件 1 year ago
gsz 04e5bed576 根据前一天待报工记录数插入工单并报工job修改 1 year ago
administrator 4273eba96c 补录操作日志 1 year ago
王杰 f595d98629 pcn 客户端下线 1 year ago
王杰 863917dfb7 上下文key 变更 1 year ago
王杰 a6cac78e8d 前道防错工步 1 year ago
jun 7574dfe698 生产开模统计数据发送 
追溯报表开发
 1 year ago
王杰 b416e13e41 前道防错 1 year ago
jun b4f7aad050 生产开模统计job逻辑修改 1 year ago
jun 1ce8b4b480 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun e04184acca 生产开模统计job 1 year ago
微笑着面对明天 1b71d890d8 展示组件 1 year ago
gsz 0943051f02 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 
 Conflicts:
	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java
 1 year ago
gsz 5e715f331a 根据前一天待报工记录数插入工单并报工job 1 year ago
王杰 09dc9c7200 可复用件 1 year ago
王杰 c077635e3c 工序完成 优化 1 year ago
王杰 41126d8e2b pcn 1 year ago
王杰 ff092a3ebb step 1 year ago
王杰 4c3048b236 step 1 year ago
administrator f64efdb8a5 时效性验证接口 1 year ago
jun a53aacb5b9 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun c0ad75b6ff 条码补打二维码生成 1 year ago
王杰 43f74b6ce3 step 1 year ago
王杰 a249d62688 steo 1 year ago
王杰 265bfafe24 step 1 year ago
微笑着面对明天 02d5c0ed65 展示组件 1 year ago