汪云昊
|
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
|
6 years ago |
wynne1005
|
032fb350c8
|
queueordermodel添加构造函数
|
6 years ago |
 曾贞一
|
57f2177ef6
|
【波次合并规则--枚举查询错误】
|
6 years ago |
袁津哲
|
ae1c6ef8fd
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
8a836e340a
|
优化枚举查询报错问题
|
6 years ago |
puxiao.liao
|
d2fb33d888
|
bug1536【1536 PDA组件修改增加录入车牌信息功能】
|
6 years ago |
|
puxiao.liao
|
053e81b861
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
puxiao.liao
|
a432b77ca0
|
任务1536【1536 PDA组件修改增加录入车牌信息功能】
|
6 years ago |
|
曾贞一
|
9b3dd79655
|
【冲突解决】
|
6 years ago |
|
曾贞一
|
c0e3f1cb4f
|
【找回文件】
|
6 years ago |
|
曾贞一
|
e84d74d7be
|
【冲突文件找回】
|
6 years ago |
 王杰
|
9052997747
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
6 years ago |
|
王杰
|
5fc4c6c025
|
mes
|
6 years ago |
|
曾贞一
|
c926992611
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
4dae2eea7d
|
【MES 导入】
|
6 years ago |
 钮海涛
|
52a5c1e2f8
|
Merge branch 'test' into dev
|
6 years ago |
qianhs
|
851bd1feec
|
联调测试
|
6 years ago |
|
wynne1005
|
4324457b61
|
merge
|
6 years ago |
|
wynne1005
|
dce52df770
|
组件传参给工步
|
6 years ago |
|
qianhs
|
241ec4974b
|
联调测试
|
6 years ago |
|
wynne1005
|
351ea8755e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wynne1005
|
6a36ad7601
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
wei.peng
|
1d00303306
|
自定义报表-折线图,饼图,柱状图,矩形图 完成
|
6 years ago |
|
袁津哲
|
15035d2851
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
3529d1b845
|
枚举类修改规则范围和规则值
|
6 years ago |
|
钮海涛
|
8c4cb0748b
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
6 years ago |
zcg
|
83d7a618bf
|
按钮组件model修改
|
6 years ago |
|
zcg
|
9ab0d784dd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
qianhs
|
3654d60214
|
【bug7947】PLC监听工步装队列无法显示
|
6 years ago |
|
汪云昊
|
2a80a4c720
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
aeda8d8287
|
版本调整
|
6 years ago |
|
zcg
|
73f647e3b4
|
枚举修改
|
6 years ago |
|
zcg
|
078e1a77a4
|
【bug 7895 PLC信息-页面需修改】
|
6 years ago |
|
puxiao.liao
|
f8405b87d9
|
bug7940【7940 推荐入库-未按最近距离推荐】
|
6 years ago |
|
汪云昊
|
3069c5bf18
|
查询条件补充
|
6 years ago |
|
钮海涛
|
82d5332861
|
修复POM文件问题
|
6 years ago |
|
钮海涛
|
3b987436d8
|
新增LES管理功能
|
6 years ago |
|
钮海涛
|
c3a5564652
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
6 years ago |
|
钮海涛
|
6925ce3b18
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
6 years ago |
|
袁津哲
|
a8d84b1043
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
5de3c0bd7b
|
移库单模型中添加创建时间字段
|
6 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
6 years ago |
 贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
6 years ago |
joke.wang
|
05991b00d4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke.wang
|
1b0d0f8c6b
|
[任务：1576 动态按钮加载]
|
6 years ago |
|
袁津哲
|
a4d32d6612
|
开发波次计划根据规则生成计划功能
|
6 years ago |
|
袁津哲
|
cb8a090aea
|
开发波次计划功能
|
6 years ago |
|
袁津哲
|
ffbd512b89
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
14cfa5fa47
|
创建波次计划规则实体类和规则明细实体类
|
6 years ago |
|
wynne1005
|
d1ff70adc4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |