刘敏
|
ff462900b7
|
枚举描述添加
|
6 years ago |
jimmy.zeng
|
6e48f0a677
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
 曾贞一
|
d8568e6d22
|
盘点优化代码。
|
6 years ago |
|
曾贞一
|
5290ba6f63
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
01cb76da6d
|
指令移库 根据目标存储区扫描库位
|
6 years ago |
|
刘敏
|
836f1bf870
|
字段修改
|
6 years ago |
陈思洁
|
2af903f029
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
254f08da32
|
物料描述修改
|
6 years ago |
|
jimmy.zeng
|
2e8a70d8b4
|
pom版本还原--pojo
|
6 years ago |
|
刘敏
|
5fb7ffc40b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
0faeaa6047
|
导出枚举添加
|
6 years ago |
 王杰
|
482159b322
|
mes-pcn定时任务枚举修改
|
6 years ago |
|
刘敏
|
193eba75d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
5b735fe3a2
|
移动单枚举导出
|
6 years ago |
许心洁
|
71b6c64ed0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
刘敏
|
3b86092577
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
5f539afd6d
|
移动单明细注解添加
|
6 years ago |
|
许心洁
|
53a08621fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
db4f6bcdb1
|
流程管家：添加作业记录明细（快速流程每一次扫条码都会生成一个新的移动单）
|
6 years ago |
汪云昊
|
b760543b3b
|
excel通用导入优化
|
6 years ago |
crish
|
a5b01bbaae
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
69d2932ca4
|
http请求增加不需要设置请求内容枚举
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
许心洁
|
fe793f0431
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
3a1cf7a2b7
|
判断属性是否有final修饰
|
6 years ago |
|
许心洁
|
d87cbd9c4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
b4b095c970
|
判断属性是否有final修饰
|
6 years ago |
|
许心洁
|
5db4307fa5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
4d5c92df78
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
d5cfe77ac5
|
mes定时任务枚举
|
6 years ago |
|
汪云昊
|
32502582c1
|
新增属性初始化
|
6 years ago |
|
王杰
|
46d220f3ec
|
mes条码规则校验
|
6 years ago |
WYnneaoapc
|
bb975b208b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
cbcdcabd82
|
测试修改提交
|
6 years ago |
|
许心洁
|
84ace781a3
|
流程添加默认值方式错误
|
6 years ago |
|
许心洁
|
503b68a0a5
|
拉了测试的代码POM文件错乱
|
6 years ago |
|
许心洁
|
6068ca9fd8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7d19c1bbed
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
cafd923d3a
|
流程管家：添加作业记录明细（作业记录不再更新移动单号：一个步骤记录一个作业记录明细）
|
6 years ago |
|
许心洁
|
706ddcbba7
|
流程新增初始化组件明细组件赋默认值0
|
6 years ago |
|
许心洁
|
04f8aaa783
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
eadb86ce60
|
excel通用导入优化
|
6 years ago |
|
汪云昊
|
fb3b8a033d
|
excel通用导入优化
|
6 years ago |
|
jimmy.zeng
|
4f58949e2d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
5ea81cc34e
|
实体修改
|
6 years ago |
|
陈思洁
|
2a90329fcf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
63be82f044
|
实体修改
|
6 years ago |
|
jimmy.zeng
|
73b6088977
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
6f87b97721
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
d484efb69e
|
明细构造新增
|
6 years ago |
|
crish
|
7c29add7ca
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
c9df6efd1c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
65b336f708
|
任务993+生产报工产生的移动明细单位错误BUG修复+PDA颜色回显完成的明细颜色没有与处理中的区分开BUG修复
|
6 years ago |
|
crish
|
7aec1fdb6a
|
添加工步类型枚举
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
WYnneaoapc
|
7f3f39af06
|
提交
|
6 years ago |
|
WYnneaoapc
|
63c0f02f32
|
提交
|
6 years ago |
|
WYnneaoapc
|
146cf768d6
|
提交
|
6 years ago |
|
jimmy.zeng
|
fef022ce13
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy.zeng
|
2a7ba550d6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
24a9d3ff2c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
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 |
|
许心洁
|
a2fe1a80f9
|
Merge remote-tracking branch 'origin/dev' into dev
|
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 |
|
许心洁
|
9de4d79009
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
d2036fd841
|
任务961，962，966，973
|
6 years ago |
|
jimmy.zeng
|
59047b5b4c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
王杰
|
12f6e2c14b
|
mes-pcn定时任务表维护
|
6 years ago |
|
jimmy.zeng
|
7e5d2e1e56
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
wei.peng
|
cf026d6dee
|
获取模板详情列表功能接口开发完成
|
6 years ago |
|
wei.peng
|
1f1a9c39fc
|
异常国际化功能开发完成
|
6 years ago |
|
crish
|
f7b366fe29
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
c584f2e048
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
12a2a27b18
|
mes， pcn条码打印
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jimmy.zeng
|
61822039c5
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
3f5f89bd1b
|
流程管家：获取ID真实值代码错误导致新增的组件缓存错误（手工领料历史记录无法查看）
|
6 years ago |
|
jimmy.zeng
|
9680112434
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
王杰
|
3b3ddd581a
|
mest条码生成规则最大值是否循环枚举
|
6 years ago |
|
jimmy.zeng
|
6d925d6b9f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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
|
856c77a965
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy.zeng
|
c901f18f89
|
pom版本还原
|
6 years ago |
|
wei.peng
|
0bc9f2e9bc
|
获取模板 微服务调用重新编写
|
6 years ago |
|
jimmy.zeng
|
188e2b5efd
|
pom版本还原
|
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 |