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 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
宋军超 2ef42fdadd Finish Task:2160,2175.北京麦格纳基础数据开发。 Finish Task #2160,2175 Cost:10h 5 years ago
钮海涛 9d64793a5f Merge branch 'master' into test 5 years ago
joke.wang 3dda15e00a Finish Task #2153 Cost:24h 5 years ago
袁津哲 edae2b00f6 Fix Bug #8996,#9033 
1.PCN同步配置界面同步方式及同步类型显示为空-0617
2.原材料上线扫描显示数量不正确
 5 years ago
wynne1005 64b00d6717 接口表添加产品条码 5 years ago
陈思洁 b65d9e0f3d 2171 首检生成逻辑调整 5 years ago
wynne1005 b0df686091 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
wynne1005 878acb869f 提交zh修改问题 5 years ago
袁津哲 c066820b18 Fix Bug #9001 
关键件绑定异常问题
 5 years ago
袁津哲 cb69f62c63 Fix Bug #8886 
原材料上线扫描，无法看到原材料已扣减数量和剩余数量
 5 years ago
wei.peng b0e752c65e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 0388c36c41 mes 5 years ago
袁津哲 212dccad6c 同前端联调倒计时组件逻辑 5 years ago
wei.peng ec3febfaa9 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
陈思洁 67a7904024 【泰国演示问题修复】 5 years ago
袁津哲 2546395b8d 优化定时倒计时组件逻辑和前后端调用逻辑 5 years ago
袁津哲 089f655cfe 优化工位定时组件调用逻辑 5 years ago
wynne1005 8ff96a0c3f merge master 防止冲突更多 5 years ago
joke.wang ab8ee21c66 Finish Task #2139 Cost:8h 5 years ago
wynne1005 b0b07437d6 还原pom 5 years ago
袁津哲 b114daed3f 优化代码 5 years ago
wynne1005 9571604351 Merge branch 'dev' into test 5 years ago
joke.wang 26d7701a49 包装扫描需求变更 5 years ago
陈思洁 3924be2504 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 e7e13e53f4 【工艺流程设计-更新前端组件】 5 years ago
joke.wang f5452667f6 Start Task #2139 Cost:16h Left:8h 5 years ago
joke.wang 672483245c Fix #Bug 8904 5 years ago
袁津哲 764060bf20 Start Task #2118 Cost:8h Left:0h 
Finish Task #2118 Cost:8h
 5 years ago
袁津哲 5ee4fd6441 开发MES产线AGV停机记录报表功能 5 years ago
wynne1005 de08f2005e 还原hqlpack 5 years ago
joke.wang cb4fd979e1 包装字段修改 5 years ago
wynne1005 60c1f6ecab 还原pom 5 years ago
wynne1005 47ae0b46ef 还原pom 5 years ago
wynne1005 ba1ba8bc0f Merge branch 'dev' into test 5 years ago
wynne1005 8623a5a13d 还原pom 5 years ago
wynne1005 b75347ffc1 还原pom 5 years ago
wynne1005 d969c07317 解决冲突 5 years ago
wynne1005 4eef0f8c45 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 c9114c9dae Fix Bug #8688 5 years ago
王杰 a495d0b4ce 物料校验项] 5 years ago
宋军超 247589fc0d Fix Bug #8884 5 years ago
wynne1005 40d921ddd6 优化 新增状态点类型，发运自测1 5 years ago
袁津哲 42f43c58f5 Fix Bug #8778 5 years ago
袁津哲 32ddc567a0 Start Task #2021 Cost:24h Left:0h 
Finish Task #2021 Cost:24h
 5 years ago
袁津哲 0067e31420 合并test分支代码到dev分支 5 years ago
宋军超 d18beff50c Finish Task #2094 Cost:16h 5 years ago
钮海涛 7982cefc1e Merge branch 'test' into dev 5 years ago
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
袁津哲 fb4bf4cbe2 Fix Bug #8778 5 years ago
joke.wang 1afa60623c Finish Task #2090 Cost:16h 5 years ago
陈思洁 1cedf2b75b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 47904278c5 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
wynne1005 86363b2012 Finish Task #2098 Cost:8h 5 years ago
宋军超 1ce748eecb Fix Bug #8771 5 years ago
宋军超 3c53d8a2f2 Finish Task #2064 Cost:24h 5 years ago
陈思洁 9f6ecf72a0 【2002 泰国内饰生产作业-按生产工单，单件生产】 5 years ago
袁津哲 7aaa8bca6d 合并dev分支代码到test分支 5 years ago
宋军超 3c1f8cf6b1 Finish Task #1889 Cost:24h 5 years ago
袁津哲 b0f3873aea Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 a8dd9831e0 Start Task #2021,2022 Cost:8h Left:8h 5 years ago
曾贞一 4c3571182c 【冲突】 5 years ago
曾贞一 523e4b7b3b 【2016 BH-回传检测结果至MES系统】 5 years ago
陈思洁 35fdc95250 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 0727370002 8660 MES-202005-PCN首检、巡检需要支持扫描产品条码录入检测值-20200527 5 years ago
陈思洁 2efab3b0cc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 01e7224d1e 【合并冲突】 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 32a566be93 Merge branch 'test' into dev 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
袁津哲 1e29445697 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 868e82d83a Start Task #2019 Cost:16h Left:0h 
Finish Task #2019 Cost:16h
 5 years ago
陈思洁 1102513fb7 【1926 盲检工步】 5 years ago
陈思洁 76b96540ca 【1926 盲检工步】 5 years ago
陈思洁 dda5a4c7e9 【合并冲突】 5 years ago
陈思洁 55de940f7c 【1926 盲检工步】 5 years ago
陈思洁 bbef19ed71 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 f6cd0b6b0b 【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】 5 years ago
wynne1005 85f99fcdfa 提测 还原pom 5 years ago
wynne1005 b43317c11a 还原pom 5 years ago
wynne1005 5f80cc4322 Merge branch 'dev' into test 5 years ago
陈思洁 759cb39827 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 260899368d 【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】 5 years ago
wynne1005 2d69c3ab18 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 6b9d56f9e0 自测修改 5 years ago
joke.wang 00ca9bef40 Finish Task #1960 Cost:16h 5 years ago
宋军超 56dec41ad0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 f5074fba08 Finish Task #1898 Cost:16h 5 years ago
陈思洁 94c7526d65 【盲检工步】 5 years ago
陈思洁 4d4469ebc9 【合并冲突】 5 years ago
陈思洁 3848c6da14 【盲检工步】 5 years ago
宋军超 febbb549fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 612d768999 Start Task #1932 Cost:5h Left:3h 5 years ago
joke.wang a8241a1694 Start Task #1960 Cost:8h Left:8h 5 years ago
袁津哲 399c9c828e Fix Bug #1916,1917 5 years ago
宋军超 c2a5a17379 工步参数添加工步弹框参数字段 5 years ago
joke.wang 342e5f7ab2 Effort Task #1915 Cost:2h Left:0h 5 years ago
wynne1005 8ef3997038 还原pom 5 years ago
wynne1005 4150543cb4 Effort Task #1940 Cost:16h Left:8h 5 years ago
钮海涛 4d26c95639 Merge branch 'test' into dev 5 years ago
joke.wang d4f0ef157a Finish Task #1915 Cost:8h 5 years ago
宋军超 659b893903 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 b05113f63c Finish Task #1887 Cost:16h 5 years ago
钮海涛 47131ff13f 修复版本问题 5 years ago
钮海涛 f392a13832 Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
袁津哲 37092cf2c5 Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能 5 years ago
袁津哲 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
 5 years ago
袁津哲 44f313abc4 Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能 5 years ago
宋军超 9eda1f67b7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 40672559e4 修改sonar--BUG类型问题 5 years ago
wynne1005 8955fd2f4d mes提测 还原pom 5 years ago
wynne1005 23754d3f18 mes提测 还原pom 5 years ago
wynne1005 81753d3260 Merge branch 'dev' into test 5 years ago
wynne1005 81b554fc8b Merge branch 'test' 5 years ago
wynne1005 0636daed51 Finish Task:1896 Cost:8h 5 years ago
陈思洁 677cc85360 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 b2384619d4 【1891 队列条码打印-管理端】 5 years ago
宋军超 fd9a2e6d15 Start Task #1887 Cost:8h Left:8h 5 years ago
joke.wang dd179a6d89 Fix Bug #8636 5 years ago
joke.wang 1a72c16f14 Finish Task #1890 Cost:8h 5 years ago
wynne1005 b48ba8c481 Finish Task #1876 Cost:32h 5 years ago
wynne1005 8aef23e4ad Finish Task #1876 edi webservice解析 Cost:32h 5 years ago
陈思洁 4d63f9817e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 9b8342b7f5 【1865 客户JIT生产队列，自动下达定时JOB】 5 years ago
钮海涛 999a415d27 修复版本问题 5 years ago
钮海涛 b9cbf9684b Merge branch 'test' into dev 5 years ago
钮海涛 4921d55bda 修复版本问题 5 years ago
钮海涛 b303cf9a14 修复合并问题 5 years ago
钮海涛 96fdbe0e07 Merge branch 'master' into test 5 years ago
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 f50b76cd1f Task1858:电枪枪头更换计数 5 years ago
陈思洁 5b167546e4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e42641855d 【8528 收货检验-图片上传】 5 years ago
wynne1005 608aa6be90 还原pom 5 years ago
wynne1005 99d3c9d721 提测合并 还原pom 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 5 years ago
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
 5 years ago
王杰 8e94cbb8fa pojo 序列号 5 years ago
袁津哲 8b63dea809 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 08b03c9eb8 Task1858:电枪枪头更换计数 5 years ago
宋军超 8d2f6fb8d1 任务：【1842】-海纳川基础数据修改字段类型 5 years ago
joke.wang 88a0d6d02f 任务:[1828] 半成品绑定工步增加逻辑 5 years ago
陈思洁 8ab6e77620 【8528 收货检验-图片上传未开发】 5 years ago
宋军超 1f55c06368 任务：【1842】-海纳川通用导入添加对应工具类、实体和model 5 years ago
陈思洁 7eb72ee5d1 【调试接口回传和同步】 5 years ago
宋军超 9778561725 任务：【1842】-添加海纳川基础数据维护模块 5 years ago
陈思洁 a1c0b6ff26 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 1ea5b54052 【生成质检单增加是否让步字段】 5 years ago
joke.wang b741b6950b bug: [8516] 重新计算bug 1 5 years ago
王杰 786c442d55 解决冲突 5 years ago
宋军超 18e037da7f 任务：【1842】-添加海纳川基础数据的Repository 5 years ago
宋军超 af6b0ce0fd 任务：【1842】-添加海纳川5个基础数据模块的实体与枚举 5 years ago
joke.wang 0352980cde bug: [8516] 重新计算bug修复 5 years ago
钮海涛 c1241bd6c5 修复版本问题 5 years ago
钮海涛 53a421b3b9 修复版本问题 5 years ago
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
王杰 029763feb1 pom 5 years ago
王杰 30fcf4f23f pom冲突 5 years ago
王杰 716e1f7df1 Merge branch 'test' into dev 5 years ago
陈思洁 9cc193c12b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 d2a31eac70 【1804 质检检测-来料检验功能】 5 years ago
joke.wang 25bd05348d [serialVersionUID重复问题] 5 years ago
汪云昊 717f268c28 POJO版本号还原 5 years ago
钮海涛 281ef662b1 merge test 5 years ago
陈思洁 6fbfea417f 【1804 质检检测-来料检验功能】 5 years ago
陈思洁 aef8841223 【合并冲突】 5 years ago
陈思洁 60973a3ee0 【1804 质检检测-来料检验功能】 5 years ago
贾文涛 c4510fb121 BUG #8485,修复数据权限-查询启用禁用无效 5 years ago
宋军超 00df3134b2 任务：【1829】-更新检测单和检测单明细实体 5 years ago
joke.wang de9c901a3b [任务：1826 库存排程配置] 5 years ago
joke.wang 222ba4f8a4 [任务：1825 plc增加默认属性字段] 5 years ago
王杰 a6e9b90026 pom 5 years ago
宋军超 1f97be3078 添加检测结果报表（5个界面） 5 years ago
宋军超 82af372fc0 添加检测过程类型枚举 5 years ago
王杰 de9017ca5c 冲突 5 years ago
王杰 c68d49880c Merge branch 'dev' into test 5 years ago
王杰 7d192b36a6 pom冲突 5 years ago
joke.wang 1fec97f0c1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 24806b9e2e [oee优化] 5 years ago
宋军超 78ff224fe4 删除查询供应商 5 years ago
宋军超 79e90298ef 添加供应商查询 5 years ago
宋军超 98091426f2 修改实体 5 years ago
宋军超 f302b4d5f1 修改MES_检验单实体字段 5 years ago
宋军超 e7335bb632 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 4f5f9777a2 修改实体与model字段 5 years ago
贾文涛 f7b3250d70 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 abbab6bda4 数据权限-工单模块检索添加数据权限功能 5 years ago
joke.wang 664bf80434 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 23d1762b5b [bug: 8422 半成品标签打印bug] 5 years ago
钮海涛 da8b4db890 修复pom版本问题 5 years ago
宋军超 a1579a2484 添加过程检测报表model 5 years ago
宋军超 6d7d8de7b3 添加MES_检验单和MES_检验单明细的实体和枚举 5 years ago
宋军超 32de58277a 添加MES_检验单和MES_检验单明细的实体和枚举 5 years ago
宋军超 7ef769268d 添加MES_检验单和检验单明细实体与枚举 5 years ago
joke.wang 5fb7eecee0 [任务：1752 oee看板] 5 years ago
贾文涛 e668ef4b28 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 eadf0d67f8 添加数据权限处理方法 5 years ago
钮海涛 f87eeeb491 修复合并版本问题 5 years ago
钮海涛 ac268c1cbc Merge branch 'test' into dev 5 years ago
陈思洁 543f0f5c4c 【代码合并还原】 5 years ago
joke.wang b450df5754 [任务：1752工厂oee] 5 years ago
joke.wang 142f8e79c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang f41cd22258 [bug: 8353 拍照采集] 5 years ago
wynne1005 63bc0b5928 merge test 5 years ago
wynne1005 46a91a13bc jis 去除rule关键字 5 years ago
wynne1005 25b2fb8e21 jis pojo 去除rule 关键字 5 years ago
陈思洁 28de0251ea 【sonar bug修改】 5 years ago
钮海涛 bbe03cc6fd 解决合并冲突问题 5 years ago
钮海涛 1b88b20e13 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 40a87d83b3 修复合并问题 5 years ago
贾文涛 6760ed79dd 数据权限-修改启用禁用问题 5 years ago
钮海涛 005d0f7f86 修复合并问题 5 years ago
钮海涛 d74d78353d Merge branch 'test' into dev 5 years ago
钮海涛 bc269e1f71 Merge branch 'master' into test 5 years ago
王杰 1dff3327d7 任务：1733 条码模板逻辑调整 5 years ago
joke.wang 363ac22ade [任务：1750 OEE运算JOB] 5 years ago
wynne1005 1cda7e902b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 f9dfc8e0e2 plc地址清单添加plc类型字段(枚举)，设备台账添加作业校验模式字段(枚举) 5 years ago
wynne1005 27e4fb164b Merge branch 'dev' into test 5 years ago
王杰 724e784fe3 Merge remote-tracking branch 'i3plus-pojo/dev' into dev 5 years ago
王杰 c5d4cd7dad 生产计划编制 5 years ago
wynne1005 d925ec62bf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 888d87f12e task edi 5 years ago
joke.wang f38a47cc68 [oee 定时任务] 5 years ago
贾文涛 a563537750 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 e63601716f 1736-MES数据权限模块开发 5 years ago
宋军超 e5e41f09e7 新增散件产品配置功能 5 years ago
陈思洁 ae156ad82f 【动态按钮--完成按钮修改mes和mespcn】 5 years ago
joke.wang 3227cfa47e [oee] 5 years ago
wynne1005 4ed1770189 Merge branch 'dev' into test 5 years ago
陈思洁 32f6215be7 【8309 产品配方导入-导入报错】 5 years ago
王杰 da1c10dc4c mes生产计划批量编制 5 years ago
曾贞一 cf12f354ae [8206 生产工单-导入失败] 5 years ago
joke.wang de7d007ef1 [获取工步sql server分组函数问题修复] 5 years ago
陈思洁 ad8255949a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 be925fded9 【1693-设备状态监控看板】 5 years ago
joke.wang 60428b5bad [任务：1690 界面窗口] 5 years ago
陈思洁 22b42d710b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ff6e5ac926 【8239 生产作业-单产品扫描（数据写入有误）】 5 years ago
汪云昊 2ab9045d17 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
王杰 2b01efb15b mes生产计划批量编制 5 years ago
wynne1005 d5f69eeefd task 1565 发运修改 5 years ago
宋军超 92c13e5bcd 添加人员技能功能 5 years ago
wei.peng 37922cab29 POM 文件修改 
Merge remote-tracking branch 'remotes/origin/test'

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

# Conflicts:
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
 5 years ago
宋军超 b96eb1b669 添加人员技能功能 5 years ago
陈思洁 2c50fceec9 【1693-设备状态监控看板】 5 years ago
陈思洁 87664b96cb 【合并冲突】 5 years ago
陈思洁 abd974f54f 【1693-设备状态监控看板】 5 years ago
钮海涛 3fbf532c84 修复pom版本问题 5 years ago
钮海涛 a1eb3c3bc2 修复pom版本问题 5 years ago
钮海涛 2e2ee2cc6c Merge branch 'test' into dev 5 years ago
钮海涛 c6d36af4c9 Merge branch 'master' into test 5 years ago
joke.wang 755fccb45e [任务：1690 产能监控看板] 5 years ago
joke.wang ee1c2131ff [任务：1716 写入产品下线记录] 5 years ago
joke.wang aa9ee803b8 [任务：1683-看板管理 展示] 5 years ago
joke.wang 795312637c [任务：1683-看板管理 计划产能] 5 years ago
joke.wang e6f3dd5c32 [任务：1683-看板管理] 5 years ago
王杰 9da9a568f5 mes 5 years ago
joke.wang 4e02acb9e3 [任务：1683-看板管理] 5 years ago
wynne1005 fb60d75eea 还原test pom 5 years ago
wynne1005 d6fe718e4c Merge branch 'dev' into test 5 years ago
qianhs 0a2d9a3d6d 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 5 years ago
joke.wang fa8e4c1b55 [任务：1683 看板管理] 5 years ago
wynne1005 64f3dcf276 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 cfb5aab8ea 新增工步集合 repository 5 years ago
qianhs 62883c5cc0 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 5 years ago
joke.wang 43bc24340c [料架条码打印优化] 5 years ago
wynne1005 430adb8d97 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 1c4050b71f 工步返回内容修改 5 years ago
王杰 74a4a1381c mes 5 years ago
joke.wang 4c637b4e83 [写入JIT发运接口表] 5 years ago
joke.wang 48ee207a8a [删除多余项] 5 years ago
joke.wang d22bd22012 [任务：客户JIT自动下达] 5 years ago
宋军超 8fe5574c67 part实体中@Column(name = "产品生产类型")改为@Column(name = "PPT_CODE") 5 years ago
陈思洁 5d8fec4938 合并冲突 5 years ago
陈思洁 7505087392 【mes 产品配方导入功能和基础数据维护】 5 years ago
王杰 0a14b533d7 任务1659 返工返修 5 years ago
曾贞一 9102a3691b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 10fc6ded8d 【1558 生产工单管理-泰国需求】 5 years ago
joke.wang 280385eb20 [bug: 8092 SOP信息需求变更] 5 years ago
joke.wang 54ff0deb87 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 efe083a9da 修复版本号 5 years ago
宋军超 e464b4d699 删除设备备件管理相关实体 5 years ago
宋军超 89a9946432 添加设备管理相关功能 5 years ago
joke.wang b17cf60ac6 [任务：1571 生成报功数据 需求变更] 5 years ago
曾贞一 e5c275499c 【冲突解决】 5 years ago
曾贞一 255aefbcef 【1585 销售订单管理-销售订单维护】 5 years ago
wynne1005 81f05c233a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 93622f5dc7 中航 开线管控 提交 5 years ago
宋军超 aac4e24113 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 b02d7372f6 添加散件bom批量导入功能 5 years ago
joke.wang 9e0fbef169 [按钮组件代码优化] 5 years ago
wynne1005 48f94c0369 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 cc739eac24 task `1565` 发运pojo 5 years ago
joke.wang 99e055da3c [现场问题：111 检测项报表] 5 years ago
wynne1005 035e77c0ab Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 5d6588b5af task `1565` 增加发运字段 5 years ago
陈思洁 03d2ee9246 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 244270684d 【泰国项目】 5 years ago
wynne1005 86713a01f2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 4469d92344 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang f1baf4fdbe [麦格纳问题：111 检测项报表] 5 years ago
宋军超 8109275630 添加散件BOM导入 5 years ago
宋军超 69b620336f 散件BOM导入 5 years ago
wynne1005 15c9e7111b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
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
 5 years ago
qianhs 20f5bfc9eb wms数据同步迁移至mes 5 years ago
陈思洁 72563a4eb5 【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】 5 years ago
王杰 c6aefc89e7 test合并dev解决ct 5 years ago
王杰 94fed3b9b2 Merge branch 'test' into dev 5 years ago
joke.wang 3e33a7ac3a [客户jit增加JIT排序号字段] 5 years ago
wynne1005 b5ecb91399 中航四月十号 内容提交 5 years ago
joke.wang 4e8c4ae46f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang caf8feb374 [采集工步存入生产数据格式修改] 5 years ago
joke.wang 11adb5ff09 [麦格纳问题：111 检测项数据报表] 5 years ago
joke.wang 1d50c135ac [麦格纳问题：87 增加工单管理页面] 5 years ago
wei.peng aa1f7a2845 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
钮海涛 4dee474c73 修改POM版本号 5 years ago
钮海涛 417120358c Merge branch 'test' into dev 5 years ago
钮海涛 288fb4a16b 修改POM版本号 5 years ago
陈思洁 cd810ce1fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 5a6c525d1f 【MES_生成条码模型增加时分秒字段】 5 years ago
王杰 3f3d0038e8 【任务：1608 数据监听预警配置，定时任务】 5 years ago
qianhs 2e85d99380 联调测试 5 years ago
wynne1005 dbba31670d 增加条码生产 5 years ago
wynne1005 17f6ac6609 删除重复字段 5 years ago
wynne1005 07d8e12216 commit stationrequestbean 5 years ago
wynne1005 2e177ba671 dev合并test test有修改 5 years ago
汪云昊 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
 5 years ago
汪云昊 8a8c3ee34d pom版本调整 5 years ago
wynne1005 763d72b128 dev合并麦格纳的test 5 years ago
joke.wang 14bb71f9f2 [料架条码打印查询修改] 5 years ago
wynne1005 581d900123 状态机model提交 5 years ago
qianhs ba4b450437 联调测试 5 years ago
wynne1005 12e31f630b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 ba90a50621 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
qianhs 8c635c3557 联调测试 5 years ago
qianhs 7244fb38b1 联调测试 5 years ago
wynne1005 e289414363 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 b3032ca8e8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 45dda6ea57 添加散件配置报文关系和工装明细实体 5 years ago
陈思洁 30608f886b 解决冲突 5 years ago
陈思洁 d9d2113f75 【MES_增加枚举】 5 years ago
贾文涛 492dfbff82 pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式 5 years ago
qianhs 836a4f710d 联调测试 5 years ago
宋军超 b3cecc9481 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 f64a543a4a 添加产品流程批量配置功能 5 years ago
王杰 cd99a63233 mes 5 years ago
汪云昊 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
 5 years ago
wynne1005 032fb350c8 queueordermodel添加构造函数 5 years ago
王杰 5fc4c6c025 mes 5 years ago
钮海涛 52a5c1e2f8 Merge branch 'test' into dev 5 years ago
qianhs 851bd1feec 联调测试 5 years ago
wynne1005 4324457b61 merge 5 years ago
wynne1005 dce52df770 组件传参给工步 5 years ago
qianhs 241ec4974b 联调测试 5 years ago
wynne1005 351ea8755e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 6a36ad7601 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg 83d7a618bf 按钮组件model修改 5 years ago
qianhs 3654d60214 【bug7947】PLC监听工步装队列无法显示 5 years ago
zcg 078e1a77a4 【bug 7895 PLC信息-页面需修改】 5 years ago
钮海涛 82d5332861 修复POM文件问题 5 years ago
钮海涛 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-预留外部拉动接口
 5 years ago
汪云昊 ec1d52e7dd MAVEN 版本控制调整 5 years ago
贾文涛 7106c06221 统一修改pom文件的项目版本问题0331 5 years ago
joke.wang 1b0d0f8c6b [任务：1576 动态按钮加载] 5 years ago
wynne1005 d1ff70adc4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 44696061ee 修改pom文件为最新 5 years ago
zcg 75832427e8 【task 1539 工位扫描-按钮组件结构搭建】 5 years ago
曾贞一 bcb8dee045 【1558 生产工单管理-泰国需求】 5 years ago
wynne1005 3c08e7794f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 eed24e0297 统一修改pom文件的项目版本问题 5 years ago
qianhs 3b763b45cd 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 5 years ago
joke.wang 4cb3d89ad6 [bug: 7637 生产数据ees查询修改] 5 years ago
钮海涛 c37809d5b7 合并源仓库的修改 5 years ago
wynne1005 f345ed2b2f Merge branch 'dev' into test 5 years ago
wynne1005 d80b341620 还原test pom 5 years ago
王杰 0502f6d736 【任务：1529，料架分组队列展示组件】 5 years ago
joke.wang 7a6e9b9e21 [任务：1479 料架打印] 5 years ago
陈思洁 c4032b8ed5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 320969f2f0 【1527 半成品标签自动打印】 5 years ago
贾文涛 048419d823 修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。 5 years ago
wynne1005 4b4bf4e433 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 9d5567f4a6 Merge branch 'test' into dev 5 years ago
王杰 e3a9defdab 任务1528，生成并打印门锁标签 5 years ago
wynne1005 6336ebd8e9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 8b750e6a76 修改生产数据类型 5 years ago
王杰 a9a7d78bd5 解决冲突 5 years ago
joke.wang 9d55a2a8b3 [解决冲突1] 5 years ago
joke.wang 8b681af622 [解决冲突] 5 years ago
joke.wang 045dc01479 [任务：1479 料架条码打印] 5 years ago
王杰 f578311f55 数据复核 5 years ago
qianhs 564ba1e116 【1472 工步-设备状态采集（原PLC采集【设备状态】）】 5 years ago
qianhs c53999b0d2 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
joke.wang 79788daf8b pom 修改 5 years ago
zcg 74e4aa953b 【任务 1480 照片采集】 5 years ago
joke lin 62cee148cd [bug: 7875 客户JIT生产工单] 5 years ago
钮海涛 9da6628884 Merge branch 'master' into test 5 years ago
陈思洁 cc207240b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 bacab3fb88 【MES_新增设备工装关系和工装操作记录pojo】 5 years ago
王杰 9f8e51830e mes enum 5 years ago
qianhs 8d18c61d63 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
joke lin 126440c976 [任务：1435 客户JIT导入] 5 years ago
陈思洁 310bf49af6 【MES_校验是否换膜并推送换模信号 】 5 years ago
陈思洁 22788f1c44 还原POM文件TEST-DEV 5 years ago
qianhs a93882c881 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
曾贞一 779b9d209c 【修改 DEV-pom.xml】 5 years ago
qianhs 26bf62fbe7 设备状态采集工步 5 years ago
陈思洁 474bb995d6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 7d743c2c7f Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test 5 years ago
陈思洁 b3e38170e6 【1440 PLC采集工步【生产数据】】 5 years ago
luweihao e90ea98d1f 解决冲突 5 years ago
luweihao 03f1c4fddf 修改生产数据结构 5 years ago
王杰 af4cb74392 Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test 5 years ago
joke lin 3b928c6ddc [bug: 7637 生产数据] 5 years ago
joke lin e8f48bcb04 [bug: 7637 生产数据查询] 5 years ago
王杰 b6a83fff5d Merge branch 'dev' into test 5 years ago
zcg 3d28840bae 【新增枚举，pojo】 5 years ago
luweihao 16879a4f20 Merge branch 'dev' into test 5 years ago
陆卫豪 a65350bbf8 Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev 5 years ago
luweihao 12579c7a14 还原pom 5 years ago
luweihao b52bb02d73 task `1430` 工位扫描，产品信号监听，队列监听 5 years ago
zcg 416c2ceffc 【任务 1443 excel模板导入功能修改】 5 years ago
zcg 9388e3b4f2 【pojo 冲突提交】 5 years ago
luweihao 679319635a task `1430` 工位扫描，产品信号监听，队列监听 5 years ago
陈思洁 4fec84f810 【PTL_PLC配置表增加字段】 5 years ago
陆卫豪 60ab731ffd Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev 5 years ago
joke lin d4e1e854c5 [任务：1441 plc推送数据] 5 years ago
qianhs 65572b34a0 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 5 years ago
zcg bd82a0fba7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 2625c2cb0f 【修改 TSET-pom.xml】 5 years ago
joke lin 4823660070 [任务：1435 计划管理] 5 years ago
王杰 80ca438ce3 test合并到dev解决pom冲突 5 years ago
曾贞一 5ebb5cbf20 【修改 TSET-pom.xml】 5 years ago
贾文涛 30722b130c Merge branch 'test' of i3-IMPP/i3plus-pojo into master 5 years ago
王杰 068a0956db 解决冲突 5 years ago
王杰 b77d3065a4 Merge branch 'test' into dev 5 years ago
曾贞一 4fcd7cbc3f Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev 5 years ago
joke lin cb09776bdb [任务：1435 计划管理] 5 years ago
陈思洁 102af98a75 【PTL_增加主任务编号字段和组内编号字段】 5 years ago
zcg 7aecf9dcc0 【task 1436 工步-关键件绑定校验并转过程条码】 5 years ago
joke lin ccf2817788 [计划管理] 5 years ago
曾贞一 0acf2dc0ae Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 ca6e094271 Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev 5 years ago
luweihao 00252caa0c 移动mespcn公用model 5 years ago
luweihao 005db6ac5b Merge branch 'dev' into test 5 years ago
luweihao 7beaa515c8 task `1428` 作业流程 5 years ago
joke 531596d2d4 [mes: 49 JIT计划与管理] 5 years ago
luweihao 9f95e97ec3 Merge branch 'test' 5 years ago
luweihao 7c77c90a3c task 作业流程 5 years ago
luweihao dd6007656c Merge branch 'dev' into test 5 years ago
luweihao 4918707fc8 bug `7626` 开线管控-数据存入数据库错误 5 years ago
luweihao f67dd06cd4 Merge branch 'dev' into test 5 years ago
luweihao 5892f87bdc task `1425` pcn pojo 迁移 5 years ago
luweihao b0d214f204 Merge branch 'test' 5 years ago
luweihao 51152656cc Merge branch 'dev' into test 5 years ago
luweihao e2d63434db bug `7570` `7561` 生产扣减代码去除测试代码 5 years ago
王杰 7662905caa Merge branch 'test' 5 years ago
jenkins 1ada447069 Jenkins自动合并 5 years ago
luweihao 68cbd54f37 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 5fd51f6b1d task 任务重试测试 5 years ago
joke d42b7ebbb6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke 2b84f93950 任务: 1424 DT通信 5 years ago
luweihao be2f1cb146 Merge branch 'dev' into test 5 years ago
luweihao 5eb7cf03ed task 数据同步添加错误信息字段 5 years ago
luweihao 03a139e435 Merge branch 'dev' into test 5 years ago
luweihao e38839db6c task `1408` 数据同步修改 5 years ago
jenkins 499a5ed894 Jenkins自动合并 5 years ago
luweihao 1a2f00afc3 task `1408` 添加数据同步存储 5 years ago
jenkins a9d94ecff7 Jenkins自动合并 5 years ago
luweihao bbfcdfdd64 ptl pojo 提交 5 years ago
jenkins 67a016b261 Jenkins自动合并 5 years ago
luweihao d750a88aad Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 1c144eca4d 移除mespcn乐观锁 5 years ago
jenkins f45a0d69b0 Jenkins自动合并 5 years ago
jokelone 54cd3cfc45 业务表增加唯一索引 5 years ago
王杰 01e896a752 Merge branch 'dev' into test 5 years ago
luweihao acc907dd28 task `1295` mes添加索引 5 years ago
王杰 cd93680349 Merge branch 'dev' into test 5 years ago
jokelone 799b691aaf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 5fc59129bd 【mes-pojo 继承Serializable】 5 years ago
luweihao 6b66c15c72 Merge branch 'dev' into test 5 years ago
luweihao ab3ad4c2d5 task 去除生产数据注解 5 years ago
luweihao 2c6a4464c3 Merge branch 'dev' into test 5 years ago
luweihao 667847afe7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao d3c817529f task `1408` 生产数据结构化 5 years ago
jenkins 521973a2f5 Jenkins自动合并 5 years ago
zcg 8a04ca4e3d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg bc1825fd35 【mes枚举修改，mesModel修改,pcn枚举修改】 5 years ago
jenkins f927ee21ac Jenkins自动合并 5 years ago
王杰 bf71cd07d0 JIS发运 5 years ago
jenkins d790bcf355 Jenkins自动合并 5 years ago
luweihao 6ec43ea151 task `1392` 修正索引 5 years ago
jenkins da70df25ac Jenkins自动合并 5 years ago
jokelone 3f0646403f 【bug：7408报表优化1】 5 years ago
王杰 2f5b9954d0 Merge branch 'dev' into test 5 years ago
jokelone 68e7dc8906 【bug：7408报表优化】 5 years ago
jenkins c1609539cf Jenkins自动合并 5 years ago
jokelone fd1a0ebdb8 【任务：1404 过程质量 检查项类型分组展示】 5 years ago
jenkins 7057c685cc Jenkins自动合并 5 years ago
zcg 2396863bab 【任务:1383 数据监听定时数据抓取】 5 years ago
jenkins 56e53906ec Jenkins自动合并 5 years ago
jokelone f1096e9ec5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 51839d7be5 【任务：1381】 5 years ago
zcg add40a27e3 【任务：1382，数据监听基础模块开发】 5 years ago
jenkins b71be613fc Jenkins自动合并 5 years ago
WYnneaoapc ded27853a8 task 修改生产数据 5 years ago
jenkins 3db9a86504 Jenkins自动合并 5 years ago
王杰 031d57e081 JIS 5 years ago
jenkins ebcde1d16b Jenkins自动合并 5 years ago
jokelone 0a70a42336 【任务：1381 兼容Sql server】 5 years ago
许心洁 46b8c6babb Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
jenkins 75dc17f4c4 Jenkins自动合并 5 years ago
jokelone d0cd9d03b9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 0d7aca73a8 【需求：7315 生产工单变更】 5 years ago
jenkins 54d6d1f340 Jenkins自动合并 5 years ago
WYnneaoapc b1d030e0dd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 497b963f60 Jenkins自动合并 5 years ago
王杰 bf62494236 JIS 5 years ago
WYnneaoapc a9f2cf2501 task 1309 大数据检索 5 years ago
王杰 0a0124cd2b Merge branch 'dev' into test 5 years ago
jokelone c3a7e0057b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone fea1811191 【bug：7153 JIT排序】 5 years ago
王杰 4f8898d57a Merge branch 'dev' into test 5 years ago
王杰 bcec1d7e62 JIS 5 years ago
王杰 f88041df1e Merge branch 'dev' into test 5 years ago
王杰 3fe50125ae JIS 5 years ago
jokelone 68eb60c6cb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc 3425a57669 Merge branch 'test' 5 years ago
WYnneaoapc 430e5ad6dd Merge branch 'dev' into test 5 years ago
WYnneaoapc 76c84631ab revise class name 5 years ago
WYnneaoapc adb4bd2a1c Merge branch 'dev' into test 5 years ago
王杰 42a22d14d3 安灯导出字=字段冗余 5 years ago
WYnneaoapc 372cc438f2 Merge branch 'test' 5 years ago
jenkins 688d976683 Jenkins自动合并 5 years ago
王杰 8a4aa9fed2 jis发运 5 years ago
jokelone 39790fd50b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone d47a097c53 【任务：1344 通用接口增加批量数据处理】 5 years ago
王杰 9034418b7e 解决冲突 5 years ago
陆卫豪 56fe97e200 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 5 years ago
WYnneaoapc 32c9bbbe85 task `1308` 4 同步国际化资源 5 years ago
王杰 3ddadad142 Merge branch 'dev' into test 5 years ago
王杰 fb8b07b227 【需求：1329】 5 years ago
王杰 019cb91a4c 【需求：1329】 5 years ago
王杰 06afd98334 Merge branch 'dev' into test 5 years ago
jokelone 0e84990f3c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 20f6961daf 【任务：1327JIT生产】 5 years ago
王杰 2655fdc87f Merge branch 'dev' into test 5 years ago
zcg c7d494c31e [需求：1324，导出excel] 5 years ago
jenkins 1fbd9c4357 Jenkins自动合并 5 years ago
zcg dccd104fdd [需求：1324，excel导出] 5 years ago
王杰 ab68895760 test分支修改pom 5 years ago
王杰 c87b00756f dev分支修改pom 5 years ago
WYnneaoapc 9de807ab24 Merge branch 'test' 5 years ago
gcj a7d1ec785b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 74826e9830 Merge branch 'dev' into test 5 years ago
王杰 423b81609a 【需求：1198】 5 years ago
zcg b06ecdd3f3 [bug：7043，PCN节点-模块修改] 5 years ago
WYnneaoapc 51623754c7 Merge branch 'test' 5 years ago
WYnneaoapc 0191a17a4d Merge branch 'dev' into test 5 years ago
WYnneaoapc a38dc051ac task `1308` 1 PCN国际化资源 5 years ago
jokelone 7dad371f27 Merge branch 'dev' into test 5 years ago
WYnneaoapc 7ecae4d56b Merge branch 'test' 5 years ago
jenkins 350f7101d2 Jenkins自动合并 5 years ago
jokelone b9b30cf19c 【任务：1306质量标准配置】 5 years ago
王杰 0dac1a6d84 Merge branch 'test' 6 years ago
jenkins 015d284239 Jenkins自动合并 6 years ago
WYnneaoapc 48338fec28 task `1300` 5 BI 产线运行情况 6 years ago
王杰 c4c615bd15 Merge branch 'dev' into test 6 years ago
WYnneaoapc b088b40fd1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc a1a602e457 task `1300` 5 BI 产线运行情况 6 years ago
jokelone 6995189893 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 46ec9e51b0 【任务：1211报表导出冗余字段】 6 years ago
jenkins 6be1ef7dbd Jenkins自动合并 6 years ago
WYnneaoapc b52d5b392d task `1300` 4 BI 产线运行情况 6 years ago
jokelone 874fd139dc Merge branch 'dev' into test 6 years ago
WYnneaoapc 73cb6a7229 merge 6 years ago
陆卫豪 0002f19d69 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc e3d84dd48f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 6 years ago
WYnneaoapc b2daf9fd9c task `1300` 1 BI 产线运行情况 6 years ago
jokelone 0dfb948810 Merge branch 'dev' into test 6 years ago
jokelone 519d985838 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 0acf17ddd7 【1211：报表1】 6 years ago
WYnneaoapc 8694cb1f5a Merge branch 'test' 6 years ago
jenkins c41026a6b2 Jenkins自动合并 6 years ago
WYnneaoapc f57f1087d9 task `1295` 1 添加数据库索引 6 years ago
jenkins af9bb85377 Jenkins自动合并 6 years ago
WYnneaoapc efb29aa8f4 task `1294-1` 查找workcell的时候需要带上产线 6 years ago
王杰 e636bfaa83 Merge branch 'test' 6 years ago
jenkins 6fc8833b01 Jenkins自动合并 6 years ago
WYnneaoapc 9b8675c904 task `1292-1` 新增条码履历字段 6 years ago
WYnneaoapc ffb977ffc5 merge 6 years ago
jenkins 2c88a30b4d Jenkins自动合并 6 years ago
WYnneaoapc 8dc1513947 bug`6897` SOP信息-编辑图片后未显示出图片地址 6 years ago
jokelone a337f1824f Merge branch 'dev' into test 6 years ago
王杰 19a2f6661e Merge branch 'test' 6 years ago
陆卫豪 345374354b Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc fc5282342f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 056dbaacf2 Merge branch 'dev' into test 6 years ago
jenkins 6d1d66daf3 Jenkins自动合并 6 years ago
WYnneaoapc f4b50200b2 bug`6866` 1 打印模板同步 6 years ago
jokelone a0780669c3 【任务：1287】 6 years ago
jenkins a2947478ca Jenkins自动合并 6 years ago
jokelone edcdeb3d4f 【任务：1287】 6 years ago
jenkins 6ee5823e15 Jenkins自动合并 6 years ago
jokelone 917774921e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone a6730b0cd8 【任务：1287产品类型图片】 6 years ago
WYnneaoapc 64267e19b0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 7069bc5cbb task`1287`3` 新增文件表，原来业务与文件脱离 6 years ago
王杰 2a10fd1021 【组织模型工厂加id】 6 years ago
jokelone 8c5eb8d7c5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone c42775389d 【任务：1273质量检测增加字段】 6 years ago
WYnneaoapc 2d7558e1ba task`1287`2` 新增文件表，原来业务与文件脱离 6 years ago
WYnneaoapc 93bc62b921 task`1287` 新增文件表，原来业务与文件脱离 6 years ago
WYnneaoapc 2cde398cca Merge branch 'test' 6 years ago
陆卫豪 37f32d4269 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone a4d38de535 【任务：1272代码优化】 6 years ago
陆卫豪 448371a461 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone d835ef1bb5 【任务：1273质量检测标准增加检测项类型】 6 years ago
jokelone a579358968 【任务：1257下线时间】 6 years ago
jenkins de173e8500 Jenkins自动合并 6 years ago
jokelone 935ca2f4d7 【任务：1211报表】 6 years ago
王杰 b703c9394c 更新 'modules/i3plus-pojo-mes/pom.xml' 6 years ago
王杰 cfa54aa2b6 修改pom 6 years ago
王杰 b9906cee55 增加枚举 6 years ago
许心洁 dd36a0b053 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
王杰 338367f3c3 Merge branch 'dev' into test 6 years ago
jokelone 7004ad0971 【任务：1211报表质量数据导出】 6 years ago
jenkins 7630541146 Jenkins自动合并 6 years ago
王杰 52f4854621 Merge branch 'dev' into test 6 years ago
jokelone 60e4e1a7f3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 3c9183e422 【任务：1256工序BOM改为工位BOM】 6 years ago
王杰 99b66e459d 【需求：1221，导入】 6 years ago
陆卫豪 2aca595bad Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 7a379fb5ab 【任务：1211报表质量数据首检导出】 6 years ago
jenkins 33f3fd0963 Jenkins自动合并 6 years ago
WYnneaoapc 1313916b81 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 55b07e8e75 1256 工序bom改为工位bom 6 years ago
王杰 8cba58d339 Merge branch 'dev' 6 years ago
王杰 5dd94058cf Merge branch 'dev' into test 6 years ago
王杰 f038ed7234 增加枚举 6 years ago
crish 9027b22af8 Merge branch 'dev' 6 years ago
王杰 be39fb2abe Merge branch 'dev' into test 6 years ago
jokelone 19c0c1deb5 【任务：1211报表】 6 years ago
WYnneaoapc 9306945691 Merge branch 'test' 6 years ago
陆卫豪 7556ada2d4 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 9e64ee8258 【需求：1221，导入】 6 years ago
jenkins 8a34eee5c5 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone a49fdf87b8 【任务：1211报表质量数据】 6 years ago
WYnneaoapc ec49074a8b Merge branch 'test' 6 years ago
王杰 e9055e3c5d Merge branch 'dev' into test 6 years ago
王杰 2893d13e9f 需求1221，导入 6 years ago
王杰 1d920627ec Merge branch 'dev' into test 6 years ago
jokelone 8a806815a5 【任务：1193qty数量类型更改为Double】 6 years ago
jokelone 327e4dcd64 【优化：27班组增加产线、班长字段】 6 years ago
王杰 a41c00f129 Merge branch 'dev' into test 6 years ago
jokelone 5bc9b9b082 【任务：1193字段类型修改】 6 years ago
王杰 dd0304d713 Merge branch 'dev' into test 6 years ago
王杰 7d623560b6 【需求：1202，条码补打】 6 years ago
jokelone 3eda200854 【bug：6545类型信息增加枚举】 6 years ago
王杰 09cf450156 Merge branch 'dev' into test 6 years ago
王杰 ca57c0342a 【需求：1202，条码补打】 6 years ago
crish 852083f667 Merge branch 'test' 6 years ago
crish 4d3adf5daf Merge branch 'dev' into test 6 years ago
王杰 4f87ec8516 解决冲突 6 years ago
jokelone c5bc44f29a 【bug：6522工位增加序号字段】 6 years ago
WYnneaoapc 81873315c3 Merge branch 'test' 6 years ago
陆卫豪 62800f757e Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone ce63c161be 【任务：1211报表功能开发：生产报表】 6 years ago
crish 86171d35b7 修改master分支pom为PROD 6 years ago
王杰 ac5432bebb 解决冲突 6 years ago
王杰 71d39f54d2 Merge branch 'dev' into test 6 years ago
王杰 c595d3f6b1 修改字段 6 years ago
陆卫豪 d6ff7aa2b1 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 054502b657 【任务：1193接口调试】 6 years ago
jenkins 8eb8c2f97e Merge branch 'master' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 9f9c095846 Merge branch 'dev' into test 6 years ago
WYnneaoapc 4441d1dc86 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
WYnneaoapc 88d480403c 数据库字段初始化属性 赋值longtext 6 years ago
王杰 a595fed4fe Merge branch 'test' 6 years ago
王杰 9baac06cb7 Merge branch 'dev' into test 6 years ago
王杰 e91369c82a 【需求：1198】 6 years ago
王杰 7a023d0f4b Merge branch 'dev' into test 6 years ago
王杰 fe962c1ab3 【bug:6483】 6 years ago
王杰 3c3de49512 【bug:6483】 6 years ago
王杰 7f08847c50 Merge branch 'test' 6 years ago
王杰 6297ccc4d7 Merge branch 'dev' into test 6 years ago
jokelone 5e813f30e7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone f632308d0a 【任务：1193接口数据解析】 6 years ago
王杰 2a5c32b8ea 解决冲突 6 years ago
wei.peng 02a9c64a42 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
jokelone 987a502d7e 【bug：6380 物料字段拼写有误】 6 years ago
陆卫豪 4a76c480ac Merge branch 'test' of i3-IMPP/i3plus-pojo into master 6 years ago
jenkins 4d2a2a35b0 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 f6d50bdfb7 【需求：1167，产品批量打包】 6 years ago
王杰 693ac2451e 【需求：1167，产品批量打包】 6 years ago
王杰 1a7164c474 Merge branch 'dev' into test 6 years ago
王杰 b15c3f4ae7 【需求：1101，定时任务优化】 6 years ago
jokelone 9842ed2181 【任务：1193接口pojo】 6 years ago
王杰 e60256e291 【需求：1167，包装特殊批次工步】 6 years ago
crish 5b6b303722 Merge branch 'test' 6 years ago
crish 17d5f1e512 Merge branch 'dev' into test 6 years ago
王杰 2660e0268e 【需求：1198，代码优化】 6 years ago
crish 410558d43c Merge branch 'test' 6 years ago
王杰 9137555226 Merge branch 'dev' into test 6 years ago
王杰 028d7641d2 【需求：1126，设备周期计划优化】 6 years ago
陆卫豪 3fa5437c5a Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 37e288ff77 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
 6 years ago
WYnneaoapc 360f908ae4 获取生产数据 6283 6 years ago
王杰 da0478ec7e Merge branch 'dev' into test 6 years ago
王杰 ebb59cbb64 【需求:1167,批量打包】 6 years ago
王杰 093008fae8 Merge branch 'dev' into test 6 years ago
jokelone 616d39fa38 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 246726a67d 【任务：1193 接口基础数据】 6 years ago
jenkins c1b50db526 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 49637cb23f 【需求:1167,批量打包】 6 years ago
WYnneaoapc c1c00213e1 工位监控修改 6283 6 years ago
许心洁 60c25d7a71 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
许心洁 ccb29c5903 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 f5c8e36ac9 【需求：1189，产品条码工步】 6 years ago
王杰 649ffb548d Merge branch 'dev' into test 6 years ago
王杰 e30ba280e0 解决冲突 6 years ago
许心洁 208410340e Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
许心洁 b6e27c33c8 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone a04b8f7c57 【bug：5791 生产工单明细1】 6 years ago
jokelone 5fd619ac79 【bug：5791生产工单明细】 6 years ago
王杰 acaacf63a3 Merge branch 'dev' into test 6 years ago
WYnneaoapc b4cea27a5b 代码审核 修改2 6 years ago
WYnneaoapc 56e6cf7918 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 6 years ago
crish c4d7a2380c Merge branch 'test' 6 years ago
WYnneaoapc 029c9b6bc8 代码审核 修改1 6 years ago
许心洁 970105ac19 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 9a6c5cfda3 【任务：1163客户订单】 6 years ago
陆卫豪 64be0c721c Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 9418a0838b 【任务：1129 产品编码配置基础数据】 6 years ago
陆卫豪 46fc5f5750 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc a6e8265e29 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
jokelone 90ec0f107e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 32dbaed8fe 【任务：1129数据对象、对象结构、产品包装关系基础数据】 6 years ago
WYnneaoapc 4308084ca3 数据抽取修改 1130 6 years ago
陆卫豪 07a80e7fd2 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
crish 851ba63e7c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
陆卫豪 576f02f75d Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 9ad66157a8 数据同步优化 1078-4 6 years ago
王杰 2417b40635 Merge branch 'dev' into test 6 years ago
crish 6996dc2273 6204: MesConfig配置添加业务主键 6 years ago
WYnneaoapc 35f625ac21 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 563955570d 数据同步优化 1078 6 years ago
王杰 a95b6baae1 Merge branch 'dev' into test 6 years ago
jokelone 828cf66784 【需求：1090 工序BOM，物料绑定记录删除多余字段】 6 years ago
王杰 cb319e4304 【需求：1126，设备周期计划】 6 years ago
王杰 7291a7a85c Merge branch 'dev' into test 6 years ago
汪云昊 86a18d730a Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 9907813aed Lac调度实体 6 years ago
许心洁 c9f26c22c1 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 6fd7e6be5f 【需求：1092 维修类型】 6 years ago
王杰 75ce77f6f1 【需求：1126，设备周期计划】 6 years ago
王杰 347c47c82f 【需求：1125，设备报表】 6 years ago
王杰 1846c6f4f8 Merge branch 'dev' into test 6 years ago
jokelone 438517be44 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 6 years ago
jokelone 6c847cf305 【需求：1091 返厂返修添加字段和枚举】 6 years ago
王杰 2069d6a3ae 【需求：1125，设备报表】 6 years ago
王杰 9446a76159 Merge branch 'dev' into test 6 years ago
WYnneaoapc b668879f9d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 42ec1b3693 Merge branch 'dev' into test 6 years ago
王杰 2f382d37cc 【需求：1124，首检件配置】 6 years ago
王杰 dcaf007f4d 【需求：1107，生产工单首检件】 6 years ago
WYnneaoapc 29ac92566d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 6d59aeddad Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jiajack 3c8b920a4c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 95789b1bd8 增加生产质量情况BI业务 6 years ago
许心洁 c79786a677 合并开发分支的代码POM文件被改成DEV修改回TEST 6 years ago
WYnneaoapc dbd4a7578b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 88af19f8e9 修改开发环境pom文件test为dev 6 years ago
changjiang.gao 376ca4bbd4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 3f6f6428f6 【需求:1106,设备通知，优化】 6 years ago
WYnneaoapc 04c99167c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 6de6d36e80 数据库抽取反写 1105-1 6 years ago
王杰 03a4c98234 Merge branch 'dev' into test 6 years ago
王杰 803d5c57f2 【需求1101，设备维修作业，第3次提交】 6 years ago
crish 18161e8191 Merge branch 'test' 6 years ago
crish 67461457fc Merge branch 'dev' into test 6 years ago
WYnneaoapc 848f6b2f23 工位监控优化 1050-6 6 years ago
WYnneaoapc c71d667d0f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 56996126be 【需求：1101，mes同步设备安灯维修任务】 6 years ago
changjiang.gao 30007cee47 Merge branch 'dev' into test 6 years ago
王杰 9bdae2ad13 【需求：1086，设备点检保养作业】 6 years ago
WYnneaoapc c56822dc40 工位监控优化 1050-5 6 years ago
WYnneaoapc 3dbbee3c60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack f6b06e6b52 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack aef7f7a948 增加班次顺序字段 6 years ago
jiajack d87d81e34a 【产线运行情况】-BI报表开发 6 years ago
许心洁 73aef5326c Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 00e849a62e (1089 过程质量检测基础数据；1090 返厂返修基础数据) 6 years ago
WYnneaoapc 34a9ad36fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 44fccb14d6 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 0c01648551 【需求：1088，设备维修作业】 6 years ago
WYnneaoapc b47f97fa05 1050-2 工位监控 6 years ago
王杰 752476b3df [需求1086，设备点检保养作业，第2次提交] 6 years ago