1892 Commits (129002573c6e818e3f403477bf162e1e325e007b)

Author SHA1 Message Date
simon ece1ca4c01 调整中航看板返回,修复中航pcn原材料上线bug 5 years ago
王杰 b9fef07d7f 总装质量判定 5 years ago
王杰 12224ed8df 工单表加索引 :workCenterCode workOrderStatus 5 years ago
陈思洁 c0abb5f994 【12077 19048-注塑,喷涂,组装计划生产报表导出无扩展字段内容-20201026】 5 years ago
汪云昊 1825cfbdf3 revert(pojo):还原pom版本 5 years ago
wynne1005 88c942f509 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 fb5df5aedf 照片采集完成 5 years ago
宋军超 52c35877d8 添加天津涂装报表 5 years ago
陈思洁 28dd76f30b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 11748bb19e 【12066 19048-喷涂展示组件颜色查询方式变更-20201024】 5 years ago
王杰 ade2d60849 总装 质量判定 5 years ago
王杰 d7092a7f52 总装标记不良 5 years ago
宋军超 5d41023df6 修改天津涂装看板 5 years ago
songss 532e99eb8b Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 76a0703bac 调整中航看板接口地址 5 years ago
joke.wang 0d12d01ebf 生产报功表增加分组标识 5 years ago
wynne1005 ff45755577 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 2ff6eded6e 修改Oee 5 years ago
joke.wang 63b7162932 mgn-bj 半成品看板 5 years ago
汪云昊 dceb9b17a5 revert(pojo):还原pom版本 5 years ago
汪云昊 91f68d50d4 Merge remote-tracking branch 'origin/dev' into test 5 years ago
宋军超 692cd283f7 添加天津涂装看板-设备实时监控 5 years ago
曾贞一 d8e5aa44bc pom.xml 5 years ago
陈思洁 8dfcb7f429 【合并冲突】 5 years ago
陈思洁 3dc951c34f 【11964 19048-喷涂抛光报表变更-20201021】 5 years ago
宋军超 37c95dc6b3 添加天津涂装看板 5 years ago
wynne1005 20ee1215d2 解决 包名细化 导致冲突 5 years ago
wynne1005 9d81ec30d1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 6d4e8608c4 注塑 组装报表开发完毕 5 years ago
joke.wang f57f4e25be mgn-bj 总屏看板 5 years ago
宋军超 1b6264e80d 添加天津涂装看板 5 years ago
songss 2ed5108699 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 36928196c1 中航看板-调整返回接口参数 5 years ago
joke.wang 5227540ecc 队列表添加索引 5 years ago
songss d9040143f9 新增中航产线看板-每小时产量接口 5 years ago
wynne1005 1730dc27c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4d4ad7ff84 天津注塑看板 5 years ago
songss 783022646c 新增中航产线状态图接口 5 years ago
钮海涛 a8cdba48c3 合并Master代码 5 years ago
钮海涛 7afd60073a Merge remote-tracking branch 'remotes/origin/test' 5 years ago
王杰 f6ad2824b2 11984 19048-组装生产计划报表增加字段-20201020 5 years ago
王杰 97be3f186a 工单生产时间变更定时任务实体 5 years ago
songss ef316af0c1 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
5 years ago
wynne1005 78a3943a3d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4c86b836ca OP20b逻辑变更 esop展示变更 5 years ago
宋军超 6826f04b97 天津看板添加设备状态逻辑 5 years ago
joke.wang 9002bdc936 预装队列显示列优化 5 years ago
王杰 bb3039d1f2 包装关系查询宝贝 5 years ago
songss 17d47fdc55 新增看板图片增删改查接口
新增看板切换配置增删改查接口
新增中航-产线概况接口
5 years ago
陈思洁 92a9f5faba Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 b70a58ba7d 【2867 10 2.3.9 返工返修批量作业】 5 years ago
贾文涛 525cda2768 增加数量处理方法 5 years ago
宋军超 627e8ac215 添加麦格纳看板相关基础数据 5 years ago
陈思洁 061f48dc79 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e268ed86a9 【11934 19081-工位BOM中需要增加产线和工位的查询条件-20201020】 5 years ago
wynne1005 5d73afd17f jisa小时接收报表完成 5 years ago
wynne1005 05152538b2 合并冲突 5 years ago
wynne1005 fc36e55a38 新增mes 报表查询周期枚举 5 years ago
宋军超 9c1a9be165 优化天津麦格纳报表 5 years ago
wynne1005 e24bb4c39b 同步新增忽略字段 5 years ago
wynne1005 63c1cc479b 字段长度 model添加planCfgCode 5 years ago
wynne1005 7bca216063 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 8b53722b0f 设备plan更新 5 years ago
joke.wang cd32eee8ea 排程配置表增加冗余字段 5 years ago
宋军超 fcc66835b8 开发天津看板功能 5 years ago
wynne1005 ddaedf49ee Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 52bdc6c664 设备作业周期 新增planCfgCode 5 years ago
宋军超 bd9547b825 优化天津麦格纳报表 5 years ago
joke.wang cc2961d4b8 库存排产表增加字段 5 years ago
宋军超 3d8d84ee77 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
 Conflicts:
	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
5 years ago
宋军超 dc38d2db6f 优化天津麦格纳报表 5 years ago
wynne1005 1e6ca2e0bb 添加设备作业任务 周期类型 5 years ago
贾文涛 1ffebd418f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 834e3d211d 更新查询大于0的业务时,基础类错误问题。 5 years ago
wynne1005 a86a58fa6d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 233853e1e6 库存排程 5 years ago
王杰 f58d97fb83 11777 19048-绑定关键件 绑定多个关键件数据出现回滚-20201012 5 years ago
wynne1005 248c8229ff Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 a49ddc004c 添加lob 5 years ago
贾文涛 0c34bce623 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 7e24f4ed4a 修复队列乱跳问题。 5 years ago
贾文涛 d2f9c3502a 修复队列乱跳问题。 5 years ago
wynne1005 18275c8fb2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 226c31878a 添加缺陷代码 5 years ago
陈思洁 30f8e332fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 8f060d4aa4 【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】 5 years ago
joke.wang c442845f94 跳序变更 5 years ago
wynne1005 7fb7db3cb5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 629e6af9a9 设备指导操作文件 5 years ago
宋军超 4b65842d6f 修改天津麦格纳项目问题 5 years ago
wynne1005 ebf0392057 去除多余optionType枚举 5 years ago
wynne1005 470775b527 备件生成冲突解决 5 years ago
wynne1005 f52f07fe77 备件导入 5 years ago
王杰 6f3f06a8f6 19048-条码补打-补打包装需要可以用过程条码反查包装条码-20201012 5 years ago
wynne1005 d36a7527a6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 c117515b69 设备自动报警 5 years ago
songss 966ed3536b Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
5 years ago
songss 5816f275bf 新增控制计划相关接口 5 years ago
钮海涛 1695d75ff2 合并dev代码 5 years ago
钮海涛 94568777fb 合并test代码 5 years ago
陈思洁 3d8d27d780 【11374 20027-管理端质量检测标准维护基础数据报错(附件是数据模板)-20200915】 5 years ago
wynne1005 814d22fe09 设备报警 mes端完成 5 years ago
songss e585dce910 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 037e898cd2 新增控制计划相关接口 5 years ago
宋军超 aa01153c4b 天津麦格纳更新看板子菜单pojo 5 years ago
宋军超 ebb965f46d 天津麦格纳添加看板维护接口 5 years ago
Liquor 83bfaaceab 对SPC-KEY-TATA表的相关接口进行了相关优化。 5 years ago
贾文涛 72faca1092 添加索引 5 years ago
宋军超 2bd7650d48 天津麦格纳pojo中所有Double类型字段添加注解 5 years ago
Liquor 3d8842602d 增加了SPC-KEY-TATA表的相关接口。 5 years ago
wynne1005 8129ca5bee 设备报警 mes端完成 5 years ago
汪云昊 171f39cf01 revert:还原pojo pom.xml报表 5 years ago
汪云昊 56bd07dbf3 Merge remote-tracking branch 'origin/dev' into test 5 years ago
joke.wang f2177fdc1e bypass数据采集bug修复 5 years ago
王杰 d548660354 连续扫描 5 years ago
joke.wang d9d7e47ca7 生产队列明细唯一索引修改 5 years ago
songss 36df78c9b4 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 8c633f0bc3 优化字段命名规范 5 years ago
wynne1005 ea6fc313c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
songss d7edc3a309 增加产品数据校验记录报表接口 5 years ago
陈思洁 0f1f437a9e 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
钮海涛 543058b3a5 合并sweb代码 5 years ago
陈思洁 373e5026c5 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
songss b376450d4b 修改获取复核异常的数据接口返回数据 5 years ago
wynne1005 12f1c4a809 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 9fb8962e4e 客退件bug修复 5 years ago
宋军超 979e18c4a7 天津麦格纳修改涂装质检看板 5 years ago
宋军超 ba6470baad 天津麦格纳修改组托获取托包规数量 5 years ago
wynne1005 2ae471febd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3c1c6c8c55 新增通用对象 password 5 years ago
陈思洁 e9ce24d6f9 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
joke.wang 612c919e5f bypass优化 5 years ago
wynne1005 7c9c0890fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
songss 28d7b79f82 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 114654dd99 冲突解决 5 years ago
wynne1005 696695ef0e 海纳川变更 10923 10894 5 years ago
songss d050274450 新增查询生产表数据接口 5 years ago
songss 2f953ac223 新增获取中航DB复核项接口。新增修改生产数据接口 5 years ago
joke.wang bc383d573b 生产工单增加特殊标示字段 5 years ago
songss c5de9c9841 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
5 years ago
宋军超 735838e27f 天津麦格纳修改紧急问题 5 years ago
宋军超 706d0fc43d 天津麦格纳问题修改 5 years ago
陈思洁 d92c669f79 【11493 20042 标签条码模版需要显示客户名称 0921】 5 years ago
songss f222395015 襄阳中航新增复核生产数据表数据工步。新增复核生产数据表异常数据 5 years ago
wynne1005 456741c116 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 e7196c3f7f 海纳川 10923 10894 5 years ago
贾文涛 8fb9760f82 对象引用循环嵌套了,此字段不用就删掉。StationRequestBean->MesStateMachineStatus->StepResult->StationRequestBean 5 years ago
贾文涛 772f1b9d28 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 232abdafd3 10984 组装生产线箱条码批次扫描!-2020-09-01,需求开发 5 years ago
宋军超 d5e356938e 天津麦格纳修改组托打印功能 5 years ago
宋军超 0c93ee5877 天津麦格纳修改看板和条码补打问题 5 years ago
joke.wang 72502a863b Fix Bug #11490 5 years ago
王杰 895eb461ab 数据复核 5 years ago
宋军超 95f008a602 天津麦格纳添加组装打印托标签功能,修改物料颜色名称从物料表中取问题 5 years ago
钮海涛 fa467a2e0d sweb合并dev代码 5 years ago
钮海涛 5f144781c9 SWEB合并test代码 5 years ago
钮海涛 6749bda558 合并dev代码 5 years ago
钮海涛 b253a020b9 合并test代码 5 years ago
钮海涛 5c104e036f 合并test代码 5 years ago
宋军超 8a392814aa 天津麦格纳修改涂装展示组件添加字段展示 5 years ago
wynne1005 8c0ea0d52f 冲突解决 5 years ago
wynne1005 10d5276fbb 过程检测 演示修改 5 years ago
joke.wang cce1d91650 客退备件返修 5 years ago
宋军超 e18ad44c14 天津麦格纳修改返工返修 5 years ago
陈思洁 21ca0a9d0d 【11437 19081-半成品预装队列优化-20200917】 5 years ago
陈思洁 d6c9e9a061 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 1072b4fd04 【半成品预装队列】 5 years ago
joke.wang ba8022f9ca 生产队列明细增加条码字段 5 years ago
宋军超 f58e07fa33 天津麦格纳-添加总装质量检测弹框工步和返工返修接口 5 years ago
宋军超 ad5c122df8 天津麦格纳-添加总装质量检测弹框工步和返工返修接口 5 years ago
陈思洁 50c2258f58 【增加查询参数条件】 5 years ago
joke.wang 817f4b2812 客户产线增加字段 5 years ago
wynne1005 7ab755c9f5 过程检测 16 后端接口完毕 5 years ago
汪云昊 163d0773a9 修改pom文件版本 5 years ago
汪云昊 b38e6ea1ad Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
王杰 6dca5ccb09 异步任务 5 years ago
钮海涛 485c66aaf7 合并test代码 5 years ago
wynne1005 531fe743c2 过程检测 完成首检判断 5 years ago
wynne1005 d00dcd80eb 冲突解决 5 years ago
wynne1005 7412eb3f16 质量检测 5 years ago
陈思洁 f19ee854be Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 802c801013 【11310 19081-下达至下线时间预警-20200913】 5 years ago
王杰 cf26f7eadd mespcn异步任务 5 years ago
wynne1005 1e9f1a5c47 质量检测 1 5 years ago
陈思洁 d3f754c8a6 【客户JIT生产队列增加字段】 5 years ago
陈思洁 65b18c6b91 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 d127413055 【11225 19081-客户JIT生产队列需要能够选择L7级零件,进行对应订单的筛选-20200910】 5 years ago
宋军超 0c855ba2af 天津麦格纳问题修复 5 years ago
宋军超 bd20bc1552 天津麦格纳修改涂装条码打印 5 years ago
joke.wang b389da7c2f Fix Bug #11260 5 years ago
陈思洁 40cef1961c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 8a1f0c608e 【基础页面增加替代料功能】 5 years ago
宋军超 baafe4cd49 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 b978fa390c 修改天津麦格纳涂装计划查询报表和涂装工单导入 5 years ago
陈思洁 644454294c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 676e43fc33 【增加查询参数条件】 5 years ago
宋军超 799967bde5 修改天津麦格纳问题 5 years ago
宋军超 91aa6f61a0 删除预装区查询接口 5 years ago
陈思洁 2af946a4bf Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 9fde75101e 【11181 19048-组织模型新增数据和保存的数据不一致!-2020-09-09】 5 years ago
wynne1005 9bfd9ef279 Merge branch 'master' into test 5 years ago
宋军超 c5ebcaf2b5 天津麦格纳添加出入库事务表枚举 5 years ago
宋军超 7a6bda2994 天津麦格纳问题修复 5 years ago
陈思洁 2c91dfba60 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e4dc2e1a46 【2637 08 ext 20042 PCN界面优化,log调整 0804】 5 years ago
joke.wang d33dae14dc jsp计算bug优化 5 years ago
宋军超 f73e826cd8 天津麦格纳问题修复 5 years ago
钮海涛 729a7b6990 合并冲突 5 years ago
钮海涛 5c9da87650 合并冲突 5 years ago
钮海涛 d47607880e 合并冲突 5 years ago
joke.wang b8c743896d 拆解接口表优化 5 years ago
songss bdf708b73a 增加上传图片job 5 years ago
joke.wang 045babeee1 已生产队列查询修改 5 years ago
joke.wang ba940f9a39 BYPASS项映射关系表 5 years ago
陈思洁 01fc8bb062 【条码履历增加字段】 5 years ago
王杰 396dcdf56c 涂装 一箱 优化 5 years ago
wynne1005 38096fb04e mes表名过长不兼容oracle 5 years ago
joke.wang bd8cc364c1 jsp计算优化 5 years ago
陈思洁 6c351c09b5 【11016 19048- 总装生产计划显示多条!-2020-09-03】 5 years ago
joke.wang 746a17bd75 bj-mgn辅助展示组件 5 years ago
陈思洁 5dd7cc44b2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 fad811c2bc 【增加索引】 5 years ago
joke.wang 18ca368f3c 照片采集 5 years ago
wynne1005 4bdfebede1 中航打包PCR完成 5 years ago
陈思洁 564fdb261b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 191220442f websocket错误提示音 5 years ago
陈思洁 df2342e097 【2703 07 ext 虚拟工单关闭按钮(注塑、涂装、组装)】 5 years ago
songss 19f1cf85c4 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss fad439a5a0 增加MES状态机Repository类 5 years ago
陈思洁 23d8afd0ae Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 09c95d3542 【库存排程配置增加禁用启用接口】 5 years ago
joke.wang 3815c1c730 扭矩采集plc优化 5 years ago
陈思洁 381ff0c974 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 de248a944f 【2701 08 1.2.3.3.8 涂装检测工位,显示合格数、不良数】 5 years ago
钮海涛 51746154ba 合并dev到test 5 years ago
钮海涛 e6b472bcfd 合并test代码到dev 5 years ago
钮海涛 4144e12b5d 合并test代码到master 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
wynne1005 f06f51cc7e master merge test 5 years ago
joke.wang b09aa27e0f 排程job 5 years ago
joke.wang a2eab983d9 缓存池订单池增加jit_seq字段 5 years ago
songss a2f257e414 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss df6f0bb4f2 删除没用代码 5 years ago
songss f4d7e55f05 喷涂过程条码批量打印报错bug修复 5 years ago
陈思洁 98afecf57b 【10877 19048-预组装看板及操作工位变更调整-20200828】 5 years ago
wynne1005 a580c70c04 添加正态分布数据总数 5 years ago
wynne1005 9563ebeb66 normalDistribution 5 years ago
宋军超 940510ea5b 北京海纳川、北京麦格纳问题修复 5 years ago
陈思洁 d7f8796d36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ee1b0b5b67 【2674 预装区基础页面开发】 5 years ago