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

提交

Browse Source
yun-zuoyi
WYnneaoapc 6 years ago
parent 271a26d2b8
commit 9b0c5de954
8 changed files with 238 additions and 25 deletions
Show Stats Download Patch File Download Diff File

141
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -13,13 +13,12 @@ public class MesPcnEnumUtil {
/**
* mes-pcn定时任务状态
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PCN_TASK_STATUS{
public enum MES_PCN_TASK_STATUS {
OPEN(1,"OPEN"),
CLOSE(2,"CLOSE");
OPEN(1, "OPEN"),
CLOSE(2, "CLOSE");
private int value;
private String description;
@ -50,13 +49,12 @@ public class MesPcnEnumUtil {
/**
* mes-pcn定时任务同步结果状态
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PCN_TASK_SYNC_STATUS{
public enum MES_PCN_TASK_SYNC_STATUS {
SUCCESS(1,"mes主服务定时任务工作清单同步成功"),
ERROR(2,"mes主服务定时任务工作清单同步失败");
SUCCESS(1, "mes主服务定时任务工作清单同步成功"),
ERROR(2, "mes主服务定时任务工作清单同步失败");
private int value;
private String description;
@ -90,10 +88,10 @@ public class MesPcnEnumUtil {
* 10.
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYNC_PATTERN{
public enum SYNC_PATTERN {
UPDATE(1,"修改或新增"),
INSERT(2,"新增");
UPDATE(1, "修改或新增"),
INSERT(2, "新增");
private int value;
private String description;
@ -127,10 +125,10 @@ public class MesPcnEnumUtil {
* 10.
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYNC_TYPE{
public enum SYNC_TYPE {
GET_MES_DATA(1,"pcn获取mes数据"),
DATA_TO_MES(2,"pcn推送数据至mes");
GET_MES_DATA(1, "pcn获取mes数据"),
DATA_TO_MES(2, "pcn推送数据至mes");
private int value;
private String description;
@ -232,4 +230,119 @@ public class MesPcnEnumUtil {
}
}
/**
* RAW_PART_TYPE 原材料类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RAW_PART_TYPE {
RAW(10, "lotNo", "原材料"),
SEMIFINISHED(20, "fixLotNo", "半成品");
private int value;
private String code;
private String description;
RAW_PART_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* RAW_PART_STATUS 原材料状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RAW_PART_STATUS {
READY(10, "待投料"),
ALREADY(20, "已投料");
private int value;
private String description;
RAW_PART_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* PROCESS_BOM_ISFEED 是否投料
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROCESS_BOM_ISFEED {
FEED(1, "投料"),
NOT_FEED(2, "不投料");
private int value;
private String description;
PROCESS_BOM_ISFEED(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

34
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -395,6 +395,18 @@ public class DdlPreparedPack {
}
/**
* 封装String对象成小于不等于语句
*
* @param columnName 列名
* @param packBean
*/
public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " < :m_s_" + columnName, data);
}
}
/**
* 封装double对象成大于语句
*
* @param columnName 列名
@ -405,6 +417,17 @@ public class DdlPreparedPack {
packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data);
}
}
/**
* 封装double对象成大于等于语句
*
* @param columnName 列名
* @param packBean
*/
public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data);
}
}
/**
* 封装double对象成小于语句
@ -417,6 +440,17 @@ public class DdlPreparedPack {
packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data);
}
}
/**
* 封装double对象成小于等于语句
*
* @param columnName 列名
* @param packBean
*/
public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, data);
}
}
/**
* 封装long或者int的整数对象成equal语句(不等于)

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java
Unescape Escape View File

@ -70,6 +70,10 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
private Integer extractGap;
@Column(name="EXTRACT_CONDITION")
@ApiParam(value="从数据库抽取的条件限制")
private String extractCondition;
public int getSyncFrequencyVal() {
return this.syncFrequency == null ? 0 : this.syncFrequency;
}

14
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed;
import org.springframework.stereotype.Repository;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/18 10:05 AM
* @Description:
**/
@Repository
public interface MesCellFeedRepository extends BaseRepository<MesCellFeed, Long> {
}

15
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn;
import org.springframework.stereotype.Repository;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/18 10:05 AM
* @Description:
**/
@Repository
public interface MesRawPartSnRepository extends BaseRepository<MesRawPartSn, Long> {
}

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

@ -1,10 +1,11 @@
package cn.estsh.i3plus.pojo.mes.pcn.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
import cn.estsh.i3plus.pojo.mes.pcn.bean.*;
import org.apache.commons.lang3.StringUtils;
/**
@ -16,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
**/
public class MesHqlPack {
/**
* 通用查询条件
*
@ -52,6 +54,7 @@ public class MesHqlPack {
/**
* 根据打印模板的模板代码查询模板信息
*
* @param organizeCode
* @param mesLabelTemplate
* @return
@ -63,4 +66,35 @@ public class MesHqlPack {
return packBean;
}
/**
* 获取工作中心下所有的投料数据
* @param mesCellFeed
* @param org
* @return
*/
public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
return packBean;
}
/**
* 获取原材料扫描信息的对应工序BOM
* @param mesProcessBom
* @param mesRawPartSn
* @return
*/
public static DdlPackBean getMesProcessBomRawPartSn(MesProcessBom mesProcessBom, MesRawPartSn mesRawPartSn) {
DdlPackBean packBean = getAllBaseData(mesProcessBom.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(),"isFeed",packBean);
DdlPreparedPack.getStringEqualPack(mesRawPartSn.getPartNo(), "itemPartNo", packBean);
return packBean;
}
}

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

@ -57,7 +57,7 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam("同步方式")
private Integer syncPattern;
@Column(name="SYNC_TYPE")//1\pcn获取mes数据 2、pcn推送数据至mes
@Column(name="SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes
@ApiParam("同步类型")
private Integer syncType;
@ -66,11 +66,14 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value ="上一同步时间")
private String lastSyncTime;
@Column(name="EXTRACT_GAP")
@ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
private Integer extractGap;
@Column(name="EXTRACT_CONDITION")
@ApiParam(value="从数据库抽取的条件限制")
private String extractCondition;
public int getSyncFrequencyVal() {
return this.syncFrequency == null ? 0 : this.syncFrequency;
}

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

@ -730,6 +730,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumEqualPack(mesProcessBom.getIsFeed(), "isFeed", packBean);
DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean);
return packBean;
}
@ -799,13 +800,8 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) {
DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
}
if (StringUtils.isNotEmpty(keyData.getKeyDataName())) {
DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean);
}
DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean);
return packBean;
}

Write Preview
Loading…
Cancel
Save