I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,605 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '4fa41f2f90'
${ noResults }
Commit Graph

2086 Commits (4fa41f2f90c44b5f9112b95e649e72ab66c7f1b5)

Author SHA1 Message Date
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
joke.wang ac55ae1df1 库存排程配置增加物料名称 5 years ago
王杰 7a502c45c9 注塑上料 展示组件增加字段 5 years ago
陈思洁 baa7d144b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 daf0b94314 【10828 19048-10827-预装作业界面优化！-2020-08-25】 5 years ago
宋军超 53d392ebe1 海纳川问题修复枪头更换添加弹框校验 5 years ago
wynne1005 ebd12f7c65 去除ProductBiModel重复字段 5 years ago
wynne1005 f9fa5814f6 冲突解决 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
宋军超 f3cb06ba5a Merge remote-tracking branch 'origin/test' into test 5 years ago
宋军超 030343f2ce 海纳川问题修复 5 years ago
王杰 43ad04818c pom 5 years ago
王杰 0d256b3afd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 b4a4c42fe0 合并master代码 5 years ago
wynne1005 b3aa6eef70 中航 均值极差 5 years ago
钮海涛 ea43d63d7e Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
王杰 3b31f9fcc8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 d0bfa965f7 类型信息 seq 5 years ago
陈思洁 b0c3b85378 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 68fef2b051 【2634 19048--涂装Unpack流程！-2020-08-05】 5 years ago
joke.wang e3146c9fb4 Fix Bug #0776 5 years ago
王杰 4c9b5d087c 涂装 二箱 客户 查询工作逻辑变更 5 years ago
王杰 a2084204f0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 41422d895e 涂装 客户 二箱 查询工单逻辑变更 5 years ago
joke.wang fd771bccf8 报功接口增加工单类型字段 5 years ago
joke.wang f6460749db jsp解析优化 5 years ago
joke.wang 84dcf36c86 Fix Bug #10708 5 years ago
joke.wang f275d70136 Fix Bug #10674 5 years ago
陈思洁 358d582209 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 b56cf991be 【2607 08 ext PCR-200623001需求变更-预组装】 5 years ago
王杰 5f495a1b98 产品工作中心配置 5 years ago
joke.wang 9207f20b37 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 09b8ccd1e3 Fix Bug #10520 5 years ago
王杰 1d86ce6429 总装打包 展示组件 列表显示封箱状态名称 5 years ago
陈思洁 406c625974 【2634 19048--涂装Unpack流程！】 5 years ago
陈思洁 c937e2aa64 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ee927b7056 【2607 08 ext PCR-200623001需求变更-预组装】 5 years ago
宋军超 6db85d596b 修改海纳川问题 5 years ago
王杰 72afe6891b 料箱显示工作中心名称 5 years ago
宋军超 5e81b1f448 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 4d816de5da 修改海纳川问题,添加PTL新逻辑关联bug:10538 5 years ago
王杰 a7c3167eef 注塑上料 5 years ago
宋军超 163c385842 修改海纳川问题 5 years ago
joke.wang 85b6067133 BI优化1 5 years ago
宋军超 ba7cdc84e5 修改海纳川问题 5 years ago
wynne1005 ef83a7aa08 是否重选更换名称 大小枪与绑定支持并发 5 years ago
wynne1005 032a7e8126 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 d699e88984 StationRequestBean 5 years ago
joke.wang 1cf11c4500 Fix Bug #10477 5 years ago
joke.wang 3f03b5fab5 产线表增加序号字段 5 years ago
wynne1005 a751d5a8a7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 8d7b0fae6a 添加小枪日志 与不需要打枪绑定 自动跳过 5 years ago
宋军超 44b90bf639 修改海纳川问题 5 years ago
钮海涛 b437a78e31 Merge remote-tracking branch 'origin/test' into test 5 years ago
王杰 f45137db94 注塑上料 5 years ago
钮海涛 438dcacdce Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 53151424b9 Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
陈思洁 a5ea72f593 【新增库位实体】 5 years ago
陈思洁 a093f06edc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 38f9adc2dd 【10554 19048--喷涂条码打印功能不应该查询出其他车间的生产计划！-2020-08-13】 5 years ago
wynne1005 59aadc94ce Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 763b88b420 工位扫描添加工步触发条件 5 years ago
宋军超 19b1bfb9b6 修改海纳川打印 5 years ago
joke.wang 2d52fe0a40 Fix Bug #10535 5 years ago
joke.wang 89bd4f189a 项目表增加字段 5 years ago
joke.wang 74cc0c757d 成品标签打印 5 years ago
wynne1005 ba558d640e tmp 5 years ago
joke.wang bf902b8366 Fix Bug #10294 5 years ago
王杰 175052ebcc 报工表加质量状态 默认合格 5 years ago
王杰 1707f6b228 MesProdWorkCenter 5 years ago
汪云昊 bda160ccec Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
joke.wang a522db04a9 过程条码增加字段vinCode 5 years ago
宋军超 84f61e65fc 修改海纳川问题 5 years ago
王杰 18dd2cbcb2 zs 5 years ago
王杰 772229b983 andon 5 years ago
王杰 9e8cb0b844 注塑 5 years ago
陈思洁 056d4390ca Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 4a99857248 【10414 19048 - 注塑产品消耗BOM报表！-2020-08-05】 5 years ago
joke.wang 8c2fd8a587 Fix Bug #10476 5 years ago
joke.wang f495ffed54 Fix Bug #10477 5 years ago
joke.wang 4bdd2b770b Fix Bug #10486 5 years ago
joke.wang 51f9d92d36 北京麦格纳esop展示组件修改 5 years ago
joke.wang 7c3594a870 Fix Bug #9589 5 years ago
陈思洁 e4c8431a22 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 653b413623 【10334 19048-MES、WMS接口JIT02中增加内部工单号！-2020-08-03】 5 years ago
宋军超 e70192d3c2 添加日志查询问题 5 years ago
宋军超 625b780aaf 添加海纳川数据复核工步和产线状态看板变更 5 years ago
wynne1005 3af4d32a97 mes工位运行状态 5 years ago
joke.wang edb85b5ea6 桌面BI 5 years ago
wynne1005 3c004324b1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 6e455f5d72 reqBean 添加productSn 5 years ago
王杰 5413fc259c pcn 缺陷 5 years ago
宋军超 162e2d33d7 修改海纳川问题 5 years ago
宋军超 99787412cd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 8eade912c7 添加返工返修数据复核逻辑 5 years ago
陈思洁 ba3f5fde4d 【总装、涂装、注塑计划报表】 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
钮海涛 f760b72094 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
宋军超 fe79944778 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 5739ac27bb 缺陷 5 years ago
陈思洁 39ea32e37e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 a01cd4d34b 【注塑计划导入功能数据优化】 5 years ago
宋军超 8bc0da924c 修改海纳川问题 5 years ago
joke.wang 33cace48ab 半成品打印增加字段 5 years ago
宋军超 0b3c53b4ca 修改海纳川问题 5 years ago
wynne1005 e35fdcbc2a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4c9cdcb6a0 tmp 5 years ago
陈思洁 26fe63eb8a 【10278 19048-总装标记不良功能通过外部输入条码标记不良-2020-08-03】 5 years ago
陈思洁 41cbe4f380 【10284 19048-注塑生产计划导入变更-20200803】 5 years ago
陈思洁 ce7ca48c4b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 394a332de2 修改展示组件逻辑 5 years ago
陈思洁 72c8e22433 【接口映射代码调试】 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
joke.wang c060377822 中航BI 5 years ago
wynne1005 5fad38392e 添加索引 脚本表更新 5 years ago
joke.wang 05fa7dba04 Fix Bug #10227 5 years ago
joke.wang af539c85a7 mgn bug 5 years ago
宋军超 31f289e1be 修改展示组件和电检逻辑 5 years ago
贾文涛 5d19c8876b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 bc2d29c006 【2547 07 1.2.4.6.1.10 PCR-200617001需求变更-生产过程不良紧急拉料】 5 years ago
贾文涛 fd42a3292a Fix Bug #10090,修复涂装二次箱条码作业完成后，一次箱条码工位数据会乱掉问题。 5 years ago
joke.wang 13f7121610 海纳川看板 5 years ago
贾文涛 70693d5b63 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 01ac2e85da Fix Bug #10087 5 years ago
贾文涛 8180795cd7 功能优化-打包时将工位代码存入包装表 5 years ago
王杰 7f5c1735ea 数据复核 5 years ago
joke.wang ea922affba Start Task #2522 Cost:8h Left:8h 5 years ago
王杰 306b05b4d7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 3223158529 Fix Bug #10108 5 years ago
王杰 47a155e1d1 git push 5 years ago
joke.wang 2a93bb2ca4 Finish Task #2521 5 years ago
宋军超 23f33a79d1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 c18c22a799 修改海纳川电检测问题 5 years ago
rock.yu 35cdb1f257 完善脚本管理功能 5 years ago
rock.yu eef7ed9c32 调整 pojo 引用关系， mes-pcn-pojo 已废弃 5 years ago
宋军超 f0fd8da49c 修改海纳川问题 5 years ago
joke.wang e5d54d8c0a 工位BOM增加预警字段 5 years ago
joke.wang 768e31e636 Fix Bug #9995 5 years ago
钮海涛 7ca3b43bfe 合并DEV分支代码 5 years ago
钮海涛 9b3bb48231 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
wynne1005 4d608dd4c3 扩展dispatcher model 5 years ago
宋军超 5fa18e05f1 修改中航问题 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 3c22c8e3f4 test版本合并到master 5 years ago
宋军超 457cb894db 添加工位队列信息功能 5 years ago
陈思洁 2636e43b9b 【9914 天津】 5 years ago
joke.wang c90a009e66 Fix Bug #9874 5 years ago
wynne1005 d0e1900a84 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 c1fd1f6eee bypass redo release 5 years ago
王杰 41ff729f99 workorderlog 5 years ago
宋军超 933e9efb3d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 3a31ccae70 队列明细添加临时字段 5 years ago
贾文涛 a577eac60a 修复缓存redis时，忽略ModuleServer对象。 5 years ago
wynne1005 f3a13522a1 解决冲突 5 years ago
wynne1005 3ba1c8ee62 新增组件类型枚举 5 years ago
joke.wang a1af94fe70 Fix Bug #9760 5 years ago
宋军超 076c6c1b4f 扭矩二合一查询关键件清单逻辑优化--目前根据 队列主表，队列明细表，车型散件配置清单，物料信息表。加上条件【一百位条码】,年度型相同，车型相同 内联查出所有的关键件零件——>查询车型散件配置清单中的零件信息 
工位监控逻辑修改:产线添加工位监控模式字段，为空或10执行之前逻辑，为20时不需要查询工单信息，后面逻辑不变
 5 years ago
wynne1005 194f49ca11 agv停车信号 工位重做 倒计时 1 5 years ago
wynne1005 d5ee3d3b29 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 2116fdafc7 agv枚举 5 years ago
宋军超 1ac8fae269 修改枪头更换逻辑 5 years ago
宋军超 a25df616e3 修改展示组件，添加查询队列刷新时间；修改PLC标签地址查询条件 5 years ago
王杰 b3999ad481 dev merge test 5 years ago
王杰 767c1bffbc test merge dev 5 years ago
钮海涛 81266fbfb6 解决合并冲突 5 years ago
王杰 9a74188e55 master merge test 5 years ago
陈思洁 1d799ed294 2447 中航 扣减错误信息保存 5 years ago
joke.wang 8f7d6d46af Fix Bug #9457 5 years ago
王杰 9b6be3167d dev merge test 5 years ago
王杰 d2ff83e22b test merge dev 5 years ago
王杰 411fdbaa7d Merge branch 'test' into dev 5 years ago
王杰 7533a3ef44 [任务2408] 5 years ago
陈思洁 ffbf18944c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 f5b4c666bf 【天津bug修改 9627,9615,9614,9610,9585,9445,9439,9428,9421,9401】 5 years ago
钮海涛 37a12c0cdf Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
wynne1005 3f8789332f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 1252027685 dl小枪 5 years ago
joke.wang b69fcdc0c6 Finish Task #2399 Cost:6h 5 years ago
王杰 e1b3b14a36 test merge dev 5 years ago
宋军超 448bd77b81 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 538b224f67 新增计划外条码识别上线-PCR功能 5 years ago
wynne1005 cc4d17a81f 大枪ok bug 9492 5 years ago
王杰 7e48674d9e dev merge test 5 years ago
王杰 4260316f62 test merge dev 5 years ago
joke.wang e5cd6692d4 Finish Task #2359 5 years ago
wynne1005 25382f0265 Fix Bug #2357,2358 5 years ago
joke.wang 52ad38fa9d Finish Task #2238 5 years ago
王杰 a2f047553f pom 5 years ago
王杰 c20f630402 Merge branch 'test' into dev 5 years ago
王杰 dc91809bb7 test merge dev 5 years ago
王杰 cff90316a5 ptl 5 years ago
宋军超 3d7b43a7de 修改测试天津问题bug 5 years ago
陈思洁 4137fe1a80 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ba35d0a24b 【新增客户标签模板字段】 5 years ago
王杰 82158d8283 [bug 9238 9096] 5 years ago
joke.wang cdf8c79cce Fix Bug #9408 5 years ago
wynne1005 79fb42e149 MES_PROD_BIND_RECORD添加mdt索引 5 years ago
宋军超 bd251113a7 涂装展示组件添加显示实际包装数量 5 years ago
宋军超 6440fd2dfe 首检、巡检报表新增工单号、产线和产品条码查询条件 5 years ago
wynne1005 a84186e023 中航审核发布 5 years ago
宋军超 716f0ac1f9 对象结构添加是否显示和显示顺序字段 5 years ago
宋军超 93d7b4dac8 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
宋军超 f032b6ddcd 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
wynne1005 085f15427d 还原pom 5 years ago
wynne1005 cb4bf9f453 merge andon pom 5 years ago
wynne1005 dfa993b9e9 还原pom 5 years ago
宋军超 e5f3c553ec bug 9122, 展示组件，配置产品位置参数，如果需要显示多个位置，使用逗号间隔。Fix Bug #9122 
bug 9268, 工位BOM查询报错。Fix Bug #9268
bug 9270, 工位BOM查询报错。Fix Bug #9270
bug 9271, 工位BOM查询报错。Fix Bug #9271
所有展示组件添加工步区域缩进功能
 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
陈思洁 6bc9aa1f70 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
王杰 9b56c6d9bf 【任务2223】 5 years ago
陈思洁 556f112ef8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 49f0c0c33a 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
王杰 46261119d9 mes 5 years ago
joke.wang 4bb5dbfac5 Finish Task #2236 Cost:8h 5 years ago
joke.wang f8c6247137 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 44e3d667b3 订单池枚举 5 years ago
袁津哲 257fb6c515 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 315e3a266f 优化涂装上线功能 5 years ago
joke.wang 7457e27180 解决冲突 5 years ago
joke.wang 12478a6251 解决冲突 5 years ago
joke.wang 76e3fb0811 Finish Task #Finish Task #2236 5 years ago
wynne1005 445668a9b2 调整jitseq字段类型 5 years ago
wynne1005 1bc846454e Merge branch 'test' into dev 5 years ago
wynne1005 98849d3131 调整jitseq类型 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 7b795c12fb merge master 5 years ago
宋军超 2d39282521 修改涂装逻辑 5 years ago
陈思洁 27ef6dc7f3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 7f4c173105 【2250 总装条码打印,2228 06 1.2.4.6.1.7 总装上线工位】 5 years ago
joke.wang ad6249f412 Finish Task #2235 Cost:8h 5 years ago
wynne1005 b18408b3bb merge test 5 years ago
王杰 7517a11a90 [任务：2223] 5 years ago
joke.wang ab0ae20d40 Finish Task #2234 客户JIT预装队列 5 years ago
宋军超 59c79b5134 TASK 2205, 开发对接涂装二次箱条码打印。Finish Task #2205 Cost:24h 5 years ago
袁津哲 bdde5bbb9a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 c73ef2b93b 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
wynne1005 b8239f6455 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 6956259496 EDI Finish Task #2215 Cost:48h Left:0h 5 years ago
钮海涛 32eb9dc797 修复合并版本问题 5 years ago
钮海涛 9dca27259e Merge branch 'test' into dev 5 years ago
joke.wang fff94902f7 Fix Bug #9203 5 years ago
wynne1005 614582ce36 条码表增加乐观锁 5 years ago
wynne1005 aaf9f8a21b 添加乐观锁 日志 5 years ago
wynne1005 1fb2f07ca3 edi 添加队列字段 5 years ago
袁津哲 9361512fb8 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 b1dddb62d3 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
王杰 473ebd5ec8 [任务：2219] 5 years ago
wynne1005 d2869dc31a tmp 5 years ago
joke.wang aabd7b5d1d Fix Bug #9112 5 years ago
joke.wang d44312c470 Fix Bug #9151 5 years ago
袁津哲 56a4edc4c0 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 295860683a 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
钮海涛 0626d6f969 修复版本问题 5 years ago
钮海涛 e42ea19f37 修复版本问题 5 years ago
钮海涛 8d4c5f3cd4 Merge branch 'test' into dev 5 years ago
王杰 272d647073 【任务2219】 5 years ago
钮海涛 2478fc3b14 修复版本问题 5 years ago
钮海涛 0f2f56163e Merge branch 'master' into test 5 years ago
wynne1005 d9f619e1a0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3b5142a1f8 edi 5 years ago
宋军超 6f454c95a4 Start Task #2212,2205 Cost:8h Left:16h 5 years ago
宋军超 c44e6ac965 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
袁津哲 e3a86fdbab 涂装条码打印、涂装上线功能联调 5 years ago
joke.wang cf1020d82f 删除@Lob 5 years ago
joke.wang 2829bb5afb pcn同步对象映射 5 years ago
wynne1005 8ae7ce53b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 a757d2c339 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 2ce2e20c0b 包装扫描数量计算有误修复 5 years ago
袁津哲 f607860c57 Fix Bug #8845 
修改关键零部件绑定的数据列中增加带绑定条码的长度、特征码内容bug
 5 years ago
袁津哲 aaaa591be4 优化关键条码绑定逻辑 5 years ago
wynne1005 cf1edee02e edi 5 years ago
王杰 15e7f2a0b5 pom 5 years ago
王杰 ea5a069eeb pom 5 years ago
王杰 ed64d12875 pojo 5 years ago
宋军超 712f1e8d3d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 9218ca44a7 产品条码表添加生产批次lotNo 5 years ago
joke.wang b32136f75d Fix Bug #9078 5 years ago
王杰 f3ffdc7d4c dev merge test 5 years ago
王杰 2c16efcb72 Merge branch 'test' into dev 5 years ago
王杰 7d5d36d084 test merge master 5 years ago
王杰 70d58be136 pom 5 years ago
王杰 91d0ec1671 Merge branch 'master' into test 5 years ago
袁津哲 3247ef5ed7 优化涂装上线工位展示组件逻辑 5 years ago
宋军超 fe05a76f6f 添加涂装功能实体字段与model 5 years ago
袁津哲 66b98dd6d5 1.开发涂装上线功能逻辑 
2.开发涂装工单条码打印逻辑
 5 years ago
宋军超 68fa329701 添加涂装打印实体 5 years ago
陈思洁 5431d09073 【8983 需求调整-泰国MES，工单下达逻辑调整】 5 years ago
wynne1005 c8178975af StationRequestBean添加状态机代码 5 years ago
钮海涛 44ba68bb04 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 d08465dd38 修复版本问题 5 years ago
陈思洁 80e0ec63bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 498d6821a1 【2145 06 1.2.4.6.1.1 注塑计划排产】 5 years ago
钮海涛 800a954b7f Merge branch 'test' into dev 5 years ago
王杰 c2a6fb1684 [任务2186 涂装导入] 5 years ago
陈思洁 1f6af14316 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 0d81228ce7 【2145 06 1.2.4.6.1.1 注塑计划排产】 5 years ago
joke.wang 1f05cfca4c Finish Task #2152 Cost:16h 5 years ago
袁津哲 a4820f236e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 3d88913343 物料表中新增标准包规数量字段 5 years ago
汪云昊 6d71c01178 Merge remote-tracking branch 'origin/dev' into test 5 years ago
陈思洁 9e9bb2fd03 【合并冲突】 5 years ago
陈思洁 f90371f632 【2144 06 1.2.4.6.1.3 装配计划排产】 5 years ago
钮海涛 ac7e69e51e 修复版本问题 5 years ago
王杰 8cf6e99cf6 mes 5 years ago