Commit Graph

810 Commits (84d1dbc6a6aa534be5f5654ba46d886c5dc79088)

Author SHA1 Message Date
微笑着面对明天 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
王杰 1d6bd87867 时效性验证 11 months ago
微笑着面对明天 434c87fde3 报工问题修改 11 months ago
王杰 f87281c0a0 工位扫描 日志 11 months ago
jun 3e29148f92 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun de0d1cffae NC处理问题修复 11 months ago
王杰 fa5046f056 工厂扫描 日志记录 11 months ago
jun 108d0af528 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun db7ca36343 41724 MES-PCN:加料防错问题汇总 11 months ago
微笑着面对明天 86c8b2f9ea 报工问题修改 11 months ago
jun 28a6c74ad8 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 6cb853902e 加料防错功能开发 11 months ago
王杰 be4a094485 保存设备日志 11 months ago
王杰 1a101affa2 保存设备日志 11 months ago
王杰 4a43f37676 工单选择腔数 11 months ago
王杰 c282a05088 设备日志 11 months ago
jun a16c50d568 追溯报表,生成pdf文件 11 months ago
gsz 0430190ac7 装车单中所有发运单全部变成发运回传-并修改装车单状态 11 months ago
gsz 6027b0a349 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 11 months ago
gsz 04e5bed576 根据前一天待报工记录数插入工单并报工job修改 11 months ago
jun 3095105625 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 09a2c97d4d 生产开模统计,只统计统计模具号不为空的数据 11 months ago
微笑着面对明天 1e0e4a94d1 报工问题修改 11 months ago
王杰 3fb0bff61d show assembly 11 months ago
王杰 75d76803b9 显示转配件 11 months ago
微笑着面对明天 5f0812dcfc 报工问题修改 11 months ago
administrator 4273eba96c 补录操作日志 11 months ago
王杰 f595d98629 pcn 客户端下线 11 months ago
微笑着面对明天 ab8fe77754 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
微笑着面对明天 c664aabb3c 展示组件 11 months ago
administrator 26f2c7ffc2 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
administrator 121109290b 一模多腔--查找装配件时规则取值问题 11 months ago
gsz d94ceabc81 报工记录数插入工单并报工job-取前一天早班次时间 11 months ago
gsz e17129ff62 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 11 months ago
gsz 180ce708a2 报工记录数插入工单并报工job-状态改为未汇报 11 months ago
微笑着面对明天 6bfd307598 展示组件 11 months ago
微笑着面对明天 34d54037dd 展示组件 11 months ago
微笑着面对明天 3e3d3543d3 分屏切换修改 11 months ago
王杰 863917dfb7 上下文key 变更 11 months ago
王杰 a6cac78e8d 前道防错工步 11 months ago
jun 69603b0aee 生产开模统计表,删除设备代码字段 11 months ago
jun 7574dfe698 生产开模统计数据发送
追溯报表开发
11 months ago
gsz f416fe94ce 根据前一天待报工记录数插入工单并报工job工作中心 11 months ago
王杰 9584c2d05e step 11 months ago
王杰 b416e13e41 前道防错 11 months ago
gsz de09ab75cc Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 11 months ago
gsz 68dc08b6f4 装车单中所有发运单全部变成发运回传 11 months ago
微笑着面对明天 7765671dc1 展示组件 11 months ago
administrator 371dd56277 保存加工结果--按需落库 11 months ago
gsz c1fe6b6db8 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 11 months ago
gsz 2472fa4e69 根据前一天待报工记录数插入工单并报工job 11 months ago
jun b4f7aad050 生产开模统计job逻辑修改 11 months ago
jun 1ce8b4b480 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun e04184acca 生产开模统计job 11 months ago
微笑着面对明天 1b71d890d8 展示组件 11 months ago
administrator ea26dbc6ad Merge remote-tracking branch 'origin/dev' into dev 11 months ago
administrator 113d8a78dd 生产条码时增加小鹏一维码规则 11 months ago
gsz 948a70f491 根据前一天待报工记录数插入工单并报工job 11 months 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
11 months ago
gsz 5e715f331a 根据前一天待报工记录数插入工单并报工job 11 months ago
administrator 3f4f041c5e Merge remote-tracking branch 'origin/dev' into dev 11 months ago
administrator 6400ab2846 生产条码时增加小鹏一维码规则 11 months ago
王杰 6716d7c978 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 11 months ago
王杰 1cfac89842 发送指令 bug 处理 可能存在多个点位 11 months ago
administrator 2a2f606ed7 工步条码打印 11 months ago
administrator a5f48cf90a 工位端条码补打功能 11 months ago
administrator 9b421f4ac9 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
administrator 0c3fe103de 工位端单件条码打印功能完成 11 months ago
微笑着面对明天 14aa4fde0b 展示组件 11 months ago
王杰 a219cdf441 context 11 months ago
王杰 5fc307c3b7 读设备 质量异常后重新读取 11 months ago
王杰 09dc9c7200 可复用件 11 months ago
administrator 1c65a74374 打印校验 11 months ago
jun d3767119fa 条码补打,条码生成优化 11 months ago
王杰 c077635e3c 工序完成 优化 11 months ago
王杰 c488a5ef5c step 11 months ago
administrator a7eafa32eb Merge remote-tracking branch 'origin/dev' into dev 11 months ago
王杰 93eee6bb0e step 11 months ago
王杰 41126d8e2b pcn 11 months ago
王杰 1c01b3bc24 mes step 11 months ago
administrator 5c23d7827b Merge remote-tracking branch 'origin/dev' into dev 11 months ago
王杰 b8f6e67d8b step 11 months ago
王杰 ff092a3ebb step 11 months ago
王杰 4c3048b236 step 11 months ago
微笑着面对明天 eb317e9974 展示组件 11 months ago
王杰 d6b9195768 step 11 months ago
王杰 83e887f7af step 11 months ago
administrator 7dcaeb9621 打印校验 11 months ago
administrator f64efdb8a5 时效性验证接口 11 months ago
王杰 f8b0ae62f4 step 11 months ago
王杰 8cc88b9f1b step 11 months ago
王杰 cf4b501bd0 step 11 months ago
jun a53aacb5b9 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun c0ad75b6ff 条码补打二维码生成 11 months ago
王杰 e6fe1a6ddf step 11 months ago
微笑着面对明天 7af7279c3c 展示组件 11 months ago
王杰 43f74b6ce3 step 11 months ago
微笑着面对明天 9174710dcf 展示组件 11 months ago
微笑着面对明天 24c251de15 展示组件 11 months ago
微笑着面对明天 3b2043c746 展示组件 11 months ago
王杰 6444e8ee7f step 11 months ago
王杰 7894c6922f steo 11 months ago
王杰 a249d62688 steo 11 months ago
微笑着面对明天 594edc20ae 装配件匹配 11 months ago
微笑着面对明天 5a954457a4 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
logic.fang 853ec9b6bb 41506 MES-PDA端-装车校验、排序发运校验-需要添加顺序卡控 11 months ago
微笑着面对明天 0a2bc86618 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun e7de46442c 排序发运校验bug修复 11 months ago
jun d693181dc7 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun f55811f1ba 广乘-仪表打印模板增加客户物料字段 11 months ago
王杰 265bfafe24 step 11 months ago
jun 013650178c Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 32eecc1d49 广乘-仪表打印模板 11 months ago
administrator 6122f1e074 打印调整数据结构 11 months ago