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 038484e7ac 099a58a14d
commit d6c7e39989
8 changed files with 82 additions and 44 deletions
Show Stats Download Patch File Download Diff File

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

@ -1053,9 +1053,10 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_RECEIVER_TYPE {
INTERNAL(1, "内部人员接收"),
EXTERNAL(2, "外部人员接收"),
URGENT(3, "紧急联系人接收");
INTERNAL(1, "内部人员"),
EXTERNAL(2, "外部人员"),
URGENT(3, "紧急联系人"),
SUPPLIER(4, "供应商");
private int value;
private String description;

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

@ -38,9 +38,9 @@ public class BfButton extends BaseBean {
@ApiParam(value = "触发方式")
private Integer triggerMode;
public Integer getTriggerMode() {
public int getTriggerModeVal() {
if (triggerMode == null) {
return null;
return 0;
} else {
return triggerMode.intValue();
}

6
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java
Unescape Escape View File

@ -13,6 +13,8 @@ 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 :
@ -46,4 +48,8 @@ public class BfMethod extends BaseBean {
@Column(name="METHOD_DESCRIPTION")
@ApiParam(value ="功能描述")
private String methodDescription;
@Transient
@ApiParam(value ="表单功能自定义按钮")
private List<BfButton> bfButtonList;
}

6
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
Unescape Escape View File

@ -13,6 +13,8 @@ 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 :
@ -57,5 +59,7 @@ public class BfMethodDetail extends BaseBean {
@ApiParam(value ="表单元素名称")
private String elementNameRdd;
@Transient
@ApiParam(value ="表单功能自定义按钮")
private List<BfButton> bfButtonList;
}

8
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java
Unescape Escape View File

@ -44,6 +44,14 @@ public class BfRefButtonMethod extends BaseBean {
@ApiParam(value ="按钮位置类型")
private Integer buttonPositionType;
public int getButtonPositionTypeVal(){
if(buttonId == null){
return 0;
} else {
return buttonPositionType.intValue();
}
}
@Column(name="BUTTON_POSITION_REF_ID")
@ApiParam(value ="按钮位置关联id")
@JsonSerialize(using = ToStringSerializer.class)

17
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
Unescape Escape View File

@ -297,4 +297,21 @@ public final class FormHqlPack {
return ddlPackBean;
}
/**
* 元素信息复杂查询
* @param bfElement 查询条件
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfElement(BfElement bfElement){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(bfElement.getElementName(), "elementName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfElement.getElementCode(), "elementCode", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfElement.getDataObjectId(), "dataObjectId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfElement.getElementType(), "elementType", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfElement.getIsDeleted(), "isDeleted", ddlPackBean);
return ddlPackBean;
}
}

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

@ -145,14 +145,14 @@ public class MesHqlPack {
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesWorkOrder.getStartTimeStart(),
mesWorkOrder.getStartTimeEnd(),
"startTime", packBean, true);
DdlPreparedPack.timeBuilder(
mesWorkOrder.getEndTimeStart(),
mesWorkOrder.getEndTimeEnd(),
"endTime", packBean, true);
// DdlPreparedPack.timeBuilder(
// mesWorkOrder.getStartTimeStart(),
// mesWorkOrder.getStartTimeEnd(),
// "startTime", packBean, true);
// DdlPreparedPack.timeBuilder(
// mesWorkOrder.getEndTimeStart(),
// mesWorkOrder.getEndTimeEnd(),
// "endTime", packBean, true);
DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean);
return packBean;

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

@ -101,15 +101,15 @@ public class WmsHqlPack {
* @param wmsDocMovementDetails
* @return
*/
public static String packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
HqlPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
getStringBuilderPack(wmsDocMovementDetails, result);
return result.toString();
return result;
}
/**
@ -828,6 +828,7 @@ public class WmsHqlPack {
/**
* 根据条件查询单据锁定封装类
*
* @return 单据锁定信息
*/
public static DdlPackBean packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) {
@ -1032,6 +1033,7 @@ public class WmsHqlPack {
/**
* 针对质检查询库存移动条码条件封装(特殊处理)
*
* @param sn
* @return
*/
@ -1572,12 +1574,12 @@ public class WmsHqlPack {
* @param wmsTaskCreateLog
* @return
*/
public static String packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result);
HqlPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result);
public static DdlPackBean packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result);
DdlPreparedPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result);
getStringBuilderPack(wmsTaskCreateLog, result);
return result.toString();
return result;
}
/**
@ -1625,14 +1627,14 @@ public class WmsHqlPack {
* @param wmsDocMovementSn
* @return
*/
public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
public static DdlPackBean packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
getStringBuilderPack(wmsDocMovementSn, result);
return result.toString();
return result;
}
/**
@ -1641,14 +1643,14 @@ public class WmsHqlPack {
* @param details
* @return
*/
public static String packHqlWmsDocMovementDetails(WmsDocMovementDetails details) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(details.getPartNo(), "partNo", result);
public static DdlPackBean packHqlWmsDocMovementDetails(WmsDocMovementDetails details) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
getStringBuilderPack(details, result);
return result.toString();
return result;
}
/**
@ -1697,8 +1699,8 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "",
WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue() + ""), "orderStatus", result);
DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() ,
WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);

Write Preview
Loading…
Cancel
Save