crish
|
8a5337daad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
235a728c0e
|
andon
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
陈思洁
|
b1dd7d3915
|
合并冲突
|
6 years ago |
|
陈思洁
|
d269576dbf
|
新增字段
|
6 years ago |
jimmy.zeng
|
08b697a72e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
刘敏
|
9c26f45cd5
|
明细状态枚举添加
|
6 years ago |
 王杰
|
2e86ff81d0
|
mes工作单元参数增加枚举
|
6 years ago |
|
jimmy.zeng
|
06927a31bd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
王杰
|
09eee24769
|
mes工作单元参数CRUD
|
6 years ago |
|
王杰
|
8034e104c8
|
mes工作单元参数
|
6 years ago |
|
王杰
|
5388c4405b
|
mes-pcn-task表修改
|
6 years ago |
|
jimmy.zeng
|
154730e69b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
6e5176c3fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
b10262b21f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
ac1090d661
|
报表返回字段信息添加
|
6 years ago |
|
crish
|
9981c4089b
|
修改唯一性校验， 不能新增禁用的信息
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
王杰
|
d7ddf4d5a0
|
mes-pcn定时任务数据同步日志表修改类型
|
6 years ago |
|
王杰
|
6929e88570
|
mes-pcn定时任务
|
6 years ago |
|
crish
|
84bcdbaf7d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
f09ac4d897
|
安灯任务
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jimmy.zeng
|
399a51b044
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
许心洁
|
27d574314d
|
getList未查到数据要判断+补全所有showInformation区分颜色
|
6 years ago |
|
crish
|
95b48cdc54
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
71e7362216
|
PCN数据同步， 逻辑修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jimmy.zeng
|
cfc0de67cf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
057fa88904
|
revert
|
6 years ago |
|
刘敏
|
56a4d6b362
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
19253a9b6a
|
构造函数新增条码
|
6 years ago |
|
crish
|
c6584a9437
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
368a3a1c66
|
mes枚举
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
许心洁
|
7740503a97
|
getByProperty查询到多条数据抛异常
|
6 years ago |
wei.peng
|
96a29d3de8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
b15534d558
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
许心洁
|
a2fe1a80f9
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
540884404f
|
微服务配置调整。
|
6 years ago |
|
wei.peng
|
645b991df8
|
提交代码
|
6 years ago |
|
wei.peng
|
90bb35c83f
|
用户默认分页配置功能开发
用户获取首页插件Bug 修复
|
6 years ago |
|
许心洁
|
18dac2b569
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy.zeng
|
1b06c1d07f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
王杰
|
5947f88da1
|
mes-pcn定时任务工作清单数据同步
|
6 years ago |
汪云昊
|
b7e17c5451
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
2325d18660
|
软件适配器 认证参数接口
|
6 years ago |
WYnneaoapc
|
3bedf8fb8d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java
|
6 years ago |
|
WYnneaoapc
|
953f593207
|
提交
|
6 years ago |
|
刘敏
|
0dc452c4c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
592cd15add
|
调试枚举删除、库位导入工厂字段添加
|
6 years ago |
|
crish
|
5df2db4b46
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
f820c449bb
|
工步条码打印
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
wei.peng
|
b34be0b86e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
2ef0dd5c3b
|
周期修改关联数据
|
6 years ago |