crish
|
f7fbd1c24f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
3e9cc95017
|
pojo-model加入andon-pojo依赖
|
6 years ago |
陈思洁
|
42189da443
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
a90aa8498f
|
实体修改字段类型【int】改成【Integer】
|
6 years ago |
|
crish
|
e15e402890
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
2906667856
|
mes定时获取安灯安灯任务信息
|
6 years ago |
许心洁
|
0c20a2b655
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
changjiang.gao
|
ee8f231e5c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
 钮海涛
|
16162542ba
|
1：修改listByPage由GET方法为POST方法。
|
6 years ago |
lpx
|
ca0cf21a7c
|
【NC解冻-4.2 组件复用】PR12-01~PR12-02
|
6 years ago |
wei.peng
|
4c6f0b0d57
|
添加 CRUD Base
|
6 years ago |
|
陈思洁
|
935845704a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
e5b5891d23
|
bom信息中新增冗余字符
|
6 years ago |
|
crish
|
a537daee62
|
导出不导出有效性
|
6 years ago |
qianhs
|
caf6dc17ab
|
【NC冻结】nc冻结
|
6 years ago |
|
changjiang.gao
|
a880160f3d
|
【接口映射】bug 6104
|
6 years ago |
|
crish
|
fd5c6b2c9d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
0824a58ead
|
安灯定时自处理job, 广播播报内容优化
|
6 years ago |
WYnneaoapc
|
34a9ad36fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
1d0a2351b9
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
1f9fc9f280
|
1：新增实现生产时间的计算逻辑
|
6 years ago |
|
许心洁
|
44fccb14d6
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
 王杰
|
0c01648551
|
【需求：1088，设备维修作业】
|
6 years ago |
|
WYnneaoapc
|
b47f97fa05
|
1050-2 工位监控
|
6 years ago |
|
王杰
|
09cff08e1e
|
[需求1086，设备点检保养作业，第2次提交]
|
6 years ago |
|
王杰
|
752476b3df
|
[需求1086，设备点检保养作业，第2次提交]
|
6 years ago |
|
许心洁
|
f5a8e9f130
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
d5a45176d0
|
LAC 任务类型、指令集类型 对象优化
|
6 years ago |
 曾贞一
|
610a96d2ee
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
6b9c7b3ced
|
【VDA库存调整盘点】 添加供应商字段
|
6 years ago |
|
许心洁
|
77fefbcf74
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
e12ba1d839
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
d5864ba490
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
6816c7b566
|
1：新增实现生产时间的计算逻辑
|
6 years ago |
|
wei.peng
|
5e78c31a70
|
LAC 名称修改
|
6 years ago |
|
wei.peng
|
e8f8c941c9
|
LAC 指令集类型CRUD接口完成
LAC 任务类型CRUD接口完成
|
6 years ago |
|
许心洁
|
04df70114d
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
e593cc875d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
changjiang.gao
|
2ba7596a57
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
changjiang.gao
|
25f11781c1
|
盘点差异增加字段
|
6 years ago |
|
许心洁
|
ba7fe81978
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
5956d5a08e
|
冲销：需求变更优化
|
6 years ago |
|
王杰
|
07749b50ec
|
[需求：1086， mes设备点检保养作业]
|
6 years ago |
|
曾贞一
|
26b4a5c52c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
a9045ed403
|
bug 5953
|
6 years ago |
|
陈思洁
|
aaa0636920
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
a54d711d95
|
#1085 BOM导入接口新增
|
6 years ago |
|
crish
|
7d20321be5
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
10bc56cf46
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
901e37d6e7
|
修复bug
|
6 years ago |