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

5756 Commits (f392a13832b214c88e95bf3b1e7dc573a324bb95)

Author SHA1 Message Date
钮海涛 4921d55bda 修复版本问题 5 years ago
钮海涛 b303cf9a14 修复合并问题 5 years ago
钮海涛 96fdbe0e07 Merge branch 'master' into test 5 years ago
puxiao.liao 491bc32325 Fix Bug#8345 5 years ago
贾文涛 a68475d3d0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 a8efa90089 bug 7461,count时去掉distinct。Fix Bug #7461 5 years ago
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 e578cb882a 优化通用模板代码模糊查询功能 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 6dd2f12a2a Merge branch 'dev' into test 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 5 years ago
王杰 56ae714283 【任务：1845，安灯】 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
wei.peng 9ee8acae91 合并代码 有代码丢失或者文件丢失请排查此处 5 years ago
wei.peng f161270af8 版本发布 5 years ago
钮海涛 c0303cc247 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 281a2dccb5 新增零件自动采购单 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
钮海涛 8059342b8f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 4ba0e6b264 自动生成采购订单功能 5 years ago
宋军超 8d2f6fb8d1 任务：【1842】-海纳川基础数据修改字段类型 5 years ago
钮海涛 8a2d54ce61 临时保存 5 years ago
曾贞一 e3accbf24e 【8441 收货回执打印功能完善】 5 years ago
曾贞一 d0e4af979e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6a28329d75 【8441 收货回执打印功能完善】 5 years ago
puxiao.liao f8ccd0166e BUG【8554】 中航-工装初始化导入后，一个excel应该产生一笔事物，明细按物料分 5 years ago
袁津哲 e47f050ff3 优化通用导入工具类和导入逻辑 5 years ago
joke.wang e2ce63a9cd bug: [8533] plc数据类型改为枚举 5 years ago
钮海涛 6c7a88b962 bug:【8520】 5 years ago
joke.wang 88a0d6d02f 任务:[1828] 半成品绑定工步增加逻辑 5 years ago
宋军超 0ccadab4be 任务：【1842】-海纳川通用导入修改对应工具类、实体和model 5 years ago
陈思洁 8ab6e77620 【8528 收货检验-图片上传未开发】 5 years ago
宋军超 1f55c06368 任务：【1842】-海纳川通用导入添加对应工具类、实体和model 5 years ago
袁津哲 5d1c79ef13 Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
袁津哲 6e3da00fda Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
陈思洁 7eb72ee5d1 【调试接口回传和同步】 5 years ago
袁津哲 3e65986585 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 0e2f50e562 Task1812:仓库健康度指标视图及相关指标自定义(#476) 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
钮海涛 5004f17037 修复版本问题 5 years ago
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
曾贞一 60dee04206 【8512 中航-BH检测结果管理-查询条件无效】 5 years ago
曾贞一 ecd888db6f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 ec77182944 【BATCH录入检测值-查询优化】 5 years ago
王杰 029763feb1 pom 5 years ago
王杰 fc99ee8914 pojo 序列化 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
qianhs 3ffa9d06fa sweb pojo 序列化提交 5 years ago
汪云昊 069d477528 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
wei.peng c288b54660 查询优化 5 years ago
宋军超 912ef81271 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 373808e20d 任务：【1928】-添加检测单-检测类型枚举修改code描述 5 years ago
qianhs 8d61db5ed5 任务:1786,1787,1788,1789 5 years ago
joke.wang 25bd05348d [serialVersionUID重复问题] 5 years ago
汪云昊 717f268c28 POJO版本号还原 5 years ago
汪云昊 8fe0244a20 POJO添加序列化id 5 years ago
钮海涛 281ef662b1 merge test 5 years ago
汪云昊 99b5048ef0 POJO添加序列化id 5 years ago
汪云昊 c27ebee3f9 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 7f2c372229 MDM POJO 5 years ago
汪云昊 9532489502 POJO添加序列化id 5 years ago
puxiao.liao e74f3d6d99 BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】 5 years ago
qianhs 7778ce1afd 类序列号 5 years ago
袁津哲 44eef89b40 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 4b09d9fa8d 修改报错 5 years ago
qianhs 3462e33aac Merge remote-tracking branch 'origin/dev' into dev 5 years ago
qianhs 0e5bf3488b 盘点 5 years ago
袁津哲 486e655394 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 7b5736d717 Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
qianhs c38757de19 盘点 5 years ago
钮海涛 8b022cc736 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f1d14c9e3a bug:【8385】-报工事务查询联调报表查询功能。 5 years ago
wynne1005 a4551a746a [优化] 修改DdlPackBean查询 -> 工厂代码可以是英文或中文 5 years ago
宋军超 dfce22d654 任务：【1928】-添加检测单-检测类型枚举 5 years ago
陈思洁 9865558af3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 6fbfea417f 【1804 质检检测-来料检验功能】 5 years ago
汪云昊 e8ea5a3c90 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 d86cdfe4ff OPC UA 优化 5 years ago
陈思洁 c0f5709bb2 【合并冲突】 5 years ago
陈思洁 aef8841223 【合并冲突】 5 years ago
陈思洁 60973a3ee0 【1804 质检检测-来料检验功能】 5 years ago
puxiao.liao e9873905ef Merge remote-tracking branch 'origin/test' into test 5 years ago