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

Merge branch 'dev' into test

Browse Source
yun-zuoyi
allen.zhang 6 years ago
parent e24e7ef421 6774943319
commit d714733a27
12 changed files with 235 additions and 59 deletions
Show Stats Download Patch File Download Diff File

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

@ -230,11 +230,11 @@ public class AndonManageQueue extends BaseBean {
@Transient
@ApiParam(value = "平均响应时长", example = "0")
private Long avgSignTime;
private Double avgSignTime;
@Transient
@ApiParam(value = "平均解决时长", example = "0")
private Long avgResolveTime;
private Double avgResolveTime;
@Transient
@ApiParam(value = "查询条件：ANDON状态")
@ -244,6 +244,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "比例", example = "0")
private Double proportion;
@Transient
@ApiParam(value = "总次数（用于报表统计）", example = "0")
private Integer sumCount;
@Column(name = "SEND_FLAG")
@ApiParam(value = "发送标志")
private String sendFlag;
@ -277,45 +281,63 @@ public class AndonManageQueue extends BaseBean {
}
/**
* 原因统计 构造函数
* @param alarmCode
* 原因统计 使用Java内存计算（获取原始数据）
* @param workCenterCode
* @param workCellCode
* @param alarmCode
* @param ecCode
* @param ecNameRdd
* @param emCode
* @param emNameRdd
* @param andonCount
* @param avgSignTime
* @param avgResolveTime
* @param callTime
* @param confirmTime
* @param resetTime
*/
public AndonManageQueue(String workCenterCode, String workCellCode, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, Long avgSignTime, Long avgResolveTime, Long andonCount) {
this.alarmCode = alarmCode;
public AndonManageQueue(String workCenterCode,String workCellCode,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.alarmCode = alarmCode;
this.ecCode = ecCode;
this.ecNameRdd = ecNameRdd;
this.emCode = emCode;
this.emNameRdd = emNameRdd;
this.andonCount = andonCount;
this.avgSignTime = avgSignTime;
this.avgResolveTime = avgResolveTime;
this.callTime = callTime;
this.confirmTime = confirmTime;
this.resetTime = resetTime;
}
/**
* 人员统计 使用Java内存计算（获取原始数据）
* @param resetUser
* @param alarmCode
* @param callTime
* @param confirmTime
* @param resetTime
*/
public AndonManageQueue(String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
this.resetUser = resetUser;
this.alarmCode = alarmCode;
this.callTime = callTime;
this.confirmTime = confirmTime;
this.resetTime = resetTime;
}
/**
* 柏拉图统计 构造函数
* 统计分析柏拉图 使用JAVA内存计算（获取原始数据）
* @param alarmCode
* @param ecCode
* @param ecNameRdd
* @param proportion
* @param andonCount
* @param callTime
* @param confirmTime
* @param resetTime
*/
public AndonManageQueue(String alarmCode, String ecCode, String ecNameRdd, Double proportion, Long andonCount) {
this.alarmCode = alarmCode;
this.ecCode = ecCode;
public AndonManageQueue(String alarmCode,String ecCode, String ecNameRdd, String callTime, String confirmTime,String resetTime){
this.ecNameRdd = ecNameRdd;
this.andonCount = andonCount;
this.proportion = proportion;
this.ecCode = ecCode;
this.alarmCode = alarmCode;
this.callTime = callTime;
this.confirmTime = confirmTime;
this.resetTime = resetTime;
}
public AndonManageQueue() {

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

@ -352,7 +352,7 @@ public class MesEnumUtil {
CREATE(10,"创建"),
PROCESS(20,"加工"),
OFFLINE(30,"上线"),
OFFLINE(30,"下线"),
INSTOCKED(40,"入库"),
SHIPING(50,"发运"),
CLOSE(90,"关闭"),;

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

@ -915,7 +915,7 @@ public class WmsEnumUtil {
private int value;
private String description;
CS_ORDER_TYPE(int value, String description) {
CS_ORDER_TYPE(int value,String description) {
this.value = value;
this.description = description;
}
@ -944,18 +944,20 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_ORDER_STATUS {
CREATE(10, "创建"),
STARTING_INVENTORY(20, "开启盘点"),
IN_INVENTORY(30, "盘点中"),
INVENTORY_FINISH(40, "盘点完成"),
THAWING(50, "已解冻"),
CLOSED(60, "已关闭");
CREATE(10,"CREATE", "创建"),
STARTING_INVENTORY(20,"STARTING_INVENTORY", "开启盘点"),
IN_INVENTORY(30,"IN_INVENTORY", "盘点中"),
INVENTORY_FINISH(40,"INVENTORY_FINISH", "盘点完成"),
THAWING(50,"THAWING", "已解冻"),
CLOSED(60, "CLOSED","已关闭");
private int value;
private String code;
private String description;
CS_ORDER_STATUS(int value, String description) {
CS_ORDER_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -963,6 +965,10 @@ public class WmsEnumUtil {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}

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

@ -466,7 +466,7 @@ public class DdlPreparedPack {
data += "'" + dataArray[i] + "',";
}
}
packBean.addColumnQuery(columnName," and." + columnName + " not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
}
}
@ -479,7 +479,7 @@ public class DdlPreparedPack {
*/
public static void getNotInPack(String data, String columnName, DdlPackBean packBean) {
if (data != null && data.trim().length() > 0) {
packBean.addColumnQuery(columnName," and." + columnName + " not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
}
}
}

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

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
@ -39,6 +40,14 @@ public class MesQueueOrder extends BaseBean {
@ApiParam("客户标识号")
private String custFlagNo;
@Column(name="PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name="PROD_CFG_NAME_RDD")
@ApiParam("产品配置名称")
private String prodCfgNameRdd;
@Column(name="SEQ")
@ApiParam("排序")
private Double seq;
@ -59,6 +68,14 @@ public class MesQueueOrder extends BaseBean {
@ApiParam("区域代码")
private String areaCode;
@Transient
@ApiParam("起始车号")
private String custFlagNoStart;
@Transient
@ApiParam("截至车号")
private String custFlagNoEnd;
public int getStatusVal() {
return this.status == null ? 0 : this.status;
}

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

@ -57,12 +57,15 @@ public class MesQueueOrderDetail extends BaseBean {
@Column(name="WORK_TYPE")
@ApiParam("生产类型")
private String workOrderType;
private String workType;
@Column(name="PRODUCE_CATEGORY")
@ApiParam("产品类型")
private String produceCategory;
@Column(name="PRODUCE_CATEGORY_CODE")
@ApiParam("产品类型代码")
private String produceCategoryCode;
@Column(name="PRODUCE_CATEGORY_NAME_RDD")
@ApiParam("产品类型名称")
private String produceCategoryNameRdd;
public double getSeqVal() {
return this.seq == null ? 0.0d : this.seq;
}

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

@ -0,0 +1,41 @@
package cn.estsh.i3plus.pojo.mes.pcn.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 : dragon.xu
* @CreateDate : 2019-05-22 17:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_POINT")
@Api("工站队列")
public class MesWorkCellPoint extends BaseBean {
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "QUEUE_SEQ")
@ApiParam("队列主表序号")
private String queueSeq;
@Column(name = "QUEUE_DETAIL_SEQ")
@ApiParam("队列明细表序号")
private String queueDetailSeq;
}

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

@ -0,0 +1,59 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description : JIT队列列表Model
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-22 16:34
* @Modify:
**/
@Data
@Api("JIT队列列表Model")
public class QueueOrderModel implements Serializable {
@ApiParam("队列序号")
public Double queueSeq;
@ApiParam("队列明细序号")
public Double queDetailSeq;
@ApiParam("客户标识号")
public String custFlagNo;
@ApiParam("产品配置名称")
public String prodCfgNameRdd;
@ApiParam("产品类型名称")
public String categoryNameRdd;
@ApiParam("产品条码")
public String serialNumber;
@ApiParam("物料号")
public String partNo;
@ApiParam("物料名称")
public String partNameRdd;
@ApiParam("条码状态")
public Integer snStatus;
@ApiParam("生产类型")
public String workType;
@Transient
@ApiParam("显示颜色")
private String color;
public QueueOrderModel() {
}
public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.serialNumber = serialNumber;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.snStatus = snStatus;
this.workType = workType;
}
}

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

@ -48,6 +48,10 @@ public class MesQueueOrder extends BaseBean {
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name="PROD_CFG_NAME_RDD")
@ApiParam("产品配置名称")
private String prodCfgNameRdd;
@Column(name="SEQ")
@ApiParam("排序")
private Double seq;

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

@ -59,10 +59,13 @@ public class MesQueueOrderDetail extends BaseBean {
@ApiParam("生产类型")
private String workOrderType;
@Column(name="PRODUCE_CATEGORY")
@ApiParam("产品类型")
private String produceCategory;
@Column(name="PRODUCE_CATEGORY_CODE")
@ApiParam("产品类型代码")
private String produceCategoryCode;
@Column(name="PRODUCE_CATEGORY_NAME_RDD")
@ApiParam("产品类型名称")
private String produceCategoryNameRdd;
public double getSeqVal() {
return this.seq == null ? 0.0d : this.seq;
}

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

@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
@ -17,30 +18,43 @@ import java.util.List;
@Data
@Api("JIT队列列表Model")
public class QueueOrderModel implements Serializable {
@ApiParam("队列ID")
public Long queueId;
@ApiParam("队列明细ID")
public Long queueDetailId;
@ApiParam("队列序号")
public Integer queueSeq;
public Double queueSeq;
@ApiParam("队列明细序号")
public Integer queDetailSeq;
public Double queDetailSeq;
@ApiParam("客户标识号")
public String custFlagNo;
@ApiParam("产品配置名称")
public String prodCfgName;
public String prodCfgNameRdd;
@ApiParam("产品类型名称")
public String categoryName;
public String categoryNameRdd;
@ApiParam("产品条码")
public String serialNumber;
@ApiParam("物料号")
public String partNo;
@ApiParam("物料ID")
public Long partId;
@ApiParam("物料名称")
public String partNameRdd;
@ApiParam("条码状态")
public Integer snStatus;
@ApiParam("生产类型")
public String workType;
@Transient
@ApiParam("显示颜色")
private String color;
public QueueOrderModel() {
}
public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.serialNumber = serialNumber;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.snStatus = snStatus;
this.workType = workType;
}
}

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

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.SwebEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.sweb.bean.*;
import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
import org.apache.commons.lang3.StringUtils;
@ -71,17 +72,23 @@ public class SwebHqlPack {
return buildHql(swebConfig, result);
}
public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result);
DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result);
// DdlPackBean方法中的 getNumNOEqualPack（） 方法存在问题，所有先用 HqlPack
public static String getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
StringBuffer result = new StringBuffer();
HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.CREATE.getValue(),"itemStatus",result);
HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result);
HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result);
HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result);
// 封装有效状态和删除状态
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(model, result);
HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result);
HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return result.toString();
}
public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {

Write Preview
Loading…
Cancel
Save