Commit Graph

762 Commits (395de65f826f603d4cacb7eea2c9541430df4961)

Author SHA1 Message Date
臧学普 0cc0ad93e7 打印模板不校验客户零件,规则校验移动到ruleNumber中的策略中 12 months ago
微笑着面对明天 b63e6c585c 报工问题修改 1 year ago
王杰 8f331b5a2a Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
王杰 ce2725926b 条码增加 已拆解 状态 工步对应修改 1 year ago
微笑着面对明天 b72ff0caf3 报工问题修改 1 year ago
王杰 5211abcb7b 条码生成工步 系统异常 提示优化 1 year ago
jun 575a2315fd 问题清单修复 1 year ago
臧学普 3e243a279f 添加工步打印策略查询numberRule规则 1 year ago
臧学普 801e2641cd 按照广州现场条码修改条码规则 1 year ago
臧学普 75d5a9bed7 按照广州现场条码修改条码规则 1 year ago
王杰 4cbd0558ee status 1 year ago
jun 234fbc1efe 问题清单修复 1 year ago
微笑着面对明天 7952e1dd45 mqtt修改 1 year ago
王杰 b09b8828fa 加工异常工步 时间处理bug 1 year ago
微笑着面对明天 e33d535b9e Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 357655deb2 时间格式 1 year ago
王杰 d8e0e44a94 NC问题修复 1 year ago
微笑着面对明天 ea54c32c19 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
臧学普 96f9fc2b66 修改条码打印分隔符 1 year ago
微笑着面对明天 dc9ec29a6d 时间格式 1 year ago
jun 13293f0559 问题清单修复 1 year ago
jun 455d6dd547 问题修复 1 year ago
微笑着面对明天 a69aafb40d 清空加工数 1 year ago
微笑着面对明天 d8112fc96b 报工问题修改 1 year ago
jun 93fa082d2f 数据同步脚本 1 year ago
王杰 44d11aef0e mesmove 增加 erp生产线值 1 year ago
臧学普 55027bac6b 工步打印条码修复 1 year ago
王杰 a817f7eb01 电子化检验 AB bug 生产零件条码 策略bug 1 year ago
王杰 8ea2581ab3 装车单 发运单 问题修改 1 year ago
臧学普 32c3626e6f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
臧学普 0a4284cd0a 修复gqxnyPrintStrategy空指针问题 1 year ago
jun a69b7d44d5 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 1ce33f14ab 问题清单修复 1 year ago
臧学普 ea346dc813 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
臧学普 f396cef18c 内部条码也需要添加简号 1 year ago
王杰 aa828063a7 编码策略: gqxnyNumberRuleStrategyService 修改 工步未传 客户零件对象 1 year ago
jun 58bd7e3c5a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 0f31bc01a5 问题清单修复 1 year ago
微笑着面对明天 c3e0967093 mqtt修改 1 year ago
jun 4c00b71b07 问题清单修复 1 year ago
jun fd5dbfb7df Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 62a45210fd 问题清单修复 1 year ago
王杰 79c2082e9c 设备日志 1 year ago
王杰 15c5f12837 设备日志 1 year ago
微笑着面对明天 e998b14511 mqtt 数据 1 year ago
微笑着面对明天 41d8aae13f 报工问题修改 1 year ago
微笑着面对明天 dc35357c44 mqtt问题修改 1 year ago
王杰 bac8b77d5a 工步 提示信息 优化 去掉上下文字眼 1 year ago
jun f83321a660 问题清单修复 1 year ago
王杰 e66cf87495 工步问题修复 工步调用工步 必须使用 executeInState方法 1 year ago
微笑着面对明天 38bddc5b4a 报工问题修改 1 year ago
微笑着面对明天 753f4be07d 报工问题修改 1 year ago
微笑着面对明天 3de67c0fbc 报工问题修改 1 year ago
微笑着面对明天 845628f5b7 报工问题修改 1 year ago
微笑着面对明天 f29a349df2 跨班次计数 1 year ago
jun ee84f26953 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 14ee2898e9 代码错误 1 year ago
王杰 783395688f 加工异常 1 year ago
微笑着面对明天 6506c4626e mqtt修改 1 year ago
jun a4324b8f3a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun ba7985c238 bug 41915 1 year ago
微笑着面对明天 f5ab91c2d9 bug修改 1 year ago
微笑着面对明天 5307e78324 报工问题修改 1 year ago
微笑着面对明天 4e9dd5201c mqtt修改 1 year ago
微笑着面对明天 77b8304de0 报工问题修改 1 year ago
王杰 d32640909e 设备加工 读点位 问题修复 1 year ago
jun 852525bfee 接口调试增加脚本,FID 1 year ago
王杰 45f53779b7 读设备工步 禁用扫描框、 1 year ago
王杰 9f589a2da7 头道模具号 没有找到加工规则 清除 头道数据 1 year ago
王杰 b9bbc4b006 装配件发送爆炸图 音频文件到客户端 1 year ago
王杰 869132254e 装配件发送爆炸图 音频文件到客户端 1 year 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
1 year ago
jun 4832a34353 bug 41869 1 year ago
微笑着面对明天 486a7f9306 mqtt开发 1 year ago
王杰 11fcda0b43 顺序防错 bug 1 year ago
王杰 17a79cb7b2 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
王杰 984f9488d8 pcn step 代码优化 1 year ago
administrator 6452c062f6 Merge branch 'dev' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
微笑着面对明天 4ef60c5324 业务履历修改 1 year ago
administrator b9aca943d6 补录日志加工记录日志 1 year ago
微笑着面对明天 04b46181a7 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 963a373b9c nc修改 1 year ago
jun 65c728ebc3 问题清单问题修复 1 year ago
jun 1ff7a8a720 问题清单问题修复 1 year ago
jun b599d1b07a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 16c1607e6c 点检功能逻辑修改 1 year ago
微笑着面对明天 8fff60d726 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 ac4924865d job 1 year ago
王杰 0227927903 复用装配件 bug 1 year ago
jun ed557c79ab 点检功能优化 1 year ago
jun a598cafb7a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun ebbb00950a 41819 点检主数据-新增&编辑-点检触发方式:删除 设备触发 1 year ago
王杰 cfea02b3b7 顺序防错 1 year ago
jun 79a5fbbb1e 41794 MES-PDA:点检-新增点检单问题汇总 1 year ago
微笑着面对明天 627217357c 报工问题修改 1 year ago
administrator 7d41ea50ac 判断加工结果需要判空 1 year ago
jun fb6c3843fc Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 02ac595c82 41806 组件返工作业--返工单选择页面,增加一列“责任人”,从NC处理选择的责任人取值 1 year ago
administrator 268c842e48 Merge branch 'dev' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
administrator 3a13770bc7 工步重构打印 1 year ago