王杰
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
wei.peng
0bc9f2e9bc
获取模板 微服务调用重新编写
6 years ago
WYnneaoapc
c7842e63a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
WYnneaoapc
2deb384cca
提交
6 years ago
crish
3093aa1e86
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
crish
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
wei.peng
884f3e1a96
合并代码
6 years ago
王杰
aebe742280
mes枚举增加关键件条码规则信息模块的绑定规则
6 years ago
wei.peng
d7b0f30d91
IMPP 平台功能功能优化 . 软适适配功能开发
6 years ago
WYnneaoapc
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
WYnneaoapc
4ff3677fba
Merge branch 'test' into dev
6 years ago
WYnneaoapc
0aef9adac9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
WYnneaoapc
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
crish
7ee5312303
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
crish
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
汪云昊
1d587f831b
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
王杰
3348d5c81a
merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
e4aadf35ed
mes生产工单页面按钮控制
6 years ago
王杰
4f37dc42ef
pojo-mes-time-update-wangjie
6 years ago
汪云昊
0b13c6dd70
order by 列类型装换
6 years ago
汪云昊
f10ff69ce0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
汪云昊
1d55cd22a6
order by 列类型装换
6 years ago
汪云昊
39a00d3a19
order by 列类型装换
6 years ago
汪云昊
7eed51791f
软件适配器-定时适配任务
6 years ago
wei.peng
1b30b927ce
自定义表单功能优化
6 years ago
陈思洁
b3a552d65d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
陈思洁
070bacf20e
所有外部单据增加创建时间和创建人的查询条件
6 years ago
刘敏
2ca432b6a8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
汪云昊
f2380f6d14
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
汪云昊
02d60ed1a8
软件适配器-数据适配转换
6 years ago
刘敏
7a935276a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
刘敏
bc953bb2c8
查询条件封装
6 years ago
刘敏
de381d438a
领料单模板创建
6 years ago
crish
3711873c29
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
WYnneaoapc
c34a369e93
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
9d70008912
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
61ce4d1b3f
优化
6 years ago
WYnneaoapc
ef1450e912
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
crish
6c37a60ff4
MES-PCN获取平台打印数据
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
陈思洁
e9c596adce
盘点hql排序修改
6 years ago
陈思洁
4573b09392
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
陈思洁
2058789438
盘点业务修改bug
6 years ago
wei.peng
94924cb264
POJO 合并
6 years ago
wei.peng
718ec36747
POJO 合并
6 years ago
wei.peng
41aff3b560
``
6 years ago
汪云昊
619251474d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
汪云昊
f5c0ca9383
软适配模型调整
6 years ago
曾贞一
abf155ecd9
库存报表 创建人、创建时间添加
6 years ago
WYnneaoapc
c05e3b13c6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
汪云昊
391d0129e1
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
WYnneaoapc
63d86a4b0d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
WYnneaoapc
ecba29948f
816 add method
6 years ago
jimmy.zeng
221f05b175
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
汪云昊
69525fbaa9
表单菜单排序
6 years ago
刘敏
839c139222
库存移动条码报表优化
6 years ago
jimmy.zeng
235498b162
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
陈思洁
638d9cb1a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
陈思洁
9ff9c11c97
字段调整
6 years ago
jimmy.zeng
b0d2812778
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
汪云昊
409c433b5c
添加字典分组
6 years ago
汪云昊
42f067b987
软适配参数接口
6 years ago
曾贞一
eb035aeaf6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
汪云昊
cf5aded9d9
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
汪云昊
05b9298dec
软适配Repository初始化
6 years ago
曾贞一
cef48801df
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
许心洁
a713e835fd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
汪云昊
7455c6c640
软适配配置文件初始化
6 years ago
汪云昊
f82011cf5b
实体
6 years ago
汪云昊
1c98f0a3c4
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
汪云昊
dc78cf114f
实体
6 years ago
wei.peng
aee54acafc
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
wei.peng
46c710e559
表单功能优化,虚拟属性连表查询,时间格式化对接
6 years ago
wei.peng
68e4b74e0a
平台权限系功能优化
6 years ago
wei.peng
6d99080069
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
ff52a412d4
库存初始化信息
6 years ago
陈思洁
2860edf722
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
陈思洁
b604c5d9a0
交易记录增加字段
6 years ago
许心洁
374c2bf76c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
许心洁
92d4bf46ce
#5255,#5039
6 years ago
jimmy.zeng
c986f7b2a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
汪云昊
090efb787f
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
汪云昊
9ee2901346
添加字典分组
...
优化redis资源键
6 years ago
wei.peng
d04d441711
用户管理修改密码 Bug 修复
6 years ago