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

1471 Commits (1fe5b807c67fdbea332ca9b1ecdfd27bf2d9a9d8)

Author SHA1 Message Date
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