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
yiming.gu 6 years ago
parent c60dd62f32 251ce84d73
commit 2ac8437b76
7 changed files with 133 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -88,12 +88,23 @@ public class AndonManageQueue extends BaseBean {
private Integer priorityLevel;
@Column(name="CALL_TIME",updatable = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "呼叫时间")
@AnnoOutputColumn(hidden = true)
public String callTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="呼叫时间，查询开始时间")
public String callTimeStart;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="呼叫时间，查询结束时间")
public String callTimeEnd;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String callTimeStr;
@ -153,7 +164,7 @@ public class AndonManageQueue extends BaseBean {
@Column(name = "SC_RESPONSE_CODE")
@ApiParam(value = "转呼响应方式")
private String scObjectCode;
private String scResponseCode;
@Column(name = "SC_RP_LEVEL")
@ApiParam(value = "转呼通知等级")
@ -207,6 +218,18 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "停机具体原因")
private String haltDesc;
@Transient
@ApiParam(value = "异常时长", example = "0")
private Long execptionTime;
@Transient
@ApiParam(value = "响应时长", example = "0")
private Long signTime;
@Column(name = "SEND_FLAG")
@ApiParam(value = "发送标志")
private String sendFlag;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@ -153,7 +153,7 @@ public class AndonManageRecord extends BaseBean {
@Column(name = "SC_RESPONSE_CODE")
@ApiParam(value = "转呼响应方式")
private String scObjectCode;
private String scResponseCode;
@Column(name = "SC_RP_LEVEL")
@ApiParam(value = "转呼通知等级")
@ -216,4 +216,11 @@ public class AndonManageRecord extends BaseBean {
public Integer getPriorityLevel() {
return this.priorityLevel == null ? 0 : this.priorityLevel;
}
public AndonManageRecord() {
}
public AndonManageRecord(String andonOrderNo) {
this.andonOrderNo = andonOrderNo;
}
}

53
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.*;
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;
@ -170,10 +171,44 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result);
DdlPreparedPack.getInPackArray(obj, "statusCode", result);
getStringBuilderPack(andonManageQueue, result);
if(andonManageQueue.getCallTimeStart() != null || andonManageQueue.getCallTimeEnd() != null){
DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
}
// 根据优先级倒序，序号升序排序
DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
new String[]{"priorityLevel", "seq"}, result);
return result;
}
/**
* 按条件查询按灯记录信息
* @param andonManageRecord
* @return
*/
public static DdlPackBean packHqlAndonManageRecord(AndonManageRecord andonManageRecord, Object[] obj){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(), "andonOrderNo", result);
DdlPreparedPack.getStringEqualPack(andonManageRecord.getWorkCellCode(), "workCellCode", result);
DdlPreparedPack.getStringEqualPack(andonManageRecord.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(andonManageRecord.getEquipmentCode(), "equipmentCode", result);
DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(), "actionCode", result);
DdlPreparedPack.getInPackArray(obj, "statusCode", result);
getStringBuilderPack(andonManageRecord, result);
// 根据优先级倒序，序号升序排序
DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
new String[]{"priorityLevel", "seq"}, result);
return result;
}
@ -272,4 +307,22 @@ public class AndonHqlPack {
return packBean;
}
/**
* 通知配置信息封装
* @param responseCfg
* @return
*/
public static DdlPackBean packAndonAlarmResponseCfg(AndonAlarmResponseCfg responseCfg) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result);
DdlPreparedPack.getNumNOEqualPack(String.valueOf(AndonEnumUtil.ALARM_PRIORITY.FIRST.getValue()),
"rpLevel", result);
getStringBuilderPack(responseCfg, result);
return result;
}
}

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

@ -2331,4 +2331,38 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 是否条码管控（用于物料）
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IS_SN_CONTROL {
SN_CONTROL(1, "条码管控"), NOT_SN_CONTROL(2, "非条码管控");
private int value;
private String description;
IS_SN_CONTROL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -55,7 +55,7 @@ public class SysLocaleResource extends BaseBean {
@ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档")
private String resourceKey;
@Column(name="resource_value")
@Column(name="resource_value",columnDefinition="TEXT")
@ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取")
private String resourceValue;

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

@ -50,10 +50,6 @@ public class SwebPurchaseOrder extends BaseBean {
@Column(name = "ORDER_TYPE")
private Integer orderType;
@ApiParam(value = "订单状态", example = "1")
@Column(name = "ORDER_STATUS")
private Integer orderStatus;
@Column(name = "PARENT_PACKAGE_NO")
@ApiParam("上级包装编号")
private String parentPackageNo;

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.sweb.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.SwebEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.sweb.bean.*;
import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
@ -46,7 +47,6 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result);
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
@ -77,7 +77,6 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result);
DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result);
DdlPreparedPack.timeBuilder(model.getExpectedTimeStart(), model.getExpectedTimeEnd(), "expectedTime", result, false);
// 封装有效状态和删除状态
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
@ -139,4 +138,16 @@ public class SwebHqlPack {
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
return buildHql(details, result);
}
/**
* 判断订单详情表是否有非新建状态的订单 where sql
* @param details
* @return
*/
public static DdlPackBean getPODetailsNotCreateStatusWhereHql(SwebPurchaseOrderDetails details) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumNOEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
return buildHql(details, result);
}
}

Write Preview
Loading…
Cancel
Save