I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

中航审核发布

Browse Source
yun-zuoyi
wynne1005 5 years ago
parent 716f0ac1f9
commit a84186e023
23 changed files with 63 additions and 39 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-andon/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-aps/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-base/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-form/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-hardswitch/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-ics/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-jobflow/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-lac/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mdm/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mes-pcn/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mes/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java
Unescape Escape View File

@ -9,9 +9,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +24,9 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED_RECORD")
@Table(name = "MES_CELL_FEED_RECORD", indexes = {
@Index(columnList = "ORDER_NO")
})
@Api("工位投料履历信息")
public class MesCellFeedRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971369489107783L;

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java
Unescape Escape View File

@ -23,7 +23,8 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = {
@Index(columnList = "CREATE_DATE_TIME")
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "WORK_CENTER_CODE")
})
@Api("工位监控异常信息")
public class MesWorkCellMonitorLog extends BaseBean implements Serializable {

51
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -15,6 +15,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.List;
/**
* @Description:
* @Reference: Mes 条件封装
@ -939,6 +940,15 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesQcOrder(MesQcOrder qcOrder, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrder, organizeCode);
if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) {
DdlPreparedPack.getStringEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean);
}
if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(qcOrder.getProductSn())) {
DdlPreparedPack.getStringEqualPack(qcOrder.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(qcOrder.getOrderNo())) {
DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean);
}
@ -2037,7 +2047,7 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean);
}
if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
if (!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProdBindRecord.getCreateDateTimeStart(),
mesProdBindRecord.getCreateDateTimeEnd(),
@ -2376,19 +2386,20 @@ public class MesHqlPack {
/**
* 界面组件配置
*
* @param windowModule
* @param organizeCode
* @return
*/
public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode);
if(!StringUtils.isEmpty(windowModule.getWindowNo())){
if (!StringUtils.isEmpty(windowModule.getWindowNo())) {
DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean);
}
if(!StringUtils.isEmpty(windowModule.getModuleCode())){
if (!StringUtils.isEmpty(windowModule.getModuleCode())) {
DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean);
}
if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){
if (!StringUtils.isEmpty(windowModule.getWindowModuleBack())) {
DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean);
}
return packBean;
@ -2396,22 +2407,23 @@ public class MesHqlPack {
/**
* 界面组件参数配置
*
* @param windowModuleParam
* @param organizeCode
* @return
*/
public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode);
if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){
if (!StringUtils.isEmpty(windowModuleParam.getWindowNo())) {
DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean);
}
if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){
if (!StringUtils.isEmpty(windowModuleParam.getModuleCode())) {
DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean);
}
if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){
if (!StringUtils.isEmpty(windowModuleParam.getParamCode())) {
DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean);
}
if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){
if (!StringUtils.isEmpty(windowModuleParam.getParamValue())) {
DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean);
}
return packBean;
@ -2419,22 +2431,23 @@ public class MesHqlPack {
/**
* 数据预警配置
*
* @param dataWarning
* @param organizeCode
* @return
*/
public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode);
if(!StringUtils.isEmpty(dataWarning.getObjectCode())){
if (!StringUtils.isEmpty(dataWarning.getObjectCode())) {
DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean);
}
if(!StringUtils.isEmpty(dataWarning.getWarningRule())){
if (!StringUtils.isEmpty(dataWarning.getWarningRule())) {
DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean);
}
if(!StringUtils.isEmpty(dataWarning.getWarningItem())){
if (!StringUtils.isEmpty(dataWarning.getWarningItem())) {
DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean);
}
if(!StringUtils.isEmpty(dataWarning.getInformMode())){
if (!StringUtils.isEmpty(dataWarning.getInformMode())) {
DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean);
}
return packBean;
@ -2458,6 +2471,7 @@ public class MesHqlPack {
return result;
}
/**
* 封装公用查询参数
*
@ -2485,9 +2499,9 @@ public class MesHqlPack {
}
/**
* 按条件分页查询产品条码补打印数据
*
* @param mesProduceSn
* @return
*/
@ -2714,7 +2728,7 @@ public class MesHqlPack {
public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
DdlPackBean packBean;
if(dataAuth.getIsValidVal() == 0) {
if (dataAuth.getIsValidVal() == 0) {
packBean = DdlPackBean.getDdlPackBean(organizeCode);
} else {
packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal());
@ -2869,6 +2883,7 @@ public class MesHqlPack {
/**
* 导入模板信息分页查询条件
*
* @param template
* @return
*/
@ -2883,6 +2898,7 @@ public class MesHqlPack {
/**
* 导入模板明细信息分页查询条件
*
* @param details
* @return
*/
@ -2945,6 +2961,7 @@ public class MesHqlPack {
/**
* 物料校验项
*
* @param partCheck
* @param organizeCode
* @return
@ -2990,6 +3007,7 @@ public class MesHqlPack {
/**
* MES AGV停机记录信息条件查询
*
* @param stopRecord
* @return
*/
@ -3093,6 +3111,7 @@ public class MesHqlPack {
/**
* 扩展对象配置
*
* @param extendObjectCfg
* @param organizeCode
* @return
@ -3116,6 +3135,7 @@ public class MesHqlPack {
/**
* 产品工作中心配置
*
* @param prodWorkCenter
* @param organizeCode
* @return
@ -3133,6 +3153,7 @@ public class MesHqlPack {
/**
* 客户JIT预装队列
*
* @param queueJitPlan
* @param organizeCode
* @return
@ -3167,6 +3188,7 @@ public class MesHqlPack {
/**
* 客户JIT预装队列明细
*
* @param queueJitPlanDetail
* @param organizeCode
* @return
@ -3184,6 +3206,7 @@ public class MesHqlPack {
/**
* 客户JIT预装队列BOM
*
* @param queueJitPlanBom
* @param organizeCode
* @return

2
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-platform/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-ptl/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-report/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-softswitch/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-sweb/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-wms/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-workflow/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
Unescape Escape View File

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Write Preview
Loading…
Cancel
Save