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

2007 Commits (b48f30fd478d2d1ada0307f73d9e2ecad6f9985a)

Author SHA1 Message Date
simon.song d648228b18 13300 20027-控制计划--点击生效没有响应--2020-12-16 4 years ago
joke.wang 95e92168d9 物料追溯批次model 4 years ago
joke.wang c0d3eb807f 物料批次追溯报表 4 years ago
许心洁 3d1d05ef1c 1.天津委外发运库存移动单打印 4 years ago
许心洁 1474be7486 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
王杰 08a458cee2 unpack 4 years ago
wynne1005 b7c4e76163 增加joined注解 4 years ago
joke.wang ef971201e3 泰国新条码生成 4 years ago
wynne1005 b438735172 Merge branch 'test' into ext-dev 4 years ago
wynne1005 78d86be2f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
wynne1005 8741facd02 中航BI修改 数据同步打印错误日志 4 years ago
joke.wang b37456b227 删除错误提交 4 years ago
joke.wang 85c22ea8bd 电泳上线 4 years ago
陈思洁 1643d57b99 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 a014d8ceaa 【13137 19048 安灯类型没有在看板中展示 20201209】 4 years ago
simon.song 4a120ca375 12736 20027-管理端-控制计划--按照导入模板导入控制计划数据时提示成功，但是无法看到导入的数据-20201124 4 years ago
wynne1005 9242285b4c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
wynne1005 b09a09f70b 修改mes工位监控 异常停止不能复位问题 bi相关问题 4 years ago
陈思洁 981438c2a2 【12997 19048-条码补打查询不到二检箱标签-20201204】 4 years ago
simon.song effc34f74d Merge remote-tracking branch 'remotes/origin/test' into ext-dev 
# Conflicts:
#	modules/i3plus-pojo-mes-pcn/pom.xml
 4 years ago
陈思洁 9478267dd8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 4cfee2dc9c 【12591 20027-BI-生产经理BI报表-调角器工厂生产线产出情况-浮窗解释不清晰-2020-12-04】 4 years ago
Dominic_Xiao ae9978a3bb 新增serialNumber字段 4 years ago
王杰 f9ce9641de 增加索引 4 years ago
joke.wang da293141cd oee bug修复 4 years ago
许心洁 de9578d439 墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成") 4 years ago
simon.song 8dcb1703c9 首检返回值字段调整 4 years ago
simon.song d0e1fcd440 Merge remote-tracking branch 'origin/test' into test 4 years ago
simon.song 56989acba2 12362 20027-管理端-首检检验结果报表状态已完成的对应的数量和已检数量显示有问题-20201115 4 years ago
joke.wang 14c47545e7 查询备件库存修改 4 years ago
王杰 2b522ca15d 工步参数 增加字段 5 years ago
王杰 183111cf65 Merge remote-tracking branch 'i3plus-pojo/test' into test 5 years ago
王杰 d64a8fd31c 工步参数 增加字段 5 years ago
陈思洁 7e37a6e22d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 28da49aa29 【12422 19048 增加喷涂抛光条码查询报表 20201112】 5 years ago
王杰 13868d5cd1 producesn 增加索引 5 years ago
王杰 02d002b958 package detail 增加 联合索引 5 years ago
simon.song 9b57f47af6 修改pom文件 5 years ago
simon.song 3917408421 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
陈思洁 d8d2dea922 Merge remote-tracking branch 'origin/test' into test 5 years ago
陈思洁 a4093d18d1 【12420 19048 喷涂二检增加UNPACK功能 20201112】 5 years ago
王杰 a94b5dd0b0 看板产线配置 5 years ago
陈思洁 fd166bc0ff Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 47e6a86ecd 【天津bug修改】 5 years ago
Dominic_Xiao 0deb9b4733 中航襄阳滑道工厂需求:新增容器编号字段 5 years ago
joke.wang d5b2f4a4cd 生产队列增加分组号字段 5 years ago
Dominic_Xiao 86f9faa01d Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
陈思洁 b0df747d22 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 19636e308e 【12645 19048-喷涂质检报表用开始和结束工单查询无反应-20201123】 5 years ago
wynne1005 d9b4a8eb4d 修改包扫描路径 5 years ago
王杰 7be62a939b TJ看板 5 years ago
joke.wang 970f75f8cf 队列表增加分组号字段 5 years ago
Dominic_Xiao 2a94ce3e0e 包装条码绑定解绑 5 years ago
wynne1005 d893e76ab4 merge 5 years ago
wynne1005 aa450c10e4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 bdf8e0d782 错误pojo修改 5 years ago
simon 55188db083 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 af732b7a4f 合并test代码 5 years ago
宋双双 b188123ab4 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 5 years ago
Dominic_Xiao fd7799b943 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
陈思洁 0bcb009383 【2977 11 2.5.5 整形业务，单件翻包与整箱过站】 5 years ago
joke.wang 2f56f8949e eol看板优化 5 years ago
Dominic_Xiao 20999fd63a 新增不良品处理查询位置列表 5 years ago
陈思洁 95c63fb30b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 6ffec48185 【2977 11 2.5.5 整形业务，单件翻包与整箱过站】 5 years ago
王杰 fa3bb1f53a 涂装 看板 5 years ago
joke.wang c679e7f19b 半成品看板优化 5 years ago
王杰 cf9d3d9f2d tz 看板 5 years ago
wynne1005 db87c0c32f pom版本 5 years ago
joke.wang f6260cec39 看板产线基础页面 5 years ago
陈思洁 22ec710d78 【12420 19048 喷涂二检增加UNPACK功能 20201112】 5 years ago
陈思洁 4311fef1a3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 be8d655eb9 【12420 19048 喷涂二检增加UNPACK功能 20201112】 5 years ago
王杰 59f916ddab produceSn 5 years ago
陈思洁 0fee0dbe67 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 6c04caf728 【天津看板问题修复】 5 years ago
simon 5b2bbf7b1e Merge remote-tracking branch 'origin/test' into test 5 years ago
simon c03446866a 中航-首检单历史记录显示与修改 5 years ago
钮海涛 b9283ec075 合并dev代码 5 years ago
钮海涛 b57ae573ed 合并test代码 5 years ago
钮海涛 4ec6267b4e Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 89a45d326b 合并test代码 5 years ago
钮海涛 f63813d66d 合并master代码 5 years ago
钮海涛 ceebe541f2 Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
joke.wang 0009db6b33 工位技能查询bug修复 5 years ago
joke.wang 7a33df666b JSA JSP表增加索引 5 years ago
joke.wang 148ef03e78 看板产线员工能力矩阵 5 years ago
王杰 e2d6b573f0 不良记录报表 报工报表 5 years ago
王杰 3636b75780 Merge remote-tracking branch 'i3plus-pojo/test' into test 5 years ago
joke.wang e21e49ae93 不良处理增加展示字段 5 years ago
simon 0b68fdbee3 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
joke.wang 445f6b309c 备件消耗替代增加查询字段 5 years ago
Dominic_Xiao 8e3943b306 Merge remote-tracking branch 'remotes/origin/test' into dev 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java
 5 years ago
王杰 c615475dee Merge remote-tracking branch 'i3plus-pojo/test' into test 5 years ago
simon 52974a9633 Merge remote-tracking branch 'origin/test' into test 5 years ago
simon d3bcf1499e 去掉新增字段非空校验 5 years ago
Dominic_Xiao 183d976c38 新增卡斯马展示组件模型 5 years ago
Dominic_Xiao 27d76d86ae Merge remote-tracking branch 'origin/test' into test 5 years ago
Dominic_Xiao a0776b7401 更新卡斯马展示组件,新增展示组件模型 5 years ago
陈思洁 92b395ad3f 【2958 11 2.5.3 热处理上件】 5 years ago
陈思洁 ddc00a617b 【冲突】 5 years ago
陈思洁 2de0d76af3 【2958 11 2.5.3 热处理上件】 5 years ago
王杰 08fc0b54c6 Merge remote-tracking branch 'i3plus-pojo/test' into test 5 years ago
joke.wang 22411fa928 备件导入增加列 5 years ago
汪云昊 f2180f18f3 revert(pojo):还原pom版本 5 years ago
汪云昊 378205ef61 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 cc947c08f5 revert(pojo):还原pom版本 5 years ago
王杰 b7e2ddd2c2 包装明细 增加索引 5 years ago
simon faad8cf4c8 修复取消必填字段 5 years ago
joke.wang 1f306924e4 看板自定义参数页面 5 years ago
宋双双 42feb06058 删除 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage' 5 years ago
simon d8409c5b57 修改文件格式 5 years ago
Dominic_Xiao 22a88a4dc0 卡斯马定时同步实体类 5 years ago
Dominic_Xiao 452024abf6 删除多余类 5 years ago
Dominic_Xiao f551ede492 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
 5 years ago
Dominic_Xiao 61638c391a 包装详情表新增容器位置字段 5 years ago
Dominic_Xiao f1fedb53f4 增加卡斯马业务pojo 5 years ago
Dominic_Xiao eb7ed898df 增加卡斯马业务pojo 5 years ago
Dominic_Xiao 8d0e2b942b 增加卡斯马业务pojo 5 years ago
Dominic_Xiao e919987d68 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
 5 years ago
joke.wang 928c643031 看板自定义参数 5 years ago
王杰 fa01ec478a Mes_Package 表加索引 5 years ago
joke.wang 058bd05b4a mgn-bj esop展示组件优化 5 years ago
陈思洁 14f9dbed22 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 c6a3428cbe 【12420 19048 喷涂二检增加UNPACK功能 20201112】 
12391 19048-条码补打(包装)增加关联批次查询条件-20201112
开线管控问题
 5 years ago
Dominic_Xiao de51b68790 新增表:产品缺陷位置 5 years ago
Dominic_Xiao 31a1c64f69 新增字段:缺陷位置代码 5 years ago
宋军超 84986eb644 添加天津报工报表 5 years ago
simon cea2d334e3 中航-修复公差上线和公差下线赋值问题 5 years ago
Dominic_Xiao ea1d51f32c 删除无用类 5 years ago
Dominic_Xiao 5780306e94 增加序列化 5 years ago
王杰 86998e109e 总装 质量判定 5 years ago
陈思洁 ad70d8f1a3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 fddd66796b 【12276 20027-PCN端 - 巡检检验- 系统生成巡检任务单时没有按照通知计划里面维护的时间去生成巡检任务 -20201105】 5 years ago
宋军超 315d92f5c0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 7b6b97c1b7 修改天津涂装质量检测看板 5 years ago
simon 173e145c56 Merge remote-tracking branch 'origin/test' into test 5 years ago
simon a1dd0fa36b 中航-新增查询质检单检测历史接口 5 years ago
宋军超 5f9d597943 修改天津看板评定项字段DEC->DECEMBER 5 years ago
simon e1e0c12344 Merge remote-tracking branch 'origin/test' into test 5 years ago
simon 30382c5585 中航-公差上线 公差下线字段调整 5 years ago
宋军超 2df948207c 修改天津涂装看板 5 years ago
Dominic_Xiao 46c0206d6a 卡斯马热处理翻包新增模块的dao 5 years ago
simon 1ba56bc59a 调整过程检验返回结果 5 years ago
Dominic_Xiao c2f9937b37 新增卡斯马热处理翻包基础模块 5 years ago
Dominic_Xiao 7bb60b8f6e 新增卡斯马三个基础模块的查询条件封装 5 years ago
Dominic_Xiao 7bb8c5cb35 Merge remote-tracking branch 'origin/test' into test 5 years ago
Dominic_Xiao 07cd3de33f 新增容器位置编号字段 5 years ago
simon a6064a9a19 Merge remote-tracking branch 'origin/test' into test 5 years ago
simon 755d66dbce 中航-停线时根据工单删除当前“巡检项生成明细表” 5 years ago
陈思洁 2911abf193 【12324 20027-PCN端-工单管理-产线管控已经停线，但是在工单管理中点击暂停无法成功提示“90003:工单【1545】需要在停线时才允许暂停[请检查]”-20201109】 5 years ago
宋军超 39da900ae1 添加天津涂装看板 5 years ago
宋军超 12074e24a8 添加天津涂装看板 5 years ago
wynne1005 5070fcc8fb 天津看板 员工矩阵model 新增领导 5 years ago
宋军超 e19d53de4a 添加天津涂装看板 5 years ago
宋军超 98fa35c8a0 添加天津涂装看板 5 years ago
joke.wang ae1bb43764 mgn-bj edi删除多余项 5 years ago
宋军超 6aeb6bddde 添加天津涂装看板 5 years ago
王杰 e775db87fa 紧急插单 5 years ago
宋军超 9bf8018ac1 添加天津涂装看板 5 years ago
宋军超 06c3992b98 添加天津涂装看板 5 years ago
陈思洁 26f075233e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 48a678cc16 【12116 19048-工位监控-参数中选择插入条码，依旧提示过程条码在系统中不存在-20201030】 5 years ago
宋军超 2f81a0f35d 添加天津涂装看板 5 years ago
陈思洁 250d2fbf14 【2932 11 2.3.3QMES产品追溯报表】 5 years ago
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