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

yun-zuoyi
袁津哲 5 years ago
commit 15035d2851

@ -3052,7 +3052,8 @@ public class MesEnumUtil {
ATTEMPT_ORDER(30, "试制工单"), ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单"), BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单"), JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"); STOCK_ORDER(60, "库存工单"),
REPAIR(70,"返修插单");
private int value; private int value;
private String description; private String description;

@ -179,6 +179,7 @@ public final class FormHqlPack {
DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfIntercept.getExecuteContent(),"executeContent",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
ddlPackBean.setOrderByStr(bfIntercept.orderBy()); ddlPackBean.setOrderByStr(bfIntercept.orderBy());
@ -324,6 +325,9 @@ public final class FormHqlPack {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean); DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean);
DdlPreparedPack.getStringLikerPack(source.getSourceName(), "sourceName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(source.getSourceCode(), "sourceCode", ddlPackBean);
DdlPreparedPack.getStringLikerPack(source.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean); DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean);
DdlPreparedPack.getNumEqualPack(source.getSourceStatus(), "sourceStatus", ddlPackBean); DdlPreparedPack.getNumEqualPack(source.getSourceStatus(), "sourceStatus", ddlPackBean);
@ -383,4 +387,33 @@ public final class FormHqlPack {
return ddlPackBean; return ddlPackBean;
} }
/**
*
* @param bfDataObject
* @return
*/
public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectName(), "objectName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectClassName(), "objectClassName", ddlPackBean);
return ddlPackBean;
}
/**
*
* @param bfCascade
* @return
*/
public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean);
return ddlPackBean;
}
} }

@ -73,6 +73,7 @@ public class LacHqlPack {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean); DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean);
DdlPreparedPack.getStringEqualPack(bean.getTemplateName(), "templateName", ddlPackBean);
return ddlPackBean; return ddlPackBean;
} }
@ -163,6 +164,10 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) { public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean);
DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true);
return ddlPackBean; return ddlPackBean;
} }
@ -190,4 +195,14 @@ public class LacHqlPack {
DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean); DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean);
return ddlPackBean; return ddlPackBean;
} }
public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean);
return ddlPackBean;
}
} }

@ -20,6 +20,9 @@ public class ButtonComponentResultModel {
@ApiParam("成功信号") @ApiParam("成功信号")
private boolean isSuccess; private boolean isSuccess;
@ApiParam("是否跳过工序")
private boolean isJumpProcess;
@ApiParam("提示信息") @ApiParam("提示信息")
private String msg; private String msg;

@ -306,18 +306,19 @@ public class CoreHqlPack {
* @param config * @param config
* @return * @return
*/ */
public static String packHqlSysConfig(SysConfig config) { public static DdlPackBean packHqlSysConfig(SysConfig config) {
StringBuffer result = new StringBuffer(); DdlPackBean result = DdlPackBean.getDdlPackBean();
// hql拼接 // hql拼接
HqlPack.getStringLikerPack(config.getName(),"name",result); DdlPreparedPack.getStringLikerPack(config.getName(),"name",result);
HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result); DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
HqlPack.getNumEqualPack(config.getConfigType(),"configType",result); DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result);
DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result);
// 添加默认排序 // 添加默认排序
HqlPack.getOrderDefault(config); DdlPreparedPack.getOrderDefault(config);
return result.toString(); return result;
} }
/** /**
@ -337,7 +338,8 @@ public class CoreHqlPack {
DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
} }
DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result);
DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
// 添加默认排序 // 添加默认排序
DdlPreparedPack.getOrderDefault(dictionary); DdlPreparedPack.getOrderDefault(dictionary);
@ -407,7 +409,7 @@ public class CoreHqlPack {
DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
ddlPackBean.setOrderByStr(message.orderBy()); DdlPreparedPack.getOrderDefault(message);
return ddlPackBean; return ddlPackBean;
} }
@ -417,19 +419,21 @@ public class CoreHqlPack {
* @param file * @param file
* @return * @return
*/ */
public static String packHqlSysFile(SysFile file) { public static DdlPackBean packHqlSysFile(SysFile file) {
StringBuffer result = new StringBuffer(); DdlPackBean result = DdlPackBean.getDdlPackBean();
// hql拼接 // hql拼接
HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result); DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result);
HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result); DdlPreparedPack.getNumEqualPack(file.getFileTypeId(), "fileTypeId", result);
HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result); DdlPreparedPack.getStringLikerPack(file.getCreateUser(), "createUser", result);
HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false); DdlPreparedPack.getNumEqualPack(file.getFileSoftType(), "fileSoftType", result);
DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result);
DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false);
// 添加默认排序 // 添加默认排序
HqlPack.getOrderDefault(file); DdlPreparedPack.getOrderDefault(file);
return result.toString(); return result;
} }
/** /**
@ -455,20 +459,22 @@ public class CoreHqlPack {
* @param sysTaskPlan * @param sysTaskPlan
* @return * @return
*/ */
public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
StringBuffer result = new StringBuffer(); DdlPackBean result = DdlPackBean.getDdlPackBean();
// hql拼接 // hql拼接
HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
HqlPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result); DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result);
DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true);
// 添加默认排序 // 添加默认排序
HqlPack.getOrderDefault(sysTaskPlan); DdlPreparedPack.getOrderDefault(sysTaskPlan);
return result.toString(); return result;
} }
/** /**
@ -738,18 +744,23 @@ public class CoreHqlPack {
* @param orderNoRule * @param orderNoRule
* @return * @return
*/ */
public static String packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){ public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){
StringBuffer result = new StringBuffer(); DdlPackBean result = DdlPackBean.getDdlPackBean();
HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result); DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result);
HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result);
if (orderNoRule.getSerialNo() != null) {
DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "orderNoRuleCode", result);
}
// 添加默认排序 // 添加默认排序
HqlPack.getOrderDefault(orderNoRule); DdlPreparedPack.getOrderDefault(orderNoRule);
return result.toString(); return result;
} }
/** /**
@ -779,13 +790,18 @@ public class CoreHqlPack {
* @param sysTask * @param sysTask
* @return * @return
*/ */
public static String packHqlSysTask(SysTask sysTask){ public static DdlPackBean packHqlSysTask(SysTask sysTask){
StringBuffer result = new StringBuffer(); DdlPackBean result = DdlPackBean.getDdlPackBean();
HqlPack.getStringLikerPack(sysTask.getName(),"name",result); DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result);
HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result);
DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result);
DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result);
return result.toString(); DdlPreparedPack.getOrderDefault(sysTask);
return result;
} }
public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){ public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){

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

@ -90,6 +90,7 @@ public class BsSuitRecord extends BaseBean {
@ApiParam(value = "认证结果") @ApiParam(value = "认证结果")
private Integer suitSslKeyResult; private Integer suitSslKeyResult;
// 移动至记录数据表
@Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE") @Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE")
@ApiParam(value = "认证信息") @ApiParam(value = "认证信息")
private String suitSslKeyResultMessage; private String suitSslKeyResultMessage;
@ -111,6 +112,7 @@ public class BsSuitRecord extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long executeTime; private Long executeTime;
// 移动至记录数据表
@Lob @Lob
@Column(name = "SUIT_MESSAGE") @Column(name = "SUIT_MESSAGE")
@ApiParam(value = "适配信息") @ApiParam(value = "适配信息")

@ -44,6 +44,7 @@ public class BsSuitRequestRecord extends BaseBean {
@ApiParam(value = "请求来源(枚举)") @ApiParam(value = "请求来源(枚举)")
private Integer requestSource; private Integer requestSource;
// 移动至记录数据表
@Lob @Lob
@Column(name = "REQUEST_ORGIN_PARAM") @Column(name = "REQUEST_ORGIN_PARAM")
@ApiParam(value = "请求原始参数") @ApiParam(value = "请求原始参数")

@ -325,6 +325,8 @@ public class SoftSwitchHqlPack {
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); 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.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);
@ -343,6 +345,7 @@ public class SoftSwitchHqlPack {
DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getCaseTypeId(), "caseTypeId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean);
DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true);
DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true);

@ -115,6 +115,10 @@ public class WmsASNMaster extends BaseBean {
@ApiParam("备注") @ApiParam("备注")
public String remark; public String remark;
@Column(name = "DOCK",columnDefinition = "varchar(50) default '1'")
@ApiParam("道口")
public String dock;
@Transient @Transient
@ApiParam("供应商电话") @ApiParam("供应商电话")
private String vendorCall; private String vendorCall;

Loading…
Cancel
Save