汪云昊
|
b4f14112b3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
3fd17208e2
|
枚举更新
|
5 years ago |
wei.peng
|
cc7572ddd0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
袁津哲
|
94f25541aa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
袁津哲
|
4dc2996bdc
|
业务类型实体中新增是否启用波次字段
|
5 years ago |
宋军超
|
b3032ca8e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
45dda6ea57
|
添加散件配置报文关系和工装明细实体
|
5 years ago |
|
袁津哲
|
cbe3094f2a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
ea9457a191
|
修复WMS波次计划实体类字段
|
5 years ago |
wynne1005
|
c8af9ed6f8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
965a8d37cd
|
删除多余maven profile
|
5 years ago |
 钮海涛
|
cfd3f8d58f
|
冲突解决
|
5 years ago |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
5 years ago |
陈思洁
|
30608f886b
|
解决冲突
|
5 years ago |
|
陈思洁
|
d9d2113f75
|
【MES_增加枚举】
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
|
钮海涛
|
53dc57a03e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
df1cbc9449
|
新增供货追踪接口
|
5 years ago |
qianhs
|
836a4f710d
|
联调测试
|
5 years ago |
|
宋军超
|
b3cecc9481
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
f64a543a4a
|
添加产品流程批量配置功能
|
5 years ago |
|
袁津哲
|
bcec12cb38
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
3442fd4801
|
波次规则明细新增开窗查询字段
|
5 years ago |
|
袁津哲
|
9f918b6664
|
修改波次规则和范围枚举类字段值名称
|
5 years ago |
 王杰
|
231345c135
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
cd99a63233
|
mes
|
5 years ago |
|
汪云昊
|
0d75c1eac7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
wynne1005
|
032fb350c8
|
queueordermodel添加构造函数
|
5 years ago |
 曾贞一
|
57f2177ef6
|
【波次合并规则--枚举查询错误】
|
5 years ago |
|
袁津哲
|
ae1c6ef8fd
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
8a836e340a
|
优化枚举查询报错问题
|
5 years ago |
puxiao.liao
|
d2fb33d888
|
bug1536【1536 PDA组件修改增加录入车牌信息功能】
|
5 years ago |
|
puxiao.liao
|
053e81b861
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
puxiao.liao
|
a432b77ca0
|
任务1536【1536 PDA组件修改增加录入车牌信息功能】
|
5 years ago |
|
曾贞一
|
9b3dd79655
|
【冲突解决】
|
5 years ago |
|
曾贞一
|
c0e3f1cb4f
|
【找回文件】
|
5 years ago |
|
曾贞一
|
e84d74d7be
|
【冲突文件找回】
|
5 years ago |
|
王杰
|
9052997747
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
5fc4c6c025
|
mes
|
5 years ago |
|
曾贞一
|
c926992611
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
4dae2eea7d
|
【MES 导入】
|
5 years ago |
|
钮海涛
|
52a5c1e2f8
|
Merge branch 'test' into dev
|
5 years ago |
|
qianhs
|
851bd1feec
|
联调测试
|
5 years ago |
|
wynne1005
|
4324457b61
|
merge
|
5 years ago |
|
wynne1005
|
dce52df770
|
组件传参给工步
|
5 years ago |
|
qianhs
|
241ec4974b
|
联调测试
|
5 years ago |
|
wynne1005
|
351ea8755e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
6a36ad7601
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wei.peng
|
1d00303306
|
自定义报表-折线图,饼图,柱状图,矩形图 完成
|
5 years ago |
|
袁津哲
|
15035d2851
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |