b7e17c5451
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
2325d18660
软件适配器 认证参数接口
6 years ago
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
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
5df2db4b46
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f820c449bb
工步条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
2ef0dd5c3b
周期修改关联数据
6 years ago
王杰
12f6e2c14b
mes-pcn定时任务表维护
6 years ago
18eff49e63
hql语句拼接修改
6 years ago
08fbbee9c1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
11aff72404
新增冗余字段
6 years ago
cf026d6dee
获取模板详情列表功能接口开发完成
6 years ago
1f1a9c39fc
异常国际化功能开发完成
6 years ago
c584f2e048
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
12a2a27b18
mes， pcn条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
3f5f89bd1b
流程管家：获取ID真实值代码错误导致新增的组件缓存错误（手工领料历史记录无法查看）
6 years ago
王杰
3b3ddd581a
mest条码生成规则最大值是否循环枚举
6 years ago
王杰
b375983304
mes条码生成规则CURD及mesbug修复
6 years ago
a38347d2fb
revert
6 years ago
b20d333ae4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
34e2c13b38
getByProperty获取到多条数据报错
6 years ago
0bc9f2e9bc
获取模板 微服务调用重新编写
6 years ago
c7842e63a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2deb384cca
提交
6 years ago
3093aa1e86
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bfd682cb27
安灯按照产线过滤信息
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
921859b996
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fe65067ca2
1. 增加 IOT 接口配置表的 POJO
6 years ago
884f3e1a96
合并代码
6 years ago
王杰
aebe742280
mes枚举增加关键件条码规则信息模块的绑定规则
6 years ago
d7b0f30d91
IMPP 平台功能功能优化 . 软适适配功能开发
6 years ago
5e72d98ad8
提交
6 years ago
f56f8d714b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
617bb73dad
增加业务类型字段、修改临时变量字段类型
...
修改hql查询字段
6 years ago
a83b552203
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
60eadfac7a
mes维护页面加模糊查询
6 years ago
2bc04b407e
计划日期、时间新增
6 years ago
cb49d8d848
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ffb6f8a17c
任务列表不分页，主要查询字段加索引
6 years ago
4ff3677fba
Merge branch 'test' into dev
6 years ago
0aef9adac9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1328dc7ddd
#Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
7ee5312303
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
dd418f8b51
开线信号发送逻辑修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
acd1e6cfb6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
ce70994a57
盘点 按照盘点差异类型汇总
6 years ago
4d00397411
修改盘点范围的排序规则
6 years ago
e83efe76e0
软件适配器 测试
6 years ago
汪云昊
WYnneaoapc
刘敏
crish
王杰
陈思洁
wei.peng
许心洁
于学杰
曾贞一