I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,797 Commits
1 Branch
0 Tags
20 MiB
Commit Graph

1715 Commits (173e145c56ab5413ddde2c5efebbb86f8b85d465)

Author SHA1 Message Date
wynne1005 7b795c12fb merge master
宋军超 2d39282521 修改涂装逻辑
陈思洁 27ef6dc7f3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 7f4c173105 【2250 总装条码打印,2228 06 1.2.4.6.1.7 总装上线工位】
joke.wang ad6249f412 Finish Task Cost:8h
wynne1005 b18408b3bb merge test
王杰 7517a11a90 [任务：2223]
joke.wang ab0ae20d40 Finish Task 客户JIT预装队列
宋军超 59c79b5134 TASK 2205, 开发对接涂装二次箱条码打印。Finish Task Cost:24h
袁津哲 bdde5bbb9a Merge remote-tracking branch 'origin/dev' into dev
袁津哲 c73ef2b93b 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑
wynne1005 b8239f6455 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
wynne1005 6956259496 EDI Finish Task Cost:48h Left:0h
钮海涛 32eb9dc797 修复合并版本问题
钮海涛 9dca27259e Merge branch 'test' into dev
joke.wang fff94902f7 Fix Bug
wynne1005 614582ce36 条码表增加乐观锁
wynne1005 aaf9f8a21b 添加乐观锁 日志
wynne1005 1fb2f07ca3 edi 添加队列字段
袁津哲 9361512fb8 Merge remote-tracking branch 'origin/dev' into dev
袁津哲 b1dddb62d3 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑
王杰 473ebd5ec8 [任务：2219]
wynne1005 d2869dc31a tmp
joke.wang aabd7b5d1d Fix Bug
joke.wang d44312c470 Fix Bug
袁津哲 56a4edc4c0 Merge remote-tracking branch 'origin/dev' into dev
袁津哲 295860683a 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑
钮海涛 0626d6f969 修复版本问题
钮海涛 e42ea19f37 修复版本问题
钮海涛 8d4c5f3cd4 Merge branch 'test' into dev
王杰 272d647073 【任务2219】
钮海涛 2478fc3b14 修复版本问题
钮海涛 0f2f56163e Merge branch 'master' into test
wynne1005 d9f619e1a0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
wynne1005 3b5142a1f8 edi
宋军超 6f454c95a4 Start Task #2212,2205 Cost:8h Left:16h
宋军超 c44e6ac965 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
袁津哲 e3a86fdbab 涂装条码打印、涂装上线功能联调
joke.wang cf1020d82f 删除@Lob
joke.wang 2829bb5afb pcn同步对象映射
wynne1005 8ae7ce53b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
宋军超 a757d2c339 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
joke.wang 2ce2e20c0b 包装扫描数量计算有误修复
袁津哲 f607860c57 Fix Bug 
修改关键零部件绑定的数据列中增加带绑定条码的长度、特征码内容bug
袁津哲 aaaa591be4 优化关键条码绑定逻辑
wynne1005 cf1edee02e edi
王杰 15e7f2a0b5 pom
王杰 ea5a069eeb pom
王杰 ed64d12875 pojo
宋军超 712f1e8d3d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 9218ca44a7 产品条码表添加生产批次lotNo
joke.wang b32136f75d Fix Bug
王杰 f3ffdc7d4c dev merge test
王杰 2c16efcb72 Merge branch 'test' into dev
王杰 7d5d36d084 test merge master
王杰 70d58be136 pom
王杰 91d0ec1671 Merge branch 'master' into test
袁津哲 3247ef5ed7 优化涂装上线工位展示组件逻辑
宋军超 fe05a76f6f 添加涂装功能实体字段与model
袁津哲 66b98dd6d5 1.开发涂装上线功能逻辑 
2.开发涂装工单条码打印逻辑
宋军超 68fa329701 添加涂装打印实体
陈思洁 5431d09073 【8983 需求调整-泰国MES，工单下达逻辑调整】
wynne1005 c8178975af StationRequestBean添加状态机代码
钮海涛 44ba68bb04 Merge remote-tracking branch 'origin/dev' into dev
钮海涛 d08465dd38 修复版本问题
陈思洁 80e0ec63bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 498d6821a1 【2145 06 1.2.4.6.1.1 注塑计划排产】
钮海涛 800a954b7f Merge branch 'test' into dev
王杰 c2a6fb1684 [任务2186 涂装导入]
陈思洁 1f6af14316 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 0d81228ce7 【2145 06 1.2.4.6.1.1 注塑计划排产】
joke.wang 1f05cfca4c Finish Task Cost:16h
袁津哲 a4820f236e Merge remote-tracking branch 'origin/dev' into dev
袁津哲 3d88913343 物料表中新增标准包规数量字段
汪云昊 6d71c01178 Merge remote-tracking branch 'origin/dev' into test
陈思洁 9e9bb2fd03 【合并冲突】
陈思洁 f90371f632 【2144 06 1.2.4.6.1.3 装配计划排产】
钮海涛 ac7e69e51e 修复版本问题
王杰 8cf6e99cf6 mes
宋军超 2ef42fdadd Finish Task:2160,2175.北京麦格纳基础数据开发。 Finish Task #2160,2175 Cost:10h
钮海涛 9d64793a5f Merge branch 'master' into test
joke.wang 3dda15e00a Finish Task Cost:24h
袁津哲 edae2b00f6 Fix Bug #8996,#9033 
1.PCN同步配置界面同步方式及同步类型显示为空-0617
2.原材料上线扫描显示数量不正确
wynne1005 64b00d6717 接口表添加产品条码
陈思洁 b65d9e0f3d 2171 首检生成逻辑调整
wynne1005 b0df686091 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
wynne1005 878acb869f 提交zh修改问题
袁津哲 c066820b18 Fix Bug 
关键件绑定异常问题
袁津哲 cb69f62c63 Fix Bug 
原材料上线扫描，无法看到原材料已扣减数量和剩余数量
wei.peng b0e752c65e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
王杰 0388c36c41 mes
袁津哲 212dccad6c 同前端联调倒计时组件逻辑
wei.peng ec3febfaa9 Merge remote-tracking branch 'remotes/origin/dev' into test
陈思洁 67a7904024 【泰国演示问题修复】
袁津哲 2546395b8d 优化定时倒计时组件逻辑和前后端调用逻辑
袁津哲 089f655cfe 优化工位定时组件调用逻辑
wynne1005 8ff96a0c3f merge master 防止冲突更多
joke.wang ab8ee21c66 Finish Task Cost:8h
wynne1005 b0b07437d6 还原pom
袁津哲 b114daed3f 优化代码
wynne1005 9571604351 Merge branch 'dev' into test
joke.wang 26d7701a49 包装扫描需求变更
陈思洁 3924be2504 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 e7e13e53f4 【工艺流程设计-更新前端组件】
joke.wang f5452667f6 Start Task Cost:16h Left:8h
joke.wang 672483245c Fix #Bug 8904
袁津哲 764060bf20 Start Task Cost:8h Left:0h 
Finish Task  Cost:8h
袁津哲 5ee4fd6441 开发MES产线AGV停机记录报表功能
wynne1005 de08f2005e 还原hqlpack
joke.wang cb4fd979e1 包装字段修改
wynne1005 60c1f6ecab 还原pom
wynne1005 47ae0b46ef 还原pom
wynne1005 ba1ba8bc0f Merge branch 'dev' into test
wynne1005 8623a5a13d 还原pom
wynne1005 b75347ffc1 还原pom
wynne1005 d969c07317 解决冲突
wynne1005 4eef0f8c45 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 c9114c9dae Fix Bug
王杰 a495d0b4ce 物料校验项]
宋军超 247589fc0d Fix Bug
wynne1005 40d921ddd6 优化 新增状态点类型，发运自测1
袁津哲 42f43c58f5 Fix Bug
袁津哲 32ddc567a0 Start Task Cost:24h Left:0h 
Finish Task  Cost:24h
袁津哲 0067e31420 合并test分支代码到dev分支
宋军超 d18beff50c Finish Task Cost:16h
钮海涛 7982cefc1e Merge branch 'test' into dev
钮海涛 2f8b0ba5db 修复版本问题
钮海涛 a71d7a31ce Merge branch 'master' into test
袁津哲 fb4bf4cbe2 Fix Bug
joke.wang 1afa60623c Finish Task Cost:16h
陈思洁 1cedf2b75b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
陈思洁 47904278c5 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615
wynne1005 86363b2012 Finish Task Cost:8h
宋军超 1ce748eecb Fix Bug
宋军超 3c53d8a2f2 Finish Task Cost:24h
陈思洁 9f6ecf72a0 【2002 泰国内饰生产作业-按生产工单，单件生产】
袁津哲 7aaa8bca6d 合并dev分支代码到test分支
宋军超 3c1f8cf6b1 Finish Task Cost:24h
袁津哲 b0f3873aea Merge remote-tracking branch 'origin/dev' into dev
袁津哲 a8dd9831e0 Start Task #2021,2022 Cost:8h Left:8h
曾贞一 4c3571182c 【冲突】
曾贞一 523e4b7b3b 【2016 BH-回传检测结果至MES系统】
陈思洁 35fdc95250 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
陈思洁 0727370002 8660 MES-202005-PCN首检、巡检需要支持扫描产品条码录入检测值-20200527
陈思洁 2efab3b0cc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 01e7224d1e 【合并冲突】
钮海涛 7414b76d85 修复合并版本问题
钮海涛 32a566be93 Merge branch 'test' into dev
钮海涛 6061f89d43 修复合并版本问题
袁津哲 1e29445697 Merge remote-tracking branch 'origin/dev' into dev
袁津哲 868e82d83a Start Task Cost:16h Left:0h 
Finish Task  Cost:16h
陈思洁 1102513fb7 【1926 盲检工步】
陈思洁 76b96540ca 【1926 盲检工步】
陈思洁 dda5a4c7e9 【合并冲突】
陈思洁 55de940f7c 【1926 盲检工步】
陈思洁 bbef19ed71 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
陈思洁 f6cd0b6b0b 【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】
wynne1005 85f99fcdfa 提测 还原pom
wynne1005 b43317c11a 还原pom
wynne1005 5f80cc4322 Merge branch 'dev' into test
陈思洁 759cb39827 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
陈思洁 260899368d 【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】
wynne1005 2d69c3ab18 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005 6b9d56f9e0 自测修改
joke.wang 00ca9bef40 Finish Task Cost:16h
宋军超 56dec41ad0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 f5074fba08 Finish Task Cost:16h
陈思洁 94c7526d65 【盲检工步】
陈思洁 4d4469ebc9 【合并冲突】
陈思洁 3848c6da14 【盲检工步】
宋军超 febbb549fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 612d768999 Start Task Cost:5h Left:3h
joke.wang a8241a1694 Start Task Cost:8h Left:8h
袁津哲 399c9c828e Fix Bug #1916,1917
宋军超 c2a5a17379 工步参数添加工步弹框参数字段
joke.wang 342e5f7ab2 Effort Task Cost:2h Left:0h
wynne1005 8ef3997038 还原pom
wynne1005 4150543cb4 Effort Task Cost:16h Left:8h
钮海涛 4d26c95639 Merge branch 'test' into dev
joke.wang d4f0ef157a Finish Task Cost:8h
宋军超 659b893903 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 b05113f63c Finish Task Cost:16h
钮海涛 47131ff13f 修复版本问题
钮海涛 f392a13832 Merge remote-tracking branch 'remotes/origin/master' into test
袁津哲 37092cf2c5 Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
袁津哲 d65a5a3784 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
袁津哲 44f313abc4 Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
宋军超 9eda1f67b7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 40672559e4 修改sonar--BUG类型问题
wynne1005 8955fd2f4d mes提测 还原pom
wynne1005 23754d3f18 mes提测 还原pom
wynne1005 81753d3260 Merge branch 'dev' into test
wynne1005 81b554fc8b Merge branch 'test'
wynne1005 0636daed51 Finish Task:1896 Cost:8h
陈思洁 677cc85360 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 b2384619d4 【1891 队列条码打印-管理端】
宋军超 fd9a2e6d15 Start Task Cost:8h Left:8h
joke.wang dd179a6d89 Fix Bug
joke.wang 1a72c16f14 Finish Task Cost:8h
wynne1005 b48ba8c481 Finish Task Cost:32h
wynne1005 8aef23e4ad Finish Task edi webservice解析 Cost:32h
陈思洁 4d63f9817e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 9b8342b7f5 【1865 客户JIT生产队列，自动下达定时JOB】
钮海涛 999a415d27 修复版本问题
钮海涛 b9cbf9684b Merge branch 'test' into dev
钮海涛 4921d55bda 修复版本问题
钮海涛 b303cf9a14 修复合并问题
钮海涛 96fdbe0e07 Merge branch 'master' into test
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev
袁津哲 f50b76cd1f Task1858:电枪枪头更换计数
陈思洁 5b167546e4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
陈思洁 e42641855d 【8528 收货检验-图片上传】
wynne1005 608aa6be90 还原pom
wynne1005 99d3c9d721 提测合并 还原pom
wynne1005 5ef88c80c0 提测合并 还原pom
wei.peng 6169542dbb 合并代码  有代码丢失或者文件丢失请排查此处 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
王杰 8e94cbb8fa pojo 序列号
袁津哲 8b63dea809 Merge remote-tracking branch 'origin/dev' into dev
袁津哲 08b03c9eb8 Task1858:电枪枪头更换计数
宋军超 8d2f6fb8d1 任务：【1842】-海纳川基础数据修改字段类型
joke.wang 88a0d6d02f 任务:[1828] 半成品绑定工步增加逻辑
陈思洁 8ab6e77620 【8528 收货检验-图片上传未开发】
宋军超 1f55c06368 任务：【1842】-海纳川通用导入添加对应工具类、实体和model
陈思洁 7eb72ee5d1 【调试接口回传和同步】
宋军超 9778561725 任务：【1842】-添加海纳川基础数据维护模块
陈思洁 a1c0b6ff26 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
陈思洁 1ea5b54052 【生成质检单增加是否让步字段】
joke.wang b741b6950b bug: [8516] 重新计算bug 1
王杰 786c442d55 解决冲突
宋军超 18e037da7f 任务：【1842】-添加海纳川基础数据的Repository
宋军超 af6b0ce0fd 任务：【1842】-添加海纳川5个基础数据模块的实体与枚举
joke.wang 0352980cde bug: [8516] 重新计算bug修复
钮海涛 c1241bd6c5 修复版本问题
钮海涛 53a421b3b9 修复版本问题
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test
王杰 029763feb1 pom
王杰 30fcf4f23f pom冲突
王杰 716e1f7df1 Merge branch 'test' into dev
陈思洁 9cc193c12b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 d2a31eac70 【1804 质检检测-来料检验功能】
joke.wang 25bd05348d [serialVersionUID重复问题]
汪云昊 717f268c28 POJO版本号还原
钮海涛 281ef662b1 merge test
陈思洁 6fbfea417f 【1804 质检检测-来料检验功能】
陈思洁 aef8841223 【合并冲突】
陈思洁 60973a3ee0 【1804 质检检测-来料检验功能】
贾文涛 c4510fb121 BUG #8485,修复数据权限-查询启用禁用无效
宋军超 00df3134b2 任务：【1829】-更新检测单和检测单明细实体
joke.wang de9c901a3b [任务：1826 库存排程配置]
joke.wang 222ba4f8a4 [任务：1825 plc增加默认属性字段]
王杰 a6e9b90026 pom
宋军超 1f97be3078 添加检测结果报表（5个界面）
宋军超 82af372fc0 添加检测过程类型枚举
王杰 de9017ca5c 冲突
王杰 c68d49880c Merge branch 'dev' into test
王杰 7d192b36a6 pom冲突
joke.wang 1fec97f0c1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
joke.wang 24806b9e2e [oee优化]
宋军超 78ff224fe4 删除查询供应商
宋军超 79e90298ef 添加供应商查询
宋军超 98091426f2 修改实体
宋军超 f302b4d5f1 修改MES_检验单实体字段
宋军超 e7335bb632 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 4f5f9777a2 修改实体与model字段
贾文涛 f7b3250d70 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
贾文涛 abbab6bda4 数据权限-工单模块检索添加数据权限功能
joke.wang 664bf80434 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
joke.wang 23d1762b5b [bug: 8422 半成品标签打印bug]
钮海涛 da8b4db890 修复pom版本问题
宋军超 a1579a2484 添加过程检测报表model
宋军超 6d7d8de7b3 添加MES_检验单和MES_检验单明细的实体和枚举
宋军超 32de58277a 添加MES_检验单和MES_检验单明细的实体和枚举
宋军超 7ef769268d 添加MES_检验单和检验单明细实体与枚举
joke.wang 5fb7eecee0 [任务：1752 oee看板]
贾文涛 e668ef4b28 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
贾文涛 eadf0d67f8 添加数据权限处理方法
钮海涛 f87eeeb491 修复合并版本问题
钮海涛 ac268c1cbc Merge branch 'test' into dev
陈思洁 543f0f5c4c 【代码合并还原】
joke.wang b450df5754 [任务：1752工厂oee]
joke.wang 142f8e79c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
joke.wang f41cd22258 [bug: 8353 拍照采集]
wynne1005 63bc0b5928 merge test
wynne1005 46a91a13bc jis 去除rule关键字
wynne1005 25b2fb8e21 jis pojo 去除rule 关键字
陈思洁 28de0251ea 【sonar bug修改】
钮海涛 bbe03cc6fd 解决合并冲突问题
钮海涛 1b88b20e13 Merge remote-tracking branch 'origin/dev' into dev
钮海涛 40a87d83b3 修复合并问题
贾文涛 6760ed79dd 数据权限-修改启用禁用问题
钮海涛 005d0f7f86 修复合并问题
钮海涛 d74d78353d Merge branch 'test' into dev
钮海涛 bc269e1f71 Merge branch 'master' into test
王杰 1dff3327d7 任务：1733 条码模板逻辑调整
joke.wang 363ac22ade [任务：1750 OEE运算JOB]
wynne1005 1cda7e902b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
宋军超 f9dfc8e0e2 plc地址清单添加plc类型字段(枚举)，设备台账添加作业校验模式字段(枚举)
wynne1005 27e4fb164b Merge branch 'dev' into test
王杰 724e784fe3 Merge remote-tracking branch 'i3plus-pojo/dev' into dev
王杰 c5d4cd7dad 生产计划编制
wynne1005 d925ec62bf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005 888d87f12e task edi
joke.wang f38a47cc68 [oee 定时任务]
贾文涛 a563537750 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
贾文涛 e63601716f 1736-MES数据权限模块开发
宋军超 e5e41f09e7 新增散件产品配置功能
陈思洁 ae156ad82f 【动态按钮--完成按钮修改mes和mespcn】
joke.wang 3227cfa47e [oee]
wynne1005 4ed1770189 Merge branch 'dev' into test
陈思洁 32f6215be7 【8309 产品配方导入-导入报错】
王杰 da1c10dc4c mes生产计划批量编制
曾贞一 cf12f354ae [8206 生产工单-导入失败]
joke.wang de7d007ef1 [获取工步sql server分组函数问题修复]
陈思洁 ad8255949a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 be925fded9 【1693-设备状态监控看板】
joke.wang 60428b5bad [任务：1690 界面窗口]
陈思洁 22b42d710b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
陈思洁 ff6e5ac926 【8239 生产作业-单产品扫描（数据写入有误）】
汪云昊 2ab9045d17 Merge remote-tracking branch 'remotes/origin/dev' into test
王杰 2b01efb15b mes生产计划批量编制
wynne1005 d5f69eeefd task 1565 发运修改
宋军超 92c13e5bcd 添加人员技能功能
wei.peng 37922cab29 POM 文件修改 
Merge remote-tracking branch 'remotes/origin/test'

# Conflicts:
#	modules/i3plus-icloud-report/pom.xml
wei.peng 8aab106aa9 合并代码 pom 冲突 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
宋军超 b96eb1b669 添加人员技能功能
陈思洁 2c50fceec9 【1693-设备状态监控看板】
陈思洁 87664b96cb 【合并冲突】
陈思洁 abd974f54f 【1693-设备状态监控看板】
钮海涛 3fbf532c84 修复pom版本问题
钮海涛 a1eb3c3bc2 修复pom版本问题
钮海涛 2e2ee2cc6c Merge branch 'test' into dev
钮海涛 c6d36af4c9 Merge branch 'master' into test
joke.wang 755fccb45e [任务：1690 产能监控看板]
joke.wang ee1c2131ff [任务：1716 写入产品下线记录]
joke.wang aa9ee803b8 [任务：1683-看板管理 展示]
joke.wang 795312637c [任务：1683-看板管理 计划产能]
joke.wang e6f3dd5c32 [任务：1683-看板管理]
王杰 9da9a568f5 mes
joke.wang 4e02acb9e3 [任务：1683-看板管理]
wynne1005 fb60d75eea 还原test pom
wynne1005 d6fe718e4c Merge branch 'dev' into test
qianhs 0a2d9a3d6d 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
joke.wang fa8e4c1b55 [任务：1683 看板管理]
wynne1005 64f3dcf276 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005 cfb5aab8ea 新增工步集合 repository
qianhs 62883c5cc0 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
joke.wang 43bc24340c [料架条码打印优化]
wynne1005 430adb8d97 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005 1c4050b71f 工步返回内容修改
王杰 74a4a1381c mes
joke.wang 4c637b4e83 [写入JIT发运接口表]
joke.wang 48ee207a8a [删除多余项]
joke.wang d22bd22012 [任务：客户JIT自动下达]
宋军超 8fe5574c67 part实体中@Column(name = "产品生产类型")改为@Column(name = "PPT_CODE")
陈思洁 5d8fec4938 合并冲突
陈思洁 7505087392 【mes 产品配方导入功能和基础数据维护】
王杰 0a14b533d7 任务1659 返工返修
曾贞一 9102a3691b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
曾贞一 10fc6ded8d 【1558 生产工单管理-泰国需求】
joke.wang 280385eb20 [bug: 8092 SOP信息需求变更]
joke.wang 54ff0deb87 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
钮海涛 efe083a9da 修复版本号
宋军超 e464b4d699 删除设备备件管理相关实体
宋军超 89a9946432 添加设备管理相关功能
joke.wang b17cf60ac6 [任务：1571 生成报功数据 需求变更]
曾贞一 e5c275499c 【冲突解决】
曾贞一 255aefbcef 【1585 销售订单管理-销售订单维护】
wynne1005 81f05c233a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005 93622f5dc7 中航 开线管控 提交
宋军超 aac4e24113 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 b02d7372f6 添加散件bom批量导入功能
joke.wang 9e0fbef169 [按钮组件代码优化]
wynne1005 48f94c0369 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005 cc739eac24 task `1565` 发运pojo
joke.wang 99e055da3c [现场问题：111 检测项报表]
wynne1005 035e77c0ab Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005 5d6588b5af task `1565` 增加发运字段
陈思洁 03d2ee9246 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 244270684d 【泰国项目】
wynne1005 86713a01f2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
joke.wang 4469d92344 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
joke.wang f1baf4fdbe [麦格纳问题：111 检测项报表]
宋军超 8109275630 添加散件BOM导入
宋军超 69b620336f 散件BOM导入
wynne1005 15c9e7111b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
qianhs ca85c59cdb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
qianhs 20f5bfc9eb wms数据同步迁移至mes
陈思洁 72563a4eb5 【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】
王杰 c6aefc89e7 test合并dev解决ct
王杰 94fed3b9b2 Merge branch 'test' into dev
joke.wang 3e33a7ac3a [客户jit增加JIT排序号字段]
wynne1005 b5ecb91399 中航四月十号 内容提交
joke.wang 4e8c4ae46f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
joke.wang caf8feb374 [采集工步存入生产数据格式修改]
joke.wang 11adb5ff09 [麦格纳问题：111 检测项数据报表]
joke.wang 1d50c135ac [麦格纳问题：87 增加工单管理页面]
wei.peng aa1f7a2845 Merge remote-tracking branch 'remotes/origin/test'
钮海涛 4dee474c73 修改POM版本号
钮海涛 417120358c Merge branch 'test' into dev
钮海涛 288fb4a16b 修改POM版本号
陈思洁 cd810ce1fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 5a6c525d1f 【MES_生成条码模型增加时分秒字段】
王杰 3f3d0038e8 【任务：1608 数据监听预警配置，定时任务】
qianhs 2e85d99380 联调测试
wynne1005 dbba31670d 增加条码生产
wynne1005 17f6ac6609 删除重复字段
wynne1005 07d8e12216 commit stationrequestbean
wynne1005 2e177ba671 dev合并test test有修改
汪云昊 2772ea6a2f Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml
#	modules/i3plus-pojo-aps/pom.xml
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-form/pom.xml
#	modules/i3plus-pojo-hardswitch/pom.xml
#	modules/i3plus-pojo-jobflow/pom.xml
#	modules/i3plus-pojo-lac/pom.xml
#	modules/i3plus-pojo-mes-pcn/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-ptl/pom.xml
#	modules/i3plus-pojo-report/pom.xml
#	modules/i3plus-pojo-softswitch/pom.xml
#	modules/i3plus-pojo-sweb/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	modules/i3plus-pojo-workflow/pom.xml
#	pom.xml
汪云昊 8a8c3ee34d pom版本调整
wynne1005 763d72b128 dev合并麦格纳的test
joke.wang 14bb71f9f2 [料架条码打印查询修改]
wynne1005 581d900123 状态机model提交
qianhs ba4b450437 联调测试
wynne1005 12e31f630b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
wynne1005 ba90a50621 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
qianhs 8c635c3557 联调测试
qianhs 7244fb38b1 联调测试
wynne1005 e289414363 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 b3032ca8e8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 45dda6ea57 添加散件配置报文关系和工装明细实体
陈思洁 30608f886b 解决冲突
陈思洁 d9d2113f75 【MES_增加枚举】
贾文涛 492dfbff82 pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
qianhs 836a4f710d 联调测试
宋军超 b3cecc9481 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
宋军超 f64a543a4a 添加产品流程批量配置功能
王杰 cd99a63233 mes
汪云昊 0d75c1eac7 Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
wynne1005 032fb350c8 queueordermodel添加构造函数
王杰 5fc4c6c025 mes
钮海涛 52a5c1e2f8 Merge branch 'test' into dev
qianhs 851bd1feec 联调测试
wynne1005 4324457b61 merge
wynne1005 dce52df770 组件传参给工步
qianhs 241ec4974b 联调测试
wynne1005 351ea8755e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005 6a36ad7601 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
zcg 83d7a618bf 按钮组件model修改
qianhs 3654d60214 【bug7947】PLC监听工步装队列无法显示
zcg 078e1a77a4 【bug 7895 PLC信息-页面需修改】
钮海涛 82d5332861 修复POM文件问题
钮海涛 c3a5564652 任务【1483】：LES-新增拉动规则表 
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
汪云昊 ec1d52e7dd MAVEN 版本控制调整
贾文涛 7106c06221 统一修改pom文件的项目版本问题0331
joke.wang 1b0d0f8c6b [任务：1576 动态按钮加载]
wynne1005 d1ff70adc4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005 44696061ee 修改pom文件为最新
zcg 75832427e8 【task 1539 工位扫描-按钮组件结构搭建】
曾贞一 bcb8dee045 【1558 生产工单管理-泰国需求】
wynne1005 3c08e7794f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
贾文涛 eed24e0297 统一修改pom文件的项目版本问题
qianhs 3b763b45cd 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
joke.wang 4cb3d89ad6 [bug: 7637 生产数据ees查询修改]
钮海涛 c37809d5b7 合并源仓库的修改
wynne1005 f345ed2b2f Merge branch 'dev' into test
wynne1005 d80b341620 还原test pom
王杰 0502f6d736 【任务：1529，料架分组队列展示组件】
joke.wang 7a6e9b9e21 [任务：1479 料架打印]
陈思洁 c4032b8ed5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 320969f2f0 【1527 半成品标签自动打印】
贾文涛 048419d823 修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
wynne1005 4b4bf4e433 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
钮海涛 9d5567f4a6 Merge branch 'test' into dev
王杰 e3a9defdab 任务1528，生成并打印门锁标签
wynne1005 6336ebd8e9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005 8b750e6a76 修改生产数据类型
王杰 a9a7d78bd5 解决冲突
joke.wang 9d55a2a8b3 [解决冲突1]
joke.wang 8b681af622 [解决冲突]
joke.wang 045dc01479 [任务：1479 料架条码打印]
王杰 f578311f55 数据复核
qianhs 564ba1e116 【1472 工步-设备状态采集（原PLC采集【设备状态】）】
qianhs c53999b0d2 Merge remote-tracking branch 'origin/dev' into dev
joke.wang 79788daf8b pom 修改
zcg 74e4aa953b 【任务 1480 照片采集】
joke lin 62cee148cd [bug: 7875 客户JIT生产工单]
钮海涛 9da6628884 Merge branch 'master' into test
陈思洁 cc207240b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
陈思洁 bacab3fb88 【MES_新增设备工装关系和工装操作记录pojo】
王杰 9f8e51830e mes enum
qianhs 8d18c61d63 Merge remote-tracking branch 'origin/dev' into dev
joke lin 126440c976 [任务：1435 客户JIT导入]
陈思洁 310bf49af6 【MES_校验是否换膜并推送换模信号 】
陈思洁 22788f1c44 还原POM文件TEST-DEV
qianhs a93882c881 Merge remote-tracking branch 'origin/dev' into dev
曾贞一 779b9d209c 【修改 DEV-pom.xml】
qianhs 26bf62fbe7 设备状态采集工步
陈思洁 474bb995d6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
王杰 7d743c2c7f Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
陈思洁 b3e38170e6 【1440 PLC采集工步【生产数据】】
luweihao e90ea98d1f 解决冲突
luweihao 03f1c4fddf 修改生产数据结构
王杰 af4cb74392 Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
joke lin 3b928c6ddc [bug: 7637 生产数据]
joke lin e8f48bcb04 [bug: 7637 生产数据查询]
王杰 b6a83fff5d Merge branch 'dev' into test
zcg 3d28840bae 【新增枚举，pojo】
luweihao 16879a4f20 Merge branch 'dev' into test
陆卫豪 a65350bbf8 Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev
luweihao 12579c7a14 还原pom
luweihao b52bb02d73 task `1430` 工位扫描，产品信号监听，队列监听
zcg 416c2ceffc 【任务 1443 excel模板导入功能修改】
zcg 9388e3b4f2 【pojo 冲突提交】
luweihao 679319635a task `1430` 工位扫描，产品信号监听，队列监听
陈思洁 4fec84f810 【PTL_PLC配置表增加字段】
陆卫豪 60ab731ffd Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev
joke lin d4e1e854c5 [任务：1441 plc推送数据]
qianhs 65572b34a0 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
zcg bd82a0fba7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
曾贞一 2625c2cb0f 【修改 TSET-pom.xml】
joke lin 4823660070 [任务：1435 计划管理]
王杰 80ca438ce3 test合并到dev解决pom冲突
曾贞一 5ebb5cbf20 【修改 TSET-pom.xml】
贾文涛 30722b130c Merge branch 'test' of i3-IMPP/i3plus-pojo into master
王杰 068a0956db 解决冲突
王杰 b77d3065a4 Merge branch 'test' into dev
曾贞一 4fcd7cbc3f Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
joke lin cb09776bdb [任务：1435 计划管理]
陈思洁 102af98a75 【PTL_增加主任务编号字段和组内编号字段】
zcg 7aecf9dcc0 【task 1436 工步-关键件绑定校验并转过程条码】
joke lin ccf2817788 [计划管理]
曾贞一 0acf2dc0ae Merge remote-tracking branch 'remotes/origin/dev' into test
钮海涛 ca6e094271 Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
luweihao 00252caa0c 移动mespcn公用model
luweihao 005db6ac5b Merge branch 'dev' into test
luweihao 7beaa515c8 task `1428` 作业流程
joke 531596d2d4 [mes: 49 JIT计划与管理]
luweihao 9f95e97ec3 Merge branch 'test'
luweihao 7c77c90a3c task 作业流程
luweihao dd6007656c Merge branch 'dev' into test
luweihao 4918707fc8 bug `7626` 开线管控-数据存入数据库错误
luweihao f67dd06cd4 Merge branch 'dev' into test
luweihao 5892f87bdc task `1425` pcn pojo 迁移
luweihao b0d214f204 Merge branch 'test'
luweihao 51152656cc Merge branch 'dev' into test
luweihao e2d63434db bug `7570` `7561` 生产扣减代码去除测试代码
王杰 7662905caa Merge branch 'test'
jenkins 1ada447069 Jenkins自动合并
luweihao 68cbd54f37 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
luweihao 5fd51f6b1d task 任务重试测试
joke d42b7ebbb6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
joke 2b84f93950 任务: 1424 DT通信
luweihao be2f1cb146 Merge branch 'dev' into test
luweihao 5eb7cf03ed task 数据同步添加错误信息字段
luweihao 03a139e435 Merge branch 'dev' into test
luweihao e38839db6c task `1408` 数据同步修改
jenkins 499a5ed894 Jenkins自动合并
luweihao 1a2f00afc3 task `1408` 添加数据同步存储
jenkins a9d94ecff7 Jenkins自动合并