 王杰
|
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 |
宋军超
|
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 |
|
puxiao.liao
|
6b9b2e8dd2
|
BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】
|
5 years ago |
 贾文涛
|
c4510fb121
|
BUG #8485,修复数据权限-查询启用禁用无效
|
5 years ago |
|
宋军超
|
00df3134b2
|
任务：【1829】-更新检测单和检测单明细实体
|
5 years ago |
|
puxiao.liao
|
8d386caa71
|
1776 工装初始化-新增箱条码与库位匹配检查组件
|
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 |
 曾贞一
|
c85fd2eff0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
24ea607718
|
【8441 收货回执打印功能完善】
|
5 years ago |
|
袁津哲
|
f81b26bc3c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
joke.wang
|
de9c901a3b
|
[任务：1826 库存排程配置]
|
5 years ago |
|
袁津哲
|
0ddd92e4f8
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
0bafa0de52
|
开发调试回显组件模板功能
|
5 years ago |
|
joke.wang
|
222ba4f8a4
|
[任务：1825 plc增加默认属性字段]
|
5 years ago |