Commit Graph

423 Commits (0fe38648c45b4548f332d6ff9f05d3535dbb5fe2)

Author SHA1 Message Date
jun 3b3e8014b5 武汉汇报job&装配目视单打印问题修复 7 months ago
jun 61c351f458 芜湖发运增加唯一性校验 7 months ago
王杰 d693da28c8 扫描产成零件工步 7 months ago
王杰 96c55eaad5 排序装配件 保存 记录 bug 修复 7 months ago
臧学普 12ca42f386 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 84361a3027 查询条件没加工厂代码排查 7 months ago
臧学普 5c53be2c16 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java
7 months ago
臧学普 08b0b58982 重构sps代码 7 months ago
王杰 bc8533f0c8 装配件 唯一性 验证 增加 模内验证 7 months ago
jun 827ba97c7b 应急件库位管理演示问题修复 7 months ago
jun e2433f1a78 打印模板调整 7 months ago
jun b1f27d6e72 SPS 生成webservice从MES换到PCN 7 months ago
jun 18b4d11e9b CBR报工逻辑调整 7 months ago
王杰 bd72537b82 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 7 months ago
王杰 5af8d8faf8 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
jun 176fb4505f 应急件库位管理开发 7 months ago
jun d709c834d5 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
臧学普 54caad459e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 409c979c0e 优化电测试 7 months ago
jun 428a3d8884 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 31de710227 客户条码补打 7 months ago
王杰 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 e92c29a07a 装配件扫描 置顶 7 months ago
王杰 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 b118f22767 Merge branch 'master' into dev-wuhan-temp 7 months ago
臧学普 e8b651168f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
臧学普 1ebb40569f 电测试 7 months ago
王杰 d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 5f604adc9d 显示前道所有装配件 7 months ago
王杰 ab8cb55e4a Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 fdf8c283e8 设备日志明细分表 7 months ago
臧学普 ad2a7f8722 电测试开发 7 months ago
王杰 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 797904c87a Merge branch 'dev' 8 months ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 8 months ago
gsz 44f72a56a6 PCN发运单打印页面1 8 months ago
王杰 d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
jun c9d4d0fa2f 排序汇报job开发 8 months ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 1cb80d9451 merge dev pom冲突 8 months ago
王杰 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 8 months ago
王杰 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 c39b5a9ab1 排序 保存工单装配件 8 months ago
王杰 413f68de13 保存加工结果 排序 8 months ago
jun b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun fc3e0bab38 排序发运功能开发 8 months ago
yxw ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
yxw a9e45c3a00 装配目视单打印 8 months ago
王杰 9695bfae11 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 a431455f9f 保存工艺参数工步 8 months ago
王杰 98843e2581 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 40f8d63189 设备点检 8 months ago
yxw ae996c361c PCN根据产线查询零件生产组信息集合 8 months ago
yxw 91f6148ac7 新增打印工单打印队列 8 months ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 8 months ago
王杰 6f590edc81 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 8 months ago
王杰 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 05038cf65c 排序 匹配装配件工步 8 months ago
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 bbd0f74b5c Merge branch 'dev' 8 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 8 months ago
yxw 3c60fd4487 PCN裁片工单打印 8 months ago
yxw a78238b49c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw e476c0c4dc 裁片相关pojo修改 8 months ago
gsz c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz 932f06d023 JIS物料拉动PCN页面1 8 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 8 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
8 months ago
jun e931661d01 包装解绑功能开发 8 months ago
王杰 f1f1d8fcdf 前道防错 8 months ago
xiangwei.zhang 55984cee69 判断可疑 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
王杰 49549429cb 漏信号 优化 8 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 8 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 33cbf3d537 等离子功能开发 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 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 8680ee4e9b 原箱进原箱出逻辑开发 8 months ago
王杰 2314130e5a 上下文 物料 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 91ff86f2d3 返工完成方法名事务问题修改 8 months ago
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 8 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 1e8f6672cf 裁片功能 8 months ago
jun 2ef4f1e2f0 料包绑定功能开发 8 months ago
王杰 c2b94c2ad6 生成零件号 可复用 8 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 8 months ago
王杰 27b40d6709 设备查询点位数据去除事务 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
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw a8db4e761c 裁片原材料防错 8 months ago
jun 43ba2569c1 非排序拆解功能 8 months ago
王杰 8e321c50ff wuhan 工单 工步 8 months ago
jun 8dc523d83d PCN和网页端的工单页面做批量报工,生成的条码规则不需要取物料扩展属性的条码规则,取一个固定的规则即可(8位年月日+4位流水号) 9 months ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 9 months ago
王杰 9d91db16b3 工步操作redis 方法去动词; 读加工结果 增加shot 9 months ago
jun 8361a745e6 42786 电子化检验质检完成后,进入NC判定后未记录判定操作人
42782 装配件替换,目前是选择复选框后,需要按照顺序进行扫描
9 months ago
jun 3f4af68ed3 42602 发运后,客退品返工,生成并打印新条码
42582 线边库存报表
9 months ago
王杰 9ee803d5a1 读条码设置最大死循环读取次数配置(工位参数),不设置程序默认10次,超过后退出死循环并转给客户端后再次反复死循环读取 ; 读设备布尔类型,接口逻辑参考值支持True/1 ; False/2, 不区分大小写; 修复工位扫描日志读设备日志记录重复的问题 9 months ago
jun 7db20fcf4b AuthUtil修改为前端传参 9 months ago
jun e30b5fcbb5 装车,发运强过,跳过功能开发 9 months ago
王杰 23b8e9fc51 装配件匹配提示优化 9 months ago
jun fd2cf6d695 PDA产品加工记录查询&PCN报工功能调整 9 months ago
王杰 86f040de3a 时效性验证 9 months ago
jun a1b4eaee52 NC处理代码回退 9 months ago
jun 8c11e1e852 打印模板增加打印时间字段 9 months ago
王杰 0866a27027 查询加工记录表加工厂条件; 匹配加工规则 提示优化;增加配置允许其他工位的未知条码扫描的生产线配置;同零件条码同物料限制汇报一次 10 months ago
王杰 85bf50215e 设备发送加工参数 10 months ago
微笑着面对明天 df8cd11e67 报工问题修改 10 months ago
王杰 0439e49640 系统配置查询方法 10 months ago
jun 98bdb40d14 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun fb6aa9048c 问题清单修复 10 months ago
王杰 3c024dcb89 mes报表验证分表配置 10 months ago
王杰 29759184b6 mes报表验证分表配置 10 months ago
王杰 44d11aef0e mesmove 增加 erp生产线值 10 months ago
王杰 8ea2581ab3 装车单 发运单 问题修改 10 months ago
jun fd5dbfb7df Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 62a45210fd 问题清单修复 10 months ago
王杰 15c5f12837 设备日志 10 months ago
微笑着面对明天 41d8aae13f 报工问题修改 10 months ago
王杰 e66cf87495 工步问题修复 工步调用工步 必须使用 executeInState方法 10 months ago
微笑着面对明天 6506c4626e mqtt修改 10 months ago
微笑着面对明天 5307e78324 报工问题修改 10 months ago
微笑着面对明天 4e9dd5201c mqtt修改 10 months ago
微笑着面对明天 77b8304de0 报工问题修改 10 months ago
微笑着面对明天 486a7f9306 mqtt开发 10 months ago
微笑着面对明天 4ef60c5324 业务履历修改 10 months ago
微笑着面对明天 963a373b9c nc修改 10 months ago
jun ed557c79ab 点检功能优化 10 months ago
王杰 cfea02b3b7 顺序防错 10 months ago
jun 79a5fbbb1e 41794 MES-PDA:点检-新增点检单问题汇总 10 months ago
王杰 e4a5fce755 工艺防错 10 months ago
微笑着面对明天 b53ab28e86 条码履历和加工单履历 11 months ago
王杰 3ee38c6e7a 条码生成 11 months ago
administrator 6b9d3c4b53 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
administrator c5fa5f0127 补录日志--修改处理状态枚举 11 months ago