 曾贞一
|
8a9e347f13
|
bug 修改
|
7 years ago |
crish
|
dac82b1977
|
修改报错
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
crish
|
1f6eb341cd
|
修改报错
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
yiming.gu
|
43c2dd4092
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
63ddfd5a53
|
MES新增基础数据查询条件
|
7 years ago |
allen.zhang
|
d714733a27
|
Merge branch 'dev' into test
|
7 years ago |
|
曾贞一
|
6774943319
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
曾贞一
|
4e45f813dc
|
CS_ORDER_STATUS 枚举修改
DdlPreparedPack getNotInPack getNotInPackString 方法修改
|
7 years ago |
许心洁
|
37aa342f46
|
MES-JIT队列组件前端调试BUG
|
7 years ago |
|
许心洁
|
01d4963c57
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
许心洁
|
9200080178
|
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
|
7 years ago |
柯裕
|
7ba4c4a6e4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
8aa958b902
|
ANDON统计报表更新
|
7 years ago |
|
许心洁
|
0bd995e990
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
许心洁
|
bb14454170
|
MES—POJO实体复制+Dao层少了@Service注释+任务生成详细日志+交易处理组件：出入库：目的库位的数量累加依据改为目的质量状态
|
7 years ago |
|
allen.zhang
|
e24e7ef421
|
Merge branch 'dev' into test
|
7 years ago |
|
柯裕
|
d60368b227
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
d62904cac7
|
ANDON统计报表更新（待改进）
|
7 years ago |
wei.peng
|
13c0e5afeb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
Silliter
|
b4ca1fe409
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
Silliter
|
a42bb71aee
|
docker配置文件修改
|
7 years ago |
|
wei.peng
|
0e79a6cdc9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
7831940c2a
|
FastDfs 添加日志
|
7 years ago |
|
许心洁
|
c99125b1a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
许心洁
|
76e553234e
|
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
|
7 years ago |
|
柯裕
|
3f961e7923
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
00086912bc
|
ANDON实体更新
|
7 years ago |
|
allen.zhang
|
8afe54af50
|
Merge branch 'dev' into test
|
7 years ago |
|
yiming.gu
|
08d0b32ea3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
85c4f94dcb
|
MES model转移至pojo-mes目录下
|
7 years ago |
|
柯裕
|
b581cbee63
|
ANDON实体更新
|
7 years ago |
|
yiming.gu
|
78145e44e4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
26fc821d1a
|
MES model修改
|
7 years ago |
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
ce864025e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
crish
|
d0840978de
|
PLC数据采集优化
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
yihang.lv
|
21c60292bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yihang.lv
|
245596ee0b
|
sweb 导入非标准包装修改
|
7 years ago |
|
汪云昊
|
93ace83b5f
|
长文本数据类型
|
7 years ago |
|
yiming.gu
|
5fc11292ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
280f9a2233
|
MES新增班次休息表、物料关键数据关系表
|
7 years ago |
alwaysfrin
|
41a8adcea2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
309f3f2282
|
事务调整及demo
|
7 years ago |
|
wei.peng
|
302ac8a7e8
|
初始化功能目录
|
7 years ago |
|
许心洁
|
bdff2c3e2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
许心洁
|
8e2e1f6543
|
MES：流程配置添加工序，工步基础数据接口
|
7 years ago |
|
柯裕
|
d9b263d10c
|
ANDON_HQLPACK更新
|
7 years ago |
|
allen.zhang
|
44abb90fe4
|
Merge branch 'dev' into test
|
7 years ago |
jiajack
|
550f2132e3
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java
|
7 years ago |
|
jiajack
|
21f6d4eaf8
|
PLC配置
|
7 years ago |