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
jiajack 6 years ago
parent 045921beba 8750d8a75b
commit 7c45075e67
10 changed files with 155 additions and 35 deletions
Show Stats Download Patch File Download Diff File

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

@ -245,6 +245,10 @@ public class AndonManageQueue extends BaseBean {
private Double proportion;
@Transient
@ApiParam(value = "当前比例（累加）", example = "0")
private Double currentProportion;
@Transient
@ApiParam(value = "总次数（用于报表统计）", example = "0")
private Integer sumCount;

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

@ -0,0 +1,56 @@
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.Index;
import javax.persistence.Table;
/**
* @Description : 安灯停线配置数据
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-29 17:16
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_STOP_LINE_CFG", indexes = {
@Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"),
@Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"),
@Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"),
@Index(columnList = "ALARM_CODE", name = "ANDON_INDEX_ALARM_CODE")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯队列")
public class AndonStopLineConfig extends BaseBean {
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME_RDD")
@ApiParam(value = "工作中心名称")
private String workCenterNameRdd;
@Column(name = "WORK_CELL_NAME_RDD")
@ApiParam(value = "工作单元名称")
private String workCellNameRdd;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
private String workCellCode;
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonStopLineConfig;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : 对象持久层仓用方法控制（ANDON_停线配置）
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-29 11:05
* @Modify:
**/
@Repository
public interface IAndonStopLineCfgRepository extends BaseRepository<AndonStopLineConfig, Long> {
}

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

@ -53,6 +53,7 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getTagName(), "tagName", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getTagBusinessType(), "tagBusinessType", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getGroupNo(), "groupNo", result);
@ -347,4 +348,21 @@ public class AndonHqlPack {
return result;
}
/**
* 安灯停线配置信息封装
* @param stopLineConfig
* @return
*/
public static DdlPackBean packAndonStopLineCfg(AndonStopLineConfig stopLineConfig) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(stopLineConfig.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(stopLineConfig.getWorkCellCode(), "workCellCode", result);
DdlPreparedPack.getStringEqualPack(stopLineConfig.getWorkCenterCode(), "workCenterCode", result);
getStringBuilderPack(stopLineConfig, result);
return result;
}
}

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

@ -49,14 +49,15 @@ public class AndonEnumUtil {
/**
* 按灯业务状态
* 安灯状态=10，工号 =20 ，读取状态=30
* 安灯状态=10，工号 =20 ，读取状态=30, 停线=40
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_BUSI_FLAG{
ALARM_FLAG("10","安灯呼叫标识"),
USER_CODE("20","用户工号"),
READ_FLAG("30", "安灯读取状态");
READ_FLAG("30", "安灯读取状态"),
STOP_FLAG("40", "停线状态");
private String value;
private String description;
@ -252,4 +253,31 @@ public class AndonEnumUtil {
return tmp;
}
}
/**
* 按灯停线标识
* 1-停止产线，0-启动产线
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOP_LINE_FLAG{
STOP("1","停止产线"),
RESTART("0","启动产线");
private String value;
private String description;
STOP_LINE_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

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

@ -0,0 +1,29 @@
package cn.estsh.i3plus.pojo.mes.pcn.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
/**
* @Description:
* @Reference: Mes 条件封装
* @Author: Crish
* @CreateDate:2019-04-22-14:58
* @Modify:
**/
public class MesHqlPack {
/**
* 通用查询条件
*
* @param organizeCode
* @return
*/
public static DdlPackBean getAllBaseData(String organizeCode) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
return packBean;
}
}

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

@ -42,14 +42,6 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-form</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-mes</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-andon</artifactId>
</dependency>
</dependencies>

23
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/SysOrganizeModel.java
Unescape Escape View File

@ -1,23 +0,0 @@
package cn.estsh.i3plus.pojo.model.andon;
import cn.estsh.i3plus.pojo.andon.bean.MesArea;
import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
import io.swagger.annotations.ApiParam;
import javax.persistence.Transient;
import java.util.List;
public class SysOrganizeModel extends SysOrganize{
@Transient
@ApiParam(value ="子集列表")
private List<MesArea> childTreeList;
public List<MesArea> getChildTreeList() {
return childTreeList;
}
public void setChildTreeList(List<MesArea> childTreeList) {
this.childTreeList = childTreeList;
}
}

2
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -156,7 +156,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
// DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
return buildHql(details, result);
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -1551,7 +1551,7 @@ public class WmsHqlPack {
*/
public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(scriptPersistence.getScriptNo(), "scriptNo", packBean);
DdlPreparedPack.getStringLikerPack(scriptPersistence.getScriptNo(), "scriptNo", packBean);
DdlPreparedPack.getStringRightLikerPack(scriptPersistence.getScriptName(), "scriptName", packBean);
DdlPreparedPack.getNumEqualPack(scriptPersistence.getScriptType(), "scriptType", packBean);
DdlPreparedPack.getNumEqualPack(scriptPersistence.getLanguageType(), "languageType", packBean);

Write Preview
Loading…
Cancel
Save