许心洁
|
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 |