Commit Graph

899 Commits (d035447f2948d3e1e0d4d6b2fa89c6b59c10f834)

Author SHA1 Message Date
王杰 d350ce957e 主条码 可疑转正常 也支持扫描 10 months ago
王杰 167da1ff88 装配件条码 可疑转正常 也支持扫描 10 months ago
jun 64caf50651 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
王杰 0866a27027 查询加工记录表加工厂条件; 匹配加工规则 提示优化;增加配置允许其他工位的未知条码扫描的生产线配置;同零件条码同物料限制汇报一次 10 months ago
微笑着面对明天 62f7b28af9 报工问题修改 10 months ago
jun a1295c948f 工位端-选择工单的页面,查询条件 10 months ago
jun 715f8be640 打印模板调整 10 months ago
jun fb52cb2394 打印模板增加打印时间字段 10 months ago
微笑着面对明天 3b9b5e19cc 超工单验证log修改 10 months ago
gsz 500bd5017b MesReportWorkByPreDayJob修改系统同步状态+产生新工单号前加"A-"标识自动 10 months ago
王杰 85bf50215e 设备发送加工参数 10 months ago
微笑着面对明天 395de65f82 报工问题修改 10 months ago
微笑着面对明天 0f64a2d303 报工问题修改 10 months ago
微笑着面对明天 e9eddebef5 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
微笑着面对明天 df8cd11e67 报工问题修改 10 months ago
gsz f16f4f630d MesReportWorkByPreDayJob修改班次和计划时间 10 months ago
gsz 6afbfe9b5b Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
gsz e64f5a8926 MesReportWorkByPreDayJob 班次从1/2 改为10/20 10 months ago
jun bf2379204c Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 655f495f7b 问题清单修复 10 months ago
gsz 9ece60e019 MesReportWorkByPreDayJob报工状态增加40 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
微笑着面对明天 2013712397 报工问题修改 10 months ago
王杰 3c024dcb89 mes报表验证分表配置 10 months ago
王杰 29759184b6 mes报表验证分表配置 10 months ago
gsz 7c23cb83b4 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
gsz 2d1daf57bc MesReportWorkByPreDayJob 班次时间变为时-分-秒 10 months ago
王杰 a18028a826 通用工位按钮 移动到核心包 10 months ago
王杰 f5904f4430 客户端下线 不再清除数据 变更成 上线时清除 10 months ago
jun 10f0c723a0 问题清单修复 10 months ago
jun 89709b9af7 问题清单修复 10 months ago
微笑着面对明天 663c011052 报工问题改成一次性报工多个 10 months ago
微笑着面对明天 f043086f1b 报工问题修改 10 months ago
微笑着面对明天 a688088130 返工替换条码 10 months ago
微笑着面对明天 5e3ed9b05b 报工问题修改 10 months ago
微笑着面对明天 a62b02478e 报工问题修改 10 months ago
微笑着面对明天 435b74b7ce Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 499b0112d9 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 6e89a4aa8a 问题清单修复 10 months ago
臧学普 489225cbe5 修复bug 42203,在有产出时,工单状态需要由已发布 变为加工中 10 months ago
jun c0bcca2f51 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun bc05816202 问题清单修复 10 months ago
gsz 35017c2a65 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
gsz fdbf3cdead 42194 PCN开关班管理界面,关班时记录一直更新到前一天的班次上,当前班次一直无法关班。 10 months ago
微笑着面对明天 b4bfbea463 配置xiugai 10 months ago
王杰 4c56202554 读设备工步 统一优化提示信息 10 months ago
jun 76def38674 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 38f85d1333 问题清单修复 10 months ago
王杰 2c57875b0c 工步打印 逻辑修改 10 months ago
微笑着面对明天 0f428020c4 报工问题修改 10 months ago
微笑着面对明天 48266f1bf0 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
微笑着面对明天 2de392bac2 报工问题修改 10 months ago
王杰 97071d5c02 设备ID 10 months ago
微笑着面对明天 ba9cdcf798 报工问题修改 10 months ago
微笑着面对明天 0643590fbb 返工替换替换逻辑修改 10 months ago
微笑着面对明天 58157d9007 报工问题修改 10 months ago
微笑着面对明天 8dcb485117 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
微笑着面对明天 f1f3a0d74b 报工问题修改 10 months ago
微笑着面对明天 183209b62a 报工问题修改 10 months ago
臧学普 0cc0ad93e7 打印模板不校验客户零件,规则校验移动到ruleNumber中的策略中 10 months ago
微笑着面对明天 b63e6c585c 报工问题修改 10 months ago
王杰 8f331b5a2a Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
王杰 ce2725926b 条码增加 已拆解 状态 工步对应修改 10 months ago
微笑着面对明天 b72ff0caf3 报工问题修改 10 months ago
王杰 5211abcb7b 条码生成工步 系统异常 提示优化 10 months ago
jun 575a2315fd 问题清单修复 10 months ago
臧学普 3e243a279f 添加工步打印策略查询numberRule规则 10 months ago
臧学普 801e2641cd 按照广州现场条码修改条码规则 10 months ago
臧学普 75d5a9bed7 按照广州现场条码修改条码规则 10 months ago
王杰 4cbd0558ee status 10 months ago
jun 234fbc1efe 问题清单修复 10 months ago
微笑着面对明天 7952e1dd45 mqtt修改 10 months ago
王杰 b09b8828fa 加工异常工步 时间处理bug 10 months ago
微笑着面对明天 e33d535b9e Merge remote-tracking branch 'origin/dev' into dev 10 months ago
微笑着面对明天 357655deb2 时间格式 10 months ago
王杰 d8e0e44a94 NC问题修复 10 months ago
微笑着面对明天 ea54c32c19 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
臧学普 96f9fc2b66 修改条码打印分隔符 10 months ago
微笑着面对明天 dc9ec29a6d 时间格式 10 months ago
jun 13293f0559 问题清单修复 10 months ago
jun 455d6dd547 问题修复 10 months ago
微笑着面对明天 a69aafb40d 清空加工数 10 months ago
微笑着面对明天 d8112fc96b 报工问题修改 10 months ago
jun 93fa082d2f 数据同步脚本 10 months ago
王杰 44d11aef0e mesmove 增加 erp生产线值 10 months ago
臧学普 55027bac6b 工步打印条码修复 10 months ago
王杰 a817f7eb01 电子化检验 AB bug 生产零件条码 策略bug 10 months ago
王杰 8ea2581ab3 装车单 发运单 问题修改 10 months ago
臧学普 32c3626e6f Merge remote-tracking branch 'origin/dev' into dev 10 months ago
臧学普 0a4284cd0a 修复gqxnyPrintStrategy空指针问题 10 months ago
jun a69b7d44d5 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 1ce33f14ab 问题清单修复 10 months ago
臧学普 ea346dc813 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
臧学普 f396cef18c 内部条码也需要添加简号 10 months ago
王杰 aa828063a7 编码策略: gqxnyNumberRuleStrategyService 修改 工步未传 客户零件对象 10 months ago
jun 58bd7e3c5a Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 0f31bc01a5 问题清单修复 10 months ago
微笑着面对明天 c3e0967093 mqtt修改 10 months ago
jun 4c00b71b07 问题清单修复 10 months ago
jun fd5dbfb7df Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 62a45210fd 问题清单修复 10 months ago
王杰 79c2082e9c 设备日志 10 months ago
王杰 15c5f12837 设备日志 10 months ago
微笑着面对明天 e998b14511 mqtt 数据 10 months ago
微笑着面对明天 41d8aae13f 报工问题修改 10 months ago
微笑着面对明天 dc35357c44 mqtt问题修改 10 months ago
王杰 bac8b77d5a 工步 提示信息 优化 去掉上下文字眼 10 months ago
jun f83321a660 问题清单修复 10 months ago
王杰 e66cf87495 工步问题修复 工步调用工步 必须使用 executeInState方法 10 months ago
微笑着面对明天 38bddc5b4a 报工问题修改 10 months ago
微笑着面对明天 753f4be07d 报工问题修改 10 months ago
微笑着面对明天 3de67c0fbc 报工问题修改 10 months ago
微笑着面对明天 845628f5b7 报工问题修改 10 months ago
微笑着面对明天 f29a349df2 跨班次计数 10 months ago
jun ee84f26953 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 14ee2898e9 代码错误 10 months ago
王杰 783395688f 加工异常 10 months ago
微笑着面对明天 6506c4626e mqtt修改 10 months ago
jun a4324b8f3a Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun ba7985c238 bug 41915 10 months ago
微笑着面对明天 f5ab91c2d9 bug修改 10 months ago
微笑着面对明天 5307e78324 报工问题修改 10 months ago
微笑着面对明天 4e9dd5201c mqtt修改 10 months ago
微笑着面对明天 77b8304de0 报工问题修改 10 months ago
王杰 d32640909e 设备加工 读点位 问题修复 10 months ago
jun 852525bfee 接口调试增加脚本,FID 10 months ago
王杰 45f53779b7 读设备工步 禁用扫描框、 10 months ago
王杰 9f589a2da7 头道模具号 没有找到加工规则 清除 头道数据 10 months ago
王杰 b9bbc4b006 装配件发送爆炸图 音频文件到客户端 10 months ago
王杰 869132254e 装配件发送爆炸图 音频文件到客户端 10 months ago
jun 9795b07de1 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
10 months ago
jun 4832a34353 bug 41869 10 months ago
微笑着面对明天 486a7f9306 mqtt开发 10 months ago
王杰 11fcda0b43 顺序防错 bug 10 months ago
王杰 17a79cb7b2 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
王杰 984f9488d8 pcn step 代码优化 10 months ago
administrator 6452c062f6 Merge branch 'dev' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
微笑着面对明天 4ef60c5324 业务履历修改 10 months ago
administrator b9aca943d6 补录日志加工记录日志 10 months ago
微笑着面对明天 04b46181a7 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
微笑着面对明天 963a373b9c nc修改 10 months ago
jun 65c728ebc3 问题清单问题修复 10 months ago
jun 1ff7a8a720 问题清单问题修复 10 months ago
jun b599d1b07a Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 16c1607e6c 点检功能逻辑修改 10 months ago
微笑着面对明天 8fff60d726 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
微笑着面对明天 ac4924865d job 10 months ago
王杰 0227927903 复用装配件 bug 10 months ago
jun ed557c79ab 点检功能优化 10 months ago
jun a598cafb7a Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun ebbb00950a 41819 点检主数据-新增&编辑-点检触发方式:删除 设备触发 10 months ago
王杰 cfea02b3b7 顺序防错 10 months ago
jun 79a5fbbb1e 41794 MES-PDA:点检-新增点检单问题汇总 10 months ago
微笑着面对明天 627217357c 报工问题修改 10 months ago
administrator 7d41ea50ac 判断加工结果需要判空 10 months ago
jun fb6c3843fc Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 02ac595c82 41806 组件返工作业--返工单选择页面,增加一列“责任人”,从NC处理选择的责任人取值 10 months ago
administrator 268c842e48 Merge branch 'dev' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
administrator 3a13770bc7 工步重构打印 10 months ago
王杰 d97430d70f 重选工位 10 months ago
王杰 e4a5fce755 工艺防错 10 months ago
administrator 8f2d794472 工位打印重构 10 months ago
administrator b6e806f40e 工位打印重构 10 months ago
administrator bc571b6173 重构打印 11 months ago
王杰 6ab4f0f323 编码规则 增加 参数 dataMap 11 months ago
王杰 ed51c028ee 编码规则 增加 参数 dataMap 11 months ago
微笑着面对明天 dd177d2d75 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
微笑着面对明天 b53ab28e86 条码履历和加工单履历 11 months ago
王杰 5742015206 工位扫描 日志 11 months ago
王杰 74d5cb101b 条码生成工步 11 months ago
王杰 3ee38c6e7a 条码生成 11 months ago
王杰 f78108c702 装配件重置 11 months ago
王杰 292ece125c 按钮接口 11 months ago
administrator 6b9d3c4b53 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
王杰 13ff0c48b1 step 11 months ago
王杰 3a5b8f0568 倒计时 11 months ago
administrator c5fa5f0127 补录日志--修改处理状态枚举 11 months ago
王杰 b431a1cf03 倒计时 11 months ago
微笑着面对明天 e1f5ed5610 规则策略 11 months ago
微笑着面对明天 22560a0a8b 报工问题修改 11 months ago
微笑着面对明天 d9d7931a91 报工问题修改 11 months ago
微笑着面对明天 6fc77688be 报工问题修改 11 months ago
王杰 7439a515cd fsm reset 11 months ago
jun fc046df6b4 排序发运校验问题修复 11 months ago
jun 8facc242b9 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 33ffd51602 41757 MES:PDA:点检进入报错&点检无法下拉,无法点击完成点检 11 months ago
administrator c283acfd7c 补录日志 11 months ago
administrator 099cb80f16 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
王杰 a443453c9c assemnly skip code 11 months ago
administrator bc901e7130 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun f0ffe11ffc 问题修复 11 months ago
jun 3ee25d0dc1 发送开模统计数据 11 months ago
王杰 ba107475aa 读设备 优化 11 months ago
王杰 13d721d936 工艺路线防错 11 months ago
gsz d0a6298ecc Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 11 months ago
gsz 35a1928c78 QMS报废品汇总新增责任人 11 months ago
微笑着面对明天 c707e95ab6 加工异常修改 11 months ago
王杰 dc2da6c5ba step 11 months ago