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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
crish 6 years ago
parent d6221c39ae e8238796c3
commit 8c443c3afb
11 changed files with 81 additions and 53 deletions
Show Stats Download Patch File Download Diff File

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

@ -181,7 +181,7 @@ public class AndonManageQueue extends BaseBean {
@Column(name = "EC_DESC")
@ApiParam(value = "事件具体原因")
private String ec_desc;
private String ecDesc;
@Column(name = "EM_CODE")
@ApiParam(value = "事件方法代码")

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

@ -181,7 +181,7 @@ public class AndonManageRecord extends BaseBean {
@Column(name = "EC_DESC")
@ApiParam(value = "事件具体原因")
private String ec_desc;
private String ecDesc;
@Column(name = "EM_CODE")
@ApiParam(value = "事件方法代码")

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : 对象持久层仓用方法控制（ANDON_事件处理方法）
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2019-05-14 11:34
* @Modify:
**/
@Repository
public interface IAndonEventMethodRepository extends BaseRepository<AndonEventMethod, Long> {
}

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
import cn.estsh.i3plus.pojo.andon.bean.AndonPLC;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import org.apache.commons.lang3.StringUtils;
@ -53,7 +54,7 @@ public class AndonHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCellCode", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getNodeIP(), "nodeIP", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result);
@ -61,6 +62,7 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonPLC.getGroupNo(), "groupNo", result);
getStringBuilderPack(andonPLC, result);
return result;
@ -137,6 +139,20 @@ public class AndonHqlPack {
}
/**
* 按条件查询ANDON事件处理方法
* @param andonEventMethod
* @return
*/
public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(andonEventMethod, result);
return result;
}
/**
* 按条件查询ANDON事件原因
* @param andonEventCause
* @return
@ -155,13 +171,15 @@ public class AndonHqlPack {
* @param andonManageQueue
* @return
*/
public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue){
public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getInPackArray(obj, "statusCode", result);
getStringBuilderPack(andonManageQueue, result);
return result;

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

@ -150,15 +150,14 @@ public class AndonEnumUtil {
/**
* 优先级别
* 1 - 一级，2 - 二级，3 - 三级，4 - 四级
* 10 - 一级，20 - 二级，30 - 三级
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_PRIORITY{
FIRST(1,"一级"),
SECOND(2,"二级"),
THIRD(3,"三级"),
FOURTH(4,"四级");
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级");
private int value;
private String description;
@ -186,4 +185,33 @@ public class AndonEnumUtil {
return tmp;
}
}
/**
* ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_CODE{
PART("MM","物料"),
QUALITY("QM","质量"),
EQUIP("EQ","设备"),
PROCESS("GY","工艺"),
CHECK("JC","检测");
private String value;
private String description;
ALARM_CODE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

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

@ -578,9 +578,9 @@ public class MesEnumUtil {
public enum PROD_ORG_LEVEL{
LEVEL_ONE(1,"一级目录"),
LEVEL_TWO(1,"二级目录"),
LEVEL_THREE(1,"三级目录"),
LEVEL_FOUR(1,"四级目录");
LEVEL_TWO(2,"二级目录"),
LEVEL_THREE(3,"三级目录"),
LEVEL_FOUR(4,"四级目录");
private int value;
private String description;

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

@ -14,17 +14,4 @@ public class AndonResultBean {
@ApiParam("处理结果")
private String result;
public AndonResultBean(boolean success, String msg) {
super();
this.success = success;
this.msg = msg;
}
public AndonResultBean(boolean success, String msg, String result) {
super();
this.success = success;
this.msg = msg;
this.result = result;
}
}

5
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java
Unescape Escape View File

@ -66,11 +66,8 @@ public class SwebPurchaseOrderDetails extends BaseBean {
@Column(name = "UNIT")
private String unit;
/**
* 不冗余主表数据
*/
@ApiParam(value = "行项目状态", example = "1")
@Transient
@Column(name = "ITEM_STATUS")
private Integer itemStatus;
@Column(name = "BOX_QTY")

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

@ -115,16 +115,15 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
DdlPreparedPack.getStringEqualPack(details.getExpectedTime(), "expectedTime", result);
return buildHql(details, result);
}
public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
DdlPreparedPack.getStringEqualPack(details.getExpectedTime(), "expectedTime", result);
return buildHql(details, result);
}
}

25
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
Unescape Escape View File

@ -52,42 +52,25 @@ public class WmsActionGroup extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long initAmId;
// @Transient
// @ApiParam(value = "初始化组件名称")
// private String initAmName;
@Column(name = "DETAILS_AM_ID")
@ApiParam(value = "明细处理组件编号", example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long detailsAmId;
// @Transient
// @ApiParam(value = "明细处理组件名称")
// private String detailsAmName;
@Column(name = "SUBMIT_AM_ID")
@ApiParam(value = "提交组件编号", example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long submitAmId;
// @Transient
// @ApiParam(value = "提交组件名称")
// private String submitAmName;
@Column(name = "END_AM_ID")
@ApiParam(value = "结束组件编号", example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long endAmId;
//
// @Transient
// @ApiParam(value = "结束组件名称")
// private String endAmName;
// 1=true, 2 = false
@Column(name = "AUTO_INIT")
@ApiParam(value = "任务自动初始化", example = "0")
private Integer autoInit;
@Column(name = "POSITION")
@ApiParam(value = "GOJS位置")
private String position;
public Long getInitAmId() {
if (initAmId != null) {
return initAmId.longValue();

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

@ -27,7 +27,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ACTION_GROUP_DETAILS")
@Table(name = "WMS_ACTION_GROUP_DETAILS")
@Api("作业流程明细")
public class WmsActionGroupDetails extends BaseBean {

Write Preview
Loading…
Cancel
Save