Commit Graph

310 Commits (acb394bb6b863697dc33c55e8ffeebb7667398d0)

Author SHA1 Message Date
jun a4a0ac889e 通用导出报表开发 6 months ago
jun 97d7e4e65d SPS拉动单打印 7 months ago
jun bc6b3dc5ad 天桥数报表开发 7 months ago
臧学普 c7145fa51b 线末大屏 7 months ago
臧学普 6a1779c6f0 线末大屏 7 months ago
jun c40e5c75ee CBR报工逻辑调整 7 months ago
jun effbe4561a 问题修复: 加工规则零件号不能模糊搜索 7 months ago
王杰 18efcb1c04 Merge branch 'dev' into dev-wuhan 7 months ago
xiangwei.zhang d96f360a0f 设备停机 7 months ago
gsz 7b56ed23f3 拉动单补打并且插入PrintedSnLog表 7 months ago
jun 94a22fa575 Merge branch 'dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
7 months ago
xiangwei.zhang 6f23a3fbe0 设备点检明细导入 7 months ago
jun 4cf06dea83 通用V107Melos数据监控查询 7 months ago
jun 52ac7e42fd getById方法增加organizeCode条件 7 months ago
xiangwei.zhang b8c938102d bom递归和报工调整修改 7 months ago
gsz 731cdeeac1 发运零件子零件明细+发运单子零件明细 7 months ago
pzj 4437d06c96 装配件查询、发运明细报表、可疑品条码信息、检验产品数据子报表 7 months ago
yxw 9878633805 1、MesProductionPartContext 增加cutQty(裁片工单数量)
2、裁片工单绑定问题修复
7 months ago
王杰 a80e653f08 Merge branch 'dev' into dev-wuhan 8 months ago
yxw 6768e2802d 装配目视单预览 8 months ago
pzj e130754448 包装组零件规则基础数据主、明细 8 months ago
yxw 7c82801377 装配目视单打印 8 months ago
pzj 45395bd4d6 辊道设备配置基础数据 8 months ago
jun 6162899689 CBR报工逻辑调整 8 months ago
yxw 29dd614d4b 新增打印工单打印队列 8 months ago
pzj 1ee988c030 站点信息基础数据 8 months ago
pzj 5641d27974 裁片基础数据 裁片长度修改类型、裁片配置、裁片原材料配置、裁片成品配置、裁片设备配置、裁片设备配置明细、裁片设备配置设备加工参数 8 months ago
pzj 182186077c 等离子基础数据 可回用包装类型、可回用包装、可回用包装零件 8 months ago
jun e0a911defd 工单装配件 工单零件报表开发 8 months ago
jun b77d89ecbf 根据勾选的发运单同步WMS,根据发运单关联对应的装车单;
发运单、装车单增加备注的筛选条件,文本框,支持模糊输入;
8 months ago
yxw 7f17a0edf1 裁片工单标签打印接口开发 8 months ago
xiangwei.zhang b86fbdbd3d 对账单信息 8 months ago
xiangwei.zhang 111b90fcb3 对账单信息 8 months ago
xiangwei.zhang d8d0c0721a 对账单信息 8 months ago
yxw 5ece1cb506 保存裁片加工记录 8 months ago
xiangwei.zhang 66b81a0fcb 报工修改 8 months ago
gsz 46c4bdded3 42966 设备实时查询报表-设备变量名称、设备变量ID可以多选查询,输入时,用逗号隔开 8 months ago
yxw 6833795264 Merge remote-tracking branch 'origin/dev' into dev-wuhan 8 months ago
gsz 8f751f8330 根据拉动组和生产工单产生拉动单JOB-1 8 months ago
gsz 3554e2677a 缺陷记录报表功能加打印功能 8 months ago
gsz d62d1ce024 缺陷记录报表功能 8 months ago
臧学普 e9bc105f43 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
臧学普 11ccae7461 提交生产装配件清单,工单,零件清单 8 months ago
yxw 69bf4af131 裁片原材料防错 8 months ago
yxw 36be5c84ed Merge branch 'dev' into dev-wuhan 8 months ago
yxw 025591db89 裁片功能主数据表 8 months ago
yxw 92b6b1be41 裁片功能主数据表 8 months ago
gsz b69151daa1 SPS物料拉动 1.新增拉动单+明细+2.提供给设备webSrevice接口 8 months ago
jun e722c262b3 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun 6ae6ba0940 汇总工单发送SAP逻辑调整 8 months ago
xiangwei.zhang 7930cd4734 新增导入信息 8 months ago
jun bbc3a0362f 42796 【上线】工单需求变更 8 months ago
gsz 92a0136482 生产工单日志 9 months ago
jun 3267d04197 接口映射,自定义脚本页面开发 9 months ago
jun 2b70084c7c 42602 发运后,客退品返工,生成并打印新条码
42582 线边库存报表
9 months ago
jun 78bb487025 工单汇总发送SAP逻辑调整,零件条码状态,加工记录导出功能 9 months ago
jun 73a11a618a 零件条码状态,产品加工记录报表开发 9 months ago
gsz 32b76ad88d 根据物料工位分组分页查询设备加工记录 9 months ago
gsz 26834c591c 42102 点检单页面增加打印功能 9 months ago
王杰 b08727bb82 系统配置查询方法 9 months ago
jun 096835bd11 问题清单修复 9 months ago
王杰 0da6e7f2f6 mes报表验证分表配置 9 months ago
王杰 7e50e2cf37 mes报表验证分表配置 9 months ago
jun b5a0c0d81a 问题清单修复 10 months ago
jun a6c1d5a485 CCSC检测,重新打开 10 months ago
jun a5873a9388 问题清单修复 10 months ago
jun 1de19ae114 问题清单修复 10 months ago
王杰 15debc5dfb mesmove 增加 erp生产线值 10 months ago
jun 5e2d23b101 问题清单修复 10 months ago
jun ddd22117b1 问题清单修复 10 months ago
王杰 3826df02ee mes枚举 10 months ago
王杰 193e918dae 设备日志 10 months ago
jun abfb72759f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java
10 months ago
jun 5e2b921ee9 问题清单修复 10 months ago
王杰 741ef4d549 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 10 months ago
王杰 19f73ea5fe mes execption 类变更路径 10 months ago
jun 80ade2b239 bug #41896 10 months ago
jun 816ca4bec6 问题清单修复 10 months ago
微笑着面对明天 30d470f43c 导入和报工 10 months ago
jun 12a164f54f bug 41859 10 months ago
jun 8eb0dd64e5 跨工厂防错表名修改 10 months ago
微笑着面对明天 f0c39b0a6c 业务履历新增 10 months ago
微笑着面对明天 844dafc2ce 业务履历 10 months ago
王杰 12d3944353 误删文件 10 months ago
jun 8f88fcadac 跨工厂防错功能开发 10 months ago
administrator 552e0098c4 增加产线与工位的关系--校验唯一性 10 months ago
gsz d15d620e92 MES_QMS报废品汇总+MES可疑品汇总JOB 10 months ago
administrator fceafc19ee 增加产线与工位的关系 10 months ago
jun 3c556186da 工艺流程界面问题修复 10 months ago
jun 15a644c5a8 工单页面问题修复 10 months ago
administrator 2f9f3b75fd 零件发运组关系 10 months ago
gsz ea2b735694 主子关系ExtendType修改 10 months ago
jun d84a7a61e5 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun f605d49d1d 生产开模统计数据发送
追溯报表开发
11 months ago
gsz aa6c6f58b3 41525导入功能优化-校验并返回数据+枚举中文导入 11 months ago
gsz e3fc93ecaa 根据生产加工记录产线物料产生的工单报工job测试 11 months ago
jun 6a0d1eee40 BOM树开发 11 months ago
jun 6d7e2c40d0 fix #bug 41559
fix #bug 41577
11 months ago
logic.fang 3e5a3ac66f 41513 MES-PC端-生产版本、物料信息-查询接口要求允许同时查询禁用、启动的数据 11 months ago
jun 29cc194ad7 Merge remote-tracking branch 'origin/dev' into dev 11 months ago