jokelone
|
a04b8f7c57
|
【bug：5791 生产工单明细1】
|
6 years ago |
|
jokelone
|
5fd619ac79
|
【bug：5791生产工单明细】
|
6 years ago |
WYnneaoapc
|
b4cea27a5b
|
代码审核 修改2
|
6 years ago |
|
WYnneaoapc
|
56e6cf7918
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
6 years ago |
|
WYnneaoapc
|
029c9b6bc8
|
代码审核 修改1
|
6 years ago |
|
jokelone
|
9a6c5cfda3
|
【任务：1163客户订单】
|
6 years ago |
|
jokelone
|
9418a0838b
|
【任务：1129 产品编码配置基础数据】
|
6 years ago |
|
WYnneaoapc
|
a6e8265e29
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jokelone
|
90ec0f107e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
32dbaed8fe
|
【任务：1129数据对象、对象结构、产品包装关系基础数据】
|
6 years ago |
|
WYnneaoapc
|
4308084ca3
|
数据抽取修改 1130
|
6 years ago |
crish
|
851ba63e7c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
WYnneaoapc
|
9ad66157a8
|
数据同步优化 1078-4
|
6 years ago |
|
crish
|
6996dc2273
|
6204: MesConfig配置添加业务主键
|
6 years ago |
|
WYnneaoapc
|
35f625ac21
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
563955570d
|
数据同步优化 1078
|
6 years ago |
|
jokelone
|
828cf66784
|
【需求：1090 工序BOM，物料绑定记录删除多余字段】
|
6 years ago |
 王杰
|
cb319e4304
|
【需求：1126，设备周期计划】
|
6 years ago |
汪云昊
|
86a18d730a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
9907813aed
|
Lac调度实体
|
6 years ago |
|
jokelone
|
6fd7e6be5f
|
【需求：1092 维修类型】
|
6 years ago |
|
王杰
|
75ce77f6f1
|
【需求：1126，设备周期计划】
|
6 years ago |
|
王杰
|
347c47c82f
|
【需求：1125，设备报表】
|
6 years ago |
|
jokelone
|
438517be44
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
6 years ago |
|
jokelone
|
6c847cf305
|
【需求：1091 返厂返修添加字段和枚举】
|
6 years ago |
|
王杰
|
2069d6a3ae
|
【需求：1125，设备报表】
|
6 years ago |
|
WYnneaoapc
|
b668879f9d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
2f382d37cc
|
【需求：1124，首检件配置】
|
6 years ago |
|
王杰
|
dcaf007f4d
|
【需求：1107，生产工单首检件】
|
6 years ago |
|
WYnneaoapc
|
29ac92566d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
jiajack
|
3c8b920a4c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
95789b1bd8
|
增加生产质量情况BI业务
|
6 years ago |
|
WYnneaoapc
|
dbd4a7578b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
88af19f8e9
|
修改开发环境pom文件test为dev
|
6 years ago |
changjiang.gao
|
376ca4bbd4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
3f6f6428f6
|
【需求:1106,设备通知，优化】
|
6 years ago |
|
WYnneaoapc
|
04c99167c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
6de6d36e80
|
数据库抽取反写 1105-1
|
6 years ago |
|
王杰
|
03a4c98234
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
803d5c57f2
|
【需求1101，设备维修作业，第3次提交】
|
6 years ago |
|
crish
|
67461457fc
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
848f6b2f23
|
工位监控优化 1050-6
|
6 years ago |
|
WYnneaoapc
|
c71d667d0f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
56996126be
|
【需求：1101，mes同步设备安灯维修任务】
|
6 years ago |
|
changjiang.gao
|
30007cee47
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
9bdae2ad13
|
【需求：1086，设备点检保养作业】
|
6 years ago |
|
WYnneaoapc
|
c56822dc40
|
工位监控优化 1050-5
|
6 years ago |
|
WYnneaoapc
|
3dbbee3c60
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
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 |