 钮海涛
|
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 |
宋军超
|
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 |
汪云昊
|
717f268c28
|
POJO版本号还原
|
5 years ago |
|
钮海涛
|
281ef662b1
|
merge test
|
5 years ago |
|
汪云昊
|
c27ebee3f9
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
9532489502
|
POJO添加序列化id
|
5 years ago |
|
qianhs
|
c38757de19
|
盘点
|
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 |
|
puxiao.liao
|
6b9b2e8dd2
|
BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】
|
5 years ago |
 贾文涛
|
c4510fb121
|
BUG #8485,修复数据权限-查询启用禁用无效
|
5 years ago |
|
puxiao.liao
|
8e8744d3db
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
puxiao.liao
|
e8dd3ab12f
|
8481 基础数据-库位-导入。导出报错,提示cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE_TYPE.descriptionOfValue(java.lang.String)
|
5 years ago |
|
王杰
|
a6e9b90026
|
pom
|
5 years ago |
|
钮海涛
|
34a3598508
|
bug:8385
|
5 years ago |
|
宋军超
|
1f5052d679
|
添加检测过程类型枚举
|
5 years ago |
|
宋军超
|
82af372fc0
|
添加检测过程类型枚举
|
5 years ago |
|
qianhs
|
8d6ffbb012
|
bug:8268;8267;8266;8265
|
5 years ago |
|
王杰
|
de9017ca5c
|
冲突
|
5 years ago |
|
王杰
|
c68d49880c
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
7d192b36a6
|
pom冲突
|
5 years ago |
|
qianhs
|
eb7511c39e
|
bug:8268;8267;8266;8265
|
5 years ago |
|
puxiao.liao
|
f765493696
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
|
5 years ago |
|
puxiao.liao
|
70aeae21d3
|
8426 中航-报表中心-采购计划更改查询-查询条件无效
|
5 years ago |
|
钮海涛
|
8ae8383e79
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
23b06a53af
|
bug:8404
|
5 years ago |
|
钮海涛
|
da8b4db890
|
修复pom版本问题
|
5 years ago |
|
宋军超
|
32de58277a
|
添加MES_检验单和MES_检验单明细的实体和枚举
|
5 years ago |
|
宋军超
|
7ef769268d
|
添加MES_检验单和检验单明细实体与枚举
|
5 years ago |
许心洁
|
75be7d5078
|
任务#1744：全局替换自定义搜索功能
|
5 years ago |
joke.wang
|
5fb7eecee0
|
[任务：1752 oee看板]
|
5 years ago |
|
许心洁
|
ef6330675c
|
任务#1744：全局替换自定义搜索功能
|
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 |