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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
WYnneaoapc 6 years ago
parent 4654fad2bd e79ff6946a
commit 20843e06a6
15 changed files with 366 additions and 108 deletions
Show Stats Download Patch File Download Diff File

76
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java
Unescape Escape View File

@ -0,0 +1,76 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
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;
/**
* @Description :安灯广播
* @Reference :
* @Author : crish
* @CreateDate : 2019-10-11
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_BRODCAST")
@Api("安灯广播")
public class AndonBroadCast extends BaseBean {
@Column(name="DEVICE_NUM")
@ApiParam("广播设备编号")
private String targetIds;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name="DEVICE_DEC")
@ApiParam("广播设备名称")
private String deviceDec;
@Column(name="DEVICE_IP")
@ApiParam("广播设备ip")
private String deviceIp;
@Column(name="PLAY_INTERVAL")
@ApiParam("播放间隔")
private Integer playInterval = 0;
@Column(name="PLAY_PRIORITY")
@ApiParam("播放优先级")
private Integer playPriority = 500;
@Column(name="VOLUME")
@ApiParam("播放音量")
private Integer volume;
@Column(name="TTS_NAME")
@ApiParam("广播语音引擎")
private String voiceEngine;
@Column(name="TEXT_ENCODE")
@ApiParam("广播内容编码格式")
private String textEncode = "UTF-8";
@Column(name="PLAY_SPEED")
@ApiParam("播放语速")
private Integer playSpeed = 0;
@Column(name="PLAY_TIME")
@ApiParam("播放循环次数")
private Integer playTime = 1;
}

45
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java
Unescape Escape View File

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
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.Transient;
import java.util.List;
/**
* @Description :广播配置
* @Reference :
* @Author : crish
* @CreateDate : 2019-10-11
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_BRODCAST_CFG")
@Api("生产区域")
public class AndonBroadCastCfg extends BaseBean {
@Column(name="ALARM_CODE")
@ApiParam("安灯类型代码")
private String alarmCode;
@Column(name="DEVICE_NUM")
@ApiParam("广播设备编号")
private String targetIds;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
}

2
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java
Unescape Escape View File

@ -25,7 +25,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_MANAGE_ATTACH")
@Api(value="安灯任务附属信息")
@Api(value="安灯附属表")
public class AndonQueueAttach extends BaseBean {
@Column(name="PROD_INFO")

17
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonBroadCastCfgRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCastCfg;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : 安灯广播配置持久层
* @Reference :
* @Author : crish
* @CreateDate : 2019-10-11
* @Modify:
**/
@Repository
public interface IAndonBroadCastCfgRepository extends BaseRepository<AndonBroadCastCfg, Long> {
}

17
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonBroadCastRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCast;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : 安灯广播持久层
* @Reference :
* @Author : crish
* @CreateDate : 2019-10-11
* @Modify:
**/
@Repository
public interface IAndonBroadCastRepository extends BaseRepository<AndonBroadCast, Long> {
}

30
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -80,6 +80,36 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getEpmCode(), "epmCode", packBean);
return packBean;
}
/**
* 广播条件查询
* @param andonBroadCast
* @return
*/
public static DdlPackBean getAndonBroadCast(AndonBroadCast andonBroadCast) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean);
DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean);
return packBean;
}
/**
* 广播配置条件查询
* @param andonBroadCastCfg
* @return
*/
public static DdlPackBean getAndonBroadCastCfg(AndonBroadCastCfg andonBroadCastCfg) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getTargetIds(), "targetIds", packBean);
DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean);
return packBean;
}
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/

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

@ -11,6 +11,54 @@ import org.apache.commons.lang3.StringUtils;
* @Modify:
**/
public class AndonEnumUtil {
/**
* 语音播报类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_VOICE_TYPE{
MIC_EN("10","Microsoft Anna - English (United States)"),
MIC_LILI("20","Microsoft Lili - Chinese (China)"),
AI_MALE("30","Aisound_male"),
AI_FEMALE("40","Aisound_female"),
MIC_ZIRE_EN("50","Microsoft Zira Desktop - English (United States)"),
MIC_HUI_CH("60","Microsoft Huihui Desktop - Chinese (Simplified)");
private String value;
private String description;
ANDON_VOICE_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 标准处理 = 10，自处理 = 20
@ -408,6 +456,50 @@ public class AndonEnumUtil {
return tmp;
}
}
/**
* 安灯操作动作来源
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_OPERATION_SOURCE{
PHYSICAL("10","物理操作"),
SOFT("20","软件操作");
private String value;
private String description;
ALARM_OPERATION_SOURCE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = "";
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 安灯来源

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

@ -600,7 +600,8 @@ public class WmsEnumUtil {
QC(220, "QC", "QC"),
AMPR(230, "AMPR", "AMPR"),
FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
VDA_REPORT(250, "VDA_REPORT", "VDA生产报工");
VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库");
private int value;

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
Unescape Escape View File

@ -215,7 +215,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
List<T> findByProperty(String propertyName, Object value);
List<Map<String,Object>> findByWasProperty(String[] propertyNames, Object[] values);
List<T> findByProperty(String[] propertyNames, Object[] values);

35
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -411,44 +411,11 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
return query.setFirstResult(offset).setMaxResults(pageSize).getResultList();
}
@Override
public List<T> findByProperty(String propertyName, Object value) {
String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName;
return entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList();
}
@Override
public List<Map<String,Object>> findByWasProperty(String[] propertyNames, Object[] values) {
if (propertyNames.length != values.length) {
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append(" SELECT \n" +
" a.sn_status AS snStatus,\n" +
" a.wh_no AS whNo,\n" +
" a.locate_no AS locateNo,\n" +
" a.part_no AS partNo,\n" +
" a.part_name_rdd AS partNameRdd,\n" +
" a.lot_no AS lotNo,\n" +
" CAST(IFNULL(SUM(a.qty), 0) AS DOUBLE) AS qty \n" +
"FROM\n" +
" `wms_stock_sn` a ");
int size = propertyNames.length;
if (size > 0) {
queryString.append("where 1=1 and a.sn_status in ('"+ WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue()+"', '"+WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue()+"','"+WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue()+"','"+WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue()+"') ");
}
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryString.append(" and a." + StringCastUtils.upperCharToUnderLine(propertyNames[i]) + "= '" + values[i]+"'");
}
}
queryString.append(" group by a.lot_no,a.date_code");
return entityManager.createNativeQuery(queryString.toString()).unwrap(SQLQuery.class).setResultTransformer(
Transformers.ALIAS_TO_ENTITY_MAP).getResultList();
}
@Override
public List<T> findByProperty(String[] propertyNames, Object[] values) {
if(propertyNames.length != values.length){
@ -1583,6 +1550,4 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
return num;
}
}

29
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringCastUtils.java
Unescape Escape View File

@ -7,30 +7,21 @@ import java.util.regex.Pattern;
* 字符串转大写换成下滑线加小写
*/
public class StringCastUtils {
public static String upperCharToUnderLine(String param) {
Pattern p= Pattern.compile("[A-Z]");
if(param==null ||param.equals("")){
return "";
}
StringBuilder builder=new StringBuilder(param);
Matcher mc=p.matcher(param);
int i=0;
while (mc.find()) {
System.out.println(builder.toString());
System.out.println("mc.start():" + mc.start() + ", i: " + i);
System.out.println("mc.end():" + mc.start() + ", i: " + i);
builder.replace(mc.start()+i, mc.end()+i, "_"+mc.group().toLowerCase());
i++;
Pattern p= Pattern.compile("[A-Z]");
if(param==null ||param.equals("")){
return "";
}
StringBuilder builder=new StringBuilder(param);
Matcher mc=p.matcher(param);
int i=0;
while (mc.find()) {
builder.replace(mc.start()+i, mc.end()+i, "_"+mc.group().toLowerCase());
i++;
}
if('_' == builder.charAt(0)){
builder.deleteCharAt(0);
}
System.out.println(builder.toString());
return builder.toString();
}
// public static void main(String[] args) {
// upperCharToUnderLine("snStatus");
// }
}

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

@ -26,7 +26,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_ACTION")
@Api("系统业务动作")
@Api("mes系统业务动作")
public class MesAction extends BaseBean {
@Column(name="ACTION_CODE")
@ApiParam("动作代码")

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

@ -79,6 +79,10 @@ public class MesEquipment extends BaseBean {
@ApiParam("连接类型")
private Integer connectType;
@Column(name="MEMO")
@ApiParam("备注")
private String memo;
@Transient
@ApiParam(value ="名称")
private String name;

59
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
Unescape Escape View File

@ -31,6 +31,40 @@ public class MesEquipmentModel implements Serializable {
@ApiParam(value ="设备工位关联ID")
private Long wcId;
@ApiParam(value ="设备&工位")
private String equipmentNameAndworkCellName;
@ApiParam("设备类型")
private Integer equipmentType;
@ApiParam(value ="设备类别")
private String equipmentCategory;
@ApiParam(value ="备注")
private String memo;
@ApiParam(value ="设备型号")
private String equipmentModel;
@ApiParam(value ="设备规格")
private String equipmentSpec;
@ApiParam("制造商")
private String equipmentMaker;
@ApiParam("出厂日期")
private String releaseDate;
@ApiParam("接收日期")
private String receiveDate;
@ApiParam("启用日期")
private String enableDate;
@ApiParam("连接类型")
private Integer connectType;
public MesEquipmentModel() {
}
@ -46,12 +80,35 @@ public class MesEquipmentModel implements Serializable {
this.areaCode = areaCode;
}
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) {
public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) {
this.id = id;
this.equipmentNameAndworkCellName = equipmentNameAndworkCellName;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.status = status;
this.areaCode = areaCode;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
}
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.status = status;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.areaCode = areaCode;
this.equipmentType = equipmentType;
this.equipmentCategory = equipmentCategory;
this.memo = memo;
this.equipmentModel = equipmentModel;
this.equipmentSpec = equipmentSpec;
this.equipmentMaker = equipmentMaker;
this.releaseDate = releaseDate;
this.receiveDate = receiveDate;
this.enableDate = enableDate;
this.connectType = connectType;
}
}

61
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java
Unescape Escape View File

@ -1,79 +1,42 @@
package cn.estsh.i3plus.pojo.wms.bean.iotio;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
@Data
public class WmsCSOrderDetailsModel implements Serializable {
/******
*
* 工厂代码
*/
@ApiParam("工厂代码")
public String organizeCode;
/******
*
* 库位编码
*/
@ApiParam("库位编码")
public String locateNo;
/******
*
* 订单编码
*/
@ApiParam("订单编号")
public String orderNo;
/******
*
* 物料代码
*/
@ApiParam("物料代码")
public String partNo;
/******
*
* 物料名称
*/
@ApiParam("物料名称")
public String partNameRdd;
/******
*
* 冻结数量
*/
@ApiParam("冻结数量")
public String qty;
/******
*
* 实盘数量
*/
@ApiParam("实盘数量")
public String factQty;
/******
*
* 条码
*/
@ApiParam("条码编号")
public String sn;
/******
*
* 仓库编码
*/
@ApiParam("仓库编码")
public String whNo;
/******
*
* 区域编码
*/
@ApiParam("区域编码")
public String zoneNo;
/******
*
* 状态
*/
@ApiParam("状态")
public String wmStatus;
}

Write Preview
Loading…
Cancel
Save