许心洁
|
c79786a677
|
合并开发分支的代码POM文件被改成DEV修改回TEST
|
6 years ago |
|
许心洁
|
41fd0c4847
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
dd86ce354a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b8842edbb1
|
无条码打印：新功能开发完成
|
6 years ago |
crish
|
88af19f8e9
|
修改开发环境pom文件test为dev
|
6 years ago |
|
许心洁
|
71defbc10d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
changjiang.gao
|
376ca4bbd4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7359d45d3f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
 王杰
|
3f6f6428f6
|
【需求:1106,设备通知，优化】
|
6 years ago |
|
changjiang.gao
|
13066bd4d1
|
【库存预警】bug 243
|
6 years ago |
jokelone
|
a5609d97fb
|
【1092 返厂返修增加枚举】
|
6 years ago |
 钮海涛
|
d99ad6c44a
|
1：新增弹出框选择对象信息接口。
|
6 years ago |
|
王杰
|
03a4c98234
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
803d5c57f2
|
【需求1101，设备维修作业，第3次提交】
|
6 years ago |
wei.peng
|
699276777a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
7496eb4a1b
|
LAC 全部 CRUD 接口完成
|
6 years ago |
|
钮海涛
|
5183163abd
|
1：新增弹出框选择对象信息接口。
|
6 years ago |
|
crish
|
67461457fc
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
1e0f0c706c
|
安灯问题修复
|
6 years ago |
|
crish
|
f093a97cf0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
4eaa8b5b17
|
导入导出
|
6 years ago |
|
crish
|
6902c79472
|
问题清单问题修复
|
6 years ago |
|
crish
|
7d8b8664cc
|
问题清单问题修复
|
6 years ago |
|
王杰
|
56996126be
|
【需求：1101，mes同步设备安灯维修任务】
|
6 years ago |
|
jokelone
|
d7f55250ef
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
8d10a46953
|
(1092 MesProdBindRecordModel增加有参构造方法)
|
6 years ago |
|
changjiang.gao
|
30007cee47
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
9bdae2ad13
|
【需求：1086，设备点检保养作业】
|
6 years ago |
jiajack
|
f6b06e6b52
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
aef7f7a948
|
增加班次顺序字段
|
6 years ago |
|
jiajack
|
d87d81e34a
|
【产线运行情况】-BI报表开发
|
6 years ago |
|
许心洁
|
73aef5326c
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
d0b98f0869
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
00e849a62e
|
(1089 过程质量检测基础数据；1090 返厂返修基础数据)
|
6 years ago |
|
许心洁
|
3bc277178e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
changjiang.gao
|
509f21aaaf
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java
|
6 years ago |
|
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 |