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
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
钮海涛
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