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
袁津哲 5 years ago
parent 533d8e55e8 1a5f3e7325
commit 9518628c12
22 changed files with 467 additions and 109 deletions
Show Stats Download Patch File Download Diff File

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

@ -1158,7 +1158,7 @@ public class BlockFormEnumUtil {
private Double getPropertyVirtualDoubleAdd(Object ... objs){
if(objs != null && objs.length > 0){
Double result = new Double(0);
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
@ -1175,7 +1175,7 @@ public class BlockFormEnumUtil {
private Double getPropertyVirtualDoubleLess(Object ... objs){
if(objs != null && objs.length > 0){
Double result = new Double(0);
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
@ -1192,7 +1192,7 @@ public class BlockFormEnumUtil {
private Double getPropertyVirtualDoubleMake(Object ... objs){
if(objs != null && objs.length > 0){
Double result = new Double(0);
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
@ -1209,7 +1209,7 @@ public class BlockFormEnumUtil {
private Double getPropertyVirtualDoubleDivision(Object ... objs){
if(objs != null && objs.length > 0){
Double result = new Double(0);
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
@ -1235,7 +1235,8 @@ public class BlockFormEnumUtil {
SQL(10, "SQL", "SQL脚本"),
CLASS_METHOD(20, "ClassMethod", "类方法"),
SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"),
SCRIPT(40, "Script", "脚本");
SCRIPT(40, "Script", "脚本"),
URL(50, "URL", "网址");
private int value;
private String code;
@ -1668,7 +1669,8 @@ public class BlockFormEnumUtil {
DIALOG(10, "DIALOG", "弹出窗口"),
NEW_WINDOW(20, "NEW_WINDOW", "新开窗口"),
SQL(30, "SQL", "执行SQL"),
CLASS_METHOD(40, "CLASS_METHOD", "执行类方法");
CLASS_METHOD(40, "CLASS_METHOD", "执行类方法"),
URL(50, "URL", "网址");
private int value;
private String name;
@ -1928,8 +1930,8 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ELEMENT_TREE_DIRECTION {
horizontal(1, "horizontal", "横向"),
vertical(2, "vertical", "竖向");
HORIZONTAL(1, "horizontal", "横向"),
VERTICAL(2, "vertical", "竖向");
private int value;
private String code;

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

@ -867,4 +867,53 @@ public class BlockSoftSwitchEnumUtil {
return null;
}
}
/**
* 长数据关联数据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum REF_DATA_TYPE {
SUIT_MESSAGE(10, "适配信息"),
REQUEST_ORGIN_PARAM(20, "请求原始参数"),
ORIGINAL_MESSAGE(30, "原始报文"),
CONVERTED_MESSAGE(40, "转换报文");
private int value;
private String description;
private REF_DATA_TYPE (int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static REF_DATA_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
}

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

@ -11,6 +11,41 @@ import com.fasterxml.jackson.annotation.JsonFormat;
**/
public class MesEnumUtil {
/**
* 作业程序组件类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TYPE {
MONITOR_MODULE(10, "监听组件"),
REVEAL_MODULE(10, "展示组件"),
BUTTON_MODULE(30, "按钮组件");
private int value;
private String description;
WORK_MODULE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 排序方式

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

@ -13,6 +13,42 @@ import org.apache.commons.lang3.StringUtils;
public class MesPcnEnumUtil {
/**
* 作业程序组件类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TYPE {
MONITOR_MODULE(10, "监听组件"),
REVEAL_MODULE(10, "展示组件"),
BUTTON_MODULE(30, "按钮组件");
private int value;
private String description;
WORK_MODULE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 监听任务明细-采集数据方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -2023,7 +2059,7 @@ public class MesPcnEnumUtil {
}
/**
* MesPartCategory实体对应的categoryType值 条码表条码质量状态
* MesPartCategory实体对应的categoryType值
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_CATEGORY_TYPE {
@ -2323,8 +2359,7 @@ public class MesPcnEnumUtil {
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
CLOSE(90, "关闭"),
;
CLOSE(90, "关闭");
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

@ -46,6 +46,10 @@ public class BfButton extends BaseBean {
}
}
@Column(name = "IS_REQUIRED_DATA")
@ApiParam(value = "是必填数据")
private Integer isRequiredData;
// 关联表单功能表id
@Column(name = "METHOD_ID")
@ApiParam(value = "表单功能id")

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

@ -10,7 +10,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import java.util.List;
@ -89,6 +88,10 @@ public class BfMenu extends BaseBean {
@ApiParam(value ="功能名称")
private String methodNameRdd;
@Column(name="SOFT_TYPE")
@ApiParam(value ="所属模块")
private Integer softType;
@Column(name = "MENU_STATUS")
@ApiParam(value = "菜单状态")
private Integer menuStatus;
@ -96,8 +99,4 @@ public class BfMenu extends BaseBean {
@Transient
@ApiParam(value = "菜单子集")
private List<BfMenu> bfMenuList;
@Transient
@ApiParam(value = "菜单父级")
private List<BfMenu> parentBfMenuList;
}

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

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :按钮功能关系
@ -61,4 +62,10 @@ public class BfRefButtonMethod extends BaseBean {
@ApiParam(value ="按钮位置关联名称")
private String buttonPositionRefNameRdd;
/**
* 关联按钮
*/
@Transient
private BfButton bfbutton;
}

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

@ -39,12 +39,12 @@ public final class FormHqlPack {
* @param params 参数
* @return hql
*/
public static String packHqlIds(String columnName, Long[] params) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlIds(String columnName, Long[] params) {
DdlPackBean result = DdlPackBean.getDdlPackBean();
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(StringUtils.join(params, ","), columnName, result);
return result.toString();
DdlPreparedPack.getInPack(StringUtils.join(params, ","), columnName, result);
return result;
}
/**
@ -69,11 +69,11 @@ public final class FormHqlPack {
* @param isDeleted 数据状态
* @return hql
*/
public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) {
StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
public static DdlPackBean packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) {
DdlPackBean result = FormHqlPack.packHqlIds(columnName, params);
HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
return result.toString();
DdlPreparedPack.getNumEqualPack(isDeleted, "isDeleted", result);
return result;
}
/**
@ -81,13 +81,13 @@ public final class FormHqlPack {
* @param bfLayout 表单布局
* @return hql
*/
public static String packHqlBfLayout(BfLayout bfLayout) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlBfLayout(BfLayout bfLayout) {
DdlPackBean result = DdlPackBean.getDdlPackBean(bfLayout);
HqlPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result);
HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
DdlPreparedPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result);
DdlPreparedPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
return result.toString();
return result;
}
/**
@ -95,14 +95,13 @@ public final class FormHqlPack {
* @param bfLayoutRow 表单布局
* @return hql
*/
public static String packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) {
DdlPackBean result =DdlPackBean.getDdlPackBean(bfLayoutRow);
HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result);
HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result);
DdlPreparedPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result);
DdlPreparedPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result);
result.append(bfLayoutRow.orderBy());
return result.toString();
return result;
}
/**
@ -110,14 +109,13 @@ public final class FormHqlPack {
* @param bfLayoutColumn 表单布局行
* @return hql
*/
public static String packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) {
DdlPackBean result = DdlPackBean.getDdlPackBean(bfLayoutColumn);
HqlPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result);
HqlPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result);
DdlPreparedPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result);
DdlPreparedPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result);
result.append(bfLayoutColumn.orderBy());
return result.toString();
return result;
}
/**
@ -126,13 +124,13 @@ public final class FormHqlPack {
* @return hql
*/
public static DdlPackBean packHqlBfMenu(BfMenu bfMenu) {
DdlPackBean result = new DdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(bfMenu);
DdlPreparedPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result);
DdlPreparedPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result);
DdlPreparedPack.getNumEqualPack(bfMenu.getMenuStatus(), "menuStatus", result);
DdlPreparedPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result);
result.setOrderByStr(bfMenu.orderBy());
DdlPreparedPack.getNumEqualPack(bfMenu.getSoftType(), "softType", result);
return result;
}
@ -143,12 +141,11 @@ public final class FormHqlPack {
* @return hql
*/
public static DdlPackBean packHqlBfMethod(BfMethod bfMethod) {
DdlPackBean result = new DdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(bfMethod);
DdlPreparedPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result);
DdlPreparedPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result);
DdlPreparedPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result);
result.setOrderByStr(bfMethod.orderBy());
return result;
}
@ -159,12 +156,11 @@ public final class FormHqlPack {
* @return hql
*/
public static DdlPackBean packHqlBfMethodDetail(BfMethodDetail bfMethodDetail) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetail);
DdlPreparedPack.getStringLikerPack(bfMethodDetail.getMethodDetailName(), "methodDetailName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfMethodDetail.getMethodId(), "layoutId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfMethodDetail.getIsDeleted(), "isDeleted", ddlPackBean);
ddlPackBean.setOrderByStr(bfMethodDetail.orderBy());
return ddlPackBean;
}
@ -175,14 +171,13 @@ public final class FormHqlPack {
* @return hql
*/
public static DdlPackBean packHqlBfIntercept(BfIntercept bfIntercept) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfIntercept);
DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfIntercept.getExecuteContent(),"executeContent",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
ddlPackBean.setOrderByStr(bfIntercept.orderBy());
return ddlPackBean;
}
@ -193,7 +188,7 @@ public final class FormHqlPack {
* @return 查询条件
*/
public static DdlPackBean packHqlBfButton(BfButton bfButton){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfButton);
DdlPreparedPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", ddlPackBean);
@ -209,7 +204,7 @@ public final class FormHqlPack {
* @return 查询条件
*/
public static DdlPackBean packHqlBfRefMethodRoleByRoleIds(Long[] roleIds){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getInPackArray(roleIds, "roleId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
@ -223,14 +218,13 @@ public final class FormHqlPack {
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfRefButtonMethod(BfRefButtonMethod bfRefButtonMethod) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfRefButtonMethod);
DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonId(), "buttonId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionType(), "buttonPositionType", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionRefId(), "buttonPositionRefId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonNameRdd(), "buttonNameRdd", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonPositionRefNameRdd(), "buttonPositionRefNameRdd", ddlPackBean);
ddlPackBean.setOrderByStr(bfRefButtonMethod.orderBy());
return ddlPackBean;
}
@ -241,11 +235,10 @@ public final class FormHqlPack {
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfRefMethodRole(BfRefMethodRole bfRefMethodRole) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfRefMethodRole);
DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getMethodId(), "methodId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getRoleId(), "roleId", ddlPackBean);
ddlPackBean.setOrderByStr(bfRefMethodRole.orderBy());
return ddlPackBean;
}
@ -256,7 +249,7 @@ public final class FormHqlPack {
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfInterceptDetail(BfInterceptDetail bfInterceptDetail) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptId(), "interceptId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptTargetId(), "interceptTargetId", ddlPackBean);
@ -275,7 +268,7 @@ public final class FormHqlPack {
* @return
*/
public static DdlPackBean packHqlBfRefButtonMethodByRefIds(Long[] ids) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getInPackArray(ids, "buttonPositionRefId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
@ -290,7 +283,7 @@ public final class FormHqlPack {
* @return
*/
public static DdlPackBean findBfMenuByMethodIdsAndStatus(Long[] methodIds, int status) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getInPackArray(methodIds, "methodId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(status, "menuStatus", ddlPackBean);
@ -305,7 +298,7 @@ public final class FormHqlPack {
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfElement(BfElement bfElement){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(bfElement.getElementName(), "elementName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfElement.getElementCode(), "elementCode", ddlPackBean);
@ -322,7 +315,7 @@ public final class FormHqlPack {
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfDataSource(BfDataSource source){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(source);
DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean);
DdlPreparedPack.getStringLikerPack(source.getSourceName(), "sourceName", ddlPackBean);
@ -341,7 +334,7 @@ public final class FormHqlPack {
* @return hql
*/
public static DdlPackBean packHqlBfMenuTree(BfMenu bfMenu) {
DdlPackBean result = new DdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(bfMenu);
DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result);
DdlPreparedPack.getNumEqualPack(
@ -363,7 +356,7 @@ public final class FormHqlPack {
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfElementConstraint(BfElementConstraint bfElementConstraint){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfElementConstraint);
DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean);
@ -378,7 +371,7 @@ public final class FormHqlPack {
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfElementConstraintOnly(BfElementConstraint bfElementConstraint){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfElementConstraint);
DdlPreparedPack.getNumNOEqualPack(bfElementConstraint.getId(), "id", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean);
@ -393,7 +386,7 @@ public final class FormHqlPack {
* @return
*/
public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfDataObject);
DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectName(), "objectName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectClassName(), "objectClassName", ddlPackBean);
@ -408,7 +401,7 @@ public final class FormHqlPack {
* @return
*/
public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfCascade);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean);

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

@ -8,12 +8,10 @@ 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;
import java.io.Serializable;
import java.util.Date;
/**
* @Description :JIT发运数据同步
@ -60,17 +58,34 @@ public class IfQueueShipping extends BaseBean implements Serializable {
private Double qty;
@Column(name = "SUPPLIER_CODE")
@ApiParam("操作人")
@ApiParam("供应商代码")
private String supplierCode;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private Date actionDateTime;
private String actionDateTime;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "JIT_LOT_NO")
@ApiParam("JIT队列批次")
private String jitLotNo;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;

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

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/4/18 21:05
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_RAW_PART_DATA")
@Api("原料上线数据")
public class IfRawPartData extends BaseBean implements Serializable {
private static final long serialVersionUID = -2733956307324895596L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "PART_TYPE")
@ApiParam("原料类型")
private String partType;
@Column(name = "SERIAL_NUMBER")
@ApiParam("原料条码")
private String serialNumber;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "UNIT")
@ApiParam("单位")
private String unit;
@Column(name = "SRC_LOT_NO")
@ApiParam("收货批次")
private String srcLotNo;
@Column(name = "LOT_NO")
@ApiParam("生产批次")
private String lotNo;
@Column(name = "FIX_LOT_NO")
@ApiParam("特殊批次")
private String fixLotNo;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "ORGANIZATION_CODE")
@ApiParam("工厂代码")
private String organizationCode;
}

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

@ -43,6 +43,10 @@ public class MesQueueShipping extends BaseBean implements Serializable {
@ApiParam("vin")
private String vinCode;
@Column(name = "CAR_NO")
@ApiParam("车号")
private String carNo;
@Column(name = "CUST_FLAG_NO")
@ApiParam("客户标识号")
private String custFlagNo;
@ -63,4 +67,12 @@ public class MesQueueShipping extends BaseBean implements Serializable {
@ApiParam("客户产线代码")
private String custPlantCode;
@Column(name = "JIT_LOT_NO")
@ApiParam("JIT队列批次")
private String jitLotNo;
@Column(name = "JIT_ACTUAL_NO")
@ApiParam("客户JIT队列编号")
private String jitActualNo;
}

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.StepResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -88,4 +89,8 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
@Transient
@ApiParam("前端显示颜色")
private String color;
@Transient
@ApiParam("状态执行情况")
private StepResult stepResult;
}

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

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.math.BigDecimal;
/**
* @Description:
* @Reference:
* @Author: wangjie
* @CreateDate: 2019\10\24 22:04
* @Modify:
**/
@Data
public class PartDismantleModel {
@ApiParam("子物料编码")
private String itemPartNo;
@ApiParam("子物料名称")
private String itemPartName;
@ApiParam("拆解数")
private BigDecimal dismantleQty;
@ApiParam("合格数")
private BigDecimal okQty;
@ApiParam("缺失数")
private BigDecimal missQty;
@ApiParam("报废数")
private BigDecimal scrapQty;
}

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

@ -18,12 +18,20 @@ public class StepResult<T> {
private String msg;
private boolean needStop;
private StationRequestBean stationRequestBean;
public static StepResult getNonComplete() {
return new StepResult(false, "");
}
public static StepResult getNonCompleteStop() {
StepResult result = new StepResult(false, "");
result.setNeedStop(true);
return result;
}
public static StepResult getNonComplete(StationRequestBean requestBean) {
return new StepResult(false, "");
}
@ -36,6 +44,12 @@ public class StepResult<T> {
return new StepResult(false, reqBean);
}
public static <T> StepResult getNonCompleteReqBeanStop(StationRequestBean reqBean) {
StepResult stepResult = new StepResult(false, reqBean);
stepResult.setNeedStop(true);
return stepResult;
}
public static <T> StepResult getNonCompleteData(T data) {
return new StepResult(false, data, "");
}
@ -44,6 +58,12 @@ public class StepResult<T> {
return new StepResult(false, msg);
}
public static StepResult getNonCompleteStop(String msg) {
StepResult stepResult = new StepResult(false, msg);
stepResult.setNeedStop(true);
return stepResult;
}
public static StepResult getSuccessComplete(String msg) {
return new StepResult(true, msg);
}

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java
Unescape Escape View File

@ -36,6 +36,6 @@ public class FormOperateDataModel {
private String sourceName;
@ApiModelProperty("操作数据集合")
private List<Map<String,String>> operateDataList;
private List<Map<String,Object>> operateDataList;
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -339,6 +339,7 @@ public class CoreHqlPack {
}
DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result);
DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryValue(), "dictionaryValue", result);
DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
// 添加默认排序
@ -754,7 +755,7 @@ public class CoreHqlPack {
DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result);
if (orderNoRule.getSerialNo() != null) {
DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result);
DdlPreparedPack.getNumEqualPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result);
}
// 添加默认排序
@ -995,10 +996,11 @@ public class CoreHqlPack {
DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean);
DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean);
DdlPreparedPack.getStringEqualPack(sysDictionary.getParentCodeRdd(), "parentCodeRdd", packBean);
DdlPreparedPack.getStringEqualPack(sysDictionary.getParentNameRdd(), "parentNameRdd", packBean);
DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean);
DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean);
DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean);
DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(),"dictionaryValue",packBean);
return packBean;
}

47
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java
Unescape Escape View File

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
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.Lob;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-04-15 16:56
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_LONG_DATA")
@Api(value = "长数据", description = "长数据")
public class BsLongData extends BaseBean {
@Column(name = "REF_ID")
@ApiParam(value = "关联id")
private Long refId;
@Column(name = "REF_DATA_TYPE")
@ApiParam(value = "数据类型")
@AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.REF_DATA_TYPE.class)
private Integer refDataType;
@Lob
@Column(name = "DATA")
@ApiParam(value = "数据")
private String data;
}

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

@ -69,13 +69,11 @@ public class BsSuitDataDetail extends BaseBean {
private String getDateTime;
// 移动至记录数据表
@Lob
@Column(name = "ORGIN_DATA")
@ApiParam(value = "原始报文数据")
private String orginData;
// 移动至记录数据表
@Lob
@Column(name = "TRANS_DATA")
@ApiParam(value = "转换后的报文数据")
private String transData;

7
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -49,6 +51,7 @@ public class BsSuitRecord extends BaseBean {
@Column(name = "CASE_TYPE_ID")
@ApiParam(value = "套件类型id(枚举)")
@AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class)
private Integer caseTypeId;
@Column(name = "SUIT_CASE_DETAIL_ID")
@ -90,7 +93,6 @@ public class BsSuitRecord extends BaseBean {
@ApiParam(value = "认证结果")
private Integer suitSslKeyResult;
// 移动至记录数据表
@Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE")
@ApiParam(value = "认证信息")
private String suitSslKeyResultMessage;
@ -113,9 +115,8 @@ public class BsSuitRecord extends BaseBean {
private Long executeTime;
// 移动至记录数据表
@Lob
@Column(name = "SUIT_MESSAGE")
@ApiParam(value = "适配信息")
@ApiParam(value = "适配信息 longDataId")
private String suitMessage;
@Column(name = "PROCESS_STATE")

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsLongData;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-04-15 17:15
* @Modify:
**/
@Repository
public interface BsLongDataRepository extends BaseRepository<BsLongData,Long> {
}

49
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
Unescape Escape View File

@ -327,8 +327,8 @@ public class SoftSwitchHqlPack {
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitResult(),"suitResult",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(), "processState", ddlPackBean);
DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);
DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
ddlPackBean.setOrderByStr(bsSuitRecord.orderBy());
@ -345,16 +345,32 @@ public class SoftSwitchHqlPack {
DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitTypeNameRdd(),"suitTypeNameRdd",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getCaseTypeId(), "caseTypeId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean);
DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true);
DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true);
DdlPreparedPack.timeBuilder(bsSuitDataDetail.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
ddlPackBean.setOrderByStr(bsSuitDataDetail.orderBy());
return ddlPackBean;
}
/**
* 适配记录查询条件封装
* @return
*/
public static DdlPackBean packHqlBsSuitRequestRecord(BsSuitRequestRecord bsSuitRequestRecord){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitRequestRecord);
DdlPreparedPack.getNumEqualPack(bsSuitRequestRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.timeBuilder(bsSuitRequestRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
return ddlPackBean;
}
/**
* 适配文件条件封装
* @param bsSuitFile 查询条件
@ -374,17 +390,6 @@ public class SoftSwitchHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlSuitRecordBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCode",ddlPackBean);
DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlSuitDataDetailBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
@ -396,26 +401,6 @@ public class SoftSwitchHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlSuitRecordBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getInPackArray(suitRecordIds,"id",ddlPackBean);
DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getInPackArray(suitRecordIds,"suitRecordId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();

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

@ -305,4 +305,10 @@ public class WmsPart extends BaseBean {
this.qty = cqty;
this.partType = partType;
}
public WmsPart(String partGroup, Double cqty, String createDateTime) {
this.partGroup = partGroup;
this.qty = cqty;
this.createDatetime = createDateTime;
}
}

Write Preview
Loading…
Cancel
Save