Commit Graph

240 Commits (03bf31ef506f98646a10d3ad81ef56bbad14237d)

Author SHA1 Message Date
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 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 8680ee4e9b 原箱进原箱出逻辑开发 10 months ago
王杰 2314130e5a 上下文 物料 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
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 10 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 1e8f6672cf 裁片功能 10 months ago
jun 2ef4f1e2f0 料包绑定功能开发 10 months ago
王杰 c2b94c2ad6 生成零件号 可复用 10 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 11 months ago
王杰 27b40d6709 设备查询点位数据去除事务 11 months ago
yxw 92f9a79e97 PCN长度修改类型获取接口 11 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
11 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
11 months ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 11 months ago
yxw a8db4e761c 裁片原材料防错 11 months ago
jun 43ba2569c1 非排序拆解功能 11 months ago
王杰 8e321c50ff wuhan 工单 工步 11 months ago
jun 8dc523d83d PCN和网页端的工单页面做批量报工,生成的条码规则不需要取物料扩展属性的条码规则,取一个固定的规则即可(8位年月日+4位流水号) 11 months ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 11 months ago
王杰 9d91db16b3 工步操作redis 方法去动词; 读加工结果 增加shot 11 months ago
jun 8361a745e6 42786 电子化检验质检完成后,进入NC判定后未记录判定操作人
42782 装配件替换,目前是选择复选框后,需要按照顺序进行扫描
11 months ago
jun 3f4af68ed3 42602 发运后,客退品返工,生成并打印新条码
42582 线边库存报表
11 months ago
王杰 9ee803d5a1 读条码设置最大死循环读取次数配置(工位参数),不设置程序默认10次,超过后退出死循环并转给客户端后再次反复死循环读取 ; 读设备布尔类型,接口逻辑参考值支持True/1 ; False/2, 不区分大小写; 修复工位扫描日志读设备日志记录重复的问题 11 months ago
jun 7db20fcf4b AuthUtil修改为前端传参 11 months ago
jun e30b5fcbb5 装车,发运强过,跳过功能开发 11 months ago
王杰 23b8e9fc51 装配件匹配提示优化 11 months ago
jun fd2cf6d695 PDA产品加工记录查询&PCN报工功能调整 12 months ago
王杰 86f040de3a 时效性验证 12 months ago
jun a1b4eaee52 NC处理代码回退 12 months ago
jun 8c11e1e852 打印模板增加打印时间字段 12 months ago
王杰 0866a27027 查询加工记录表加工厂条件; 匹配加工规则 提示优化;增加配置允许其他工位的未知条码扫描的生产线配置;同零件条码同物料限制汇报一次 12 months ago
王杰 85bf50215e 设备发送加工参数 12 months ago
微笑着面对明天 df8cd11e67 报工问题修改 12 months ago
王杰 0439e49640 系统配置查询方法 12 months ago
jun 98bdb40d14 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun fb6aa9048c 问题清单修复 12 months ago
王杰 3c024dcb89 mes报表验证分表配置 12 months ago
王杰 29759184b6 mes报表验证分表配置 12 months 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