diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 025dfe9..5fe7b1e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -40,11 +40,13 @@ public class DdlPackBean { public DdlPackBean(){ this.isHql = true; whereAppend = new StringBuilder(); + hqlPreparedMap = new HashMap<>(); } public DdlPackBean(boolean isHql){ this.isHql = isHql; whereAppend = new StringBuilder(); + hqlPreparedMap = new HashMap<>(); } public boolean isHql() { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 7eacb2d..224393a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -141,7 +141,7 @@ public class WmsEnumUtil { public enum MASTER_ORDER_STATUS { CREATE(10, "新建"), RECEIPT(20, "处理中"), - RECEIPT_FINISH(30, "已处理"), + RECEIPT_FINISH(30, "已完成"), CLOSED(40, "已关闭"), CANCELLED(50, "已取消"); @@ -1102,7 +1102,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_ITEM_STATUS { - NORMAL(10, "创建"), + NORMAL(10, "正常"), CANCELLATION(20, "已处理"); private int value; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index d73b51f..6f59cbe 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -54,6 +54,16 @@ public class BfMethodDetailProperty extends BaseBean { @ApiParam(value ="主对象元素名称") private String priElementNameRdd; + @Column(name="PRI_ELEMENT_PROPERTY_ID") + @ApiParam(value ="主对象元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long priElementPropertyId; + + @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD") + @ApiParam(value ="主对象元素属性名称") + @JsonSerialize(using = ToStringSerializer.class) + private String priElementPropertyNameRdd; + // 枚举:BlockFormEnumUtil.TRIGGER_EVENT @Column(name="PRI_ELEMENT_EVENT") @ApiParam(value ="主对象元素事件") @@ -78,7 +88,16 @@ public class BfMethodDetailProperty extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long secElementId; - @Column(name="sec_element_name_rdd") + @Column(name="SEC_ELEMENT_NAME_RDD") @ApiParam(value ="关联对象元素名称") private String secElementNameRdd; + + @Column(name="SEC_ELEMENT_PROPERTY_ID") + @ApiParam(value ="关联对象元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long secElementPropertyId; + + @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD") + @ApiParam(value ="关联对象元素属性名称") + private String secElementPropertyNameRdd; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index c03a7c4..c45c4e6 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.form.sqlpack; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.form.bean.*; import org.apache.commons.lang3.StringUtils; @@ -154,15 +156,15 @@ public final class FormHqlPack { * @param bfIntercept 查询条件 * @return hql */ - public static String packHqlBfIntercept(BfIntercept bfIntercept) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBfIntercept(BfIntercept bfIntercept) { + DdlPackBean ddlPackBean = new DdlPackBean(); - HqlPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", result); - HqlPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", result); - HqlPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", result); - result.append(bfIntercept.orderBy()); + DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean); + ddlPackBean.setOrderByStr(bfIntercept.orderBy()); - return result.toString(); + return ddlPackBean; } /** diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index e70a097..fad0818 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -11,101 +9,104 @@ 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 : wei.peng - * @Date : 2018-10-22 16:58:43.952 - * @Modify : + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:43.952 + * @Modify : **/ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_TASK_PLAN") -@Api(value="任务计划",description = "任务计划") +@Table(name = "SYS_TASK_PLAN") +@Api(value = "任务计划", description = "任务计划") public class SysTaskPlan extends BaseBean { - @Column(name="NAME") - @ApiParam(value ="名称") + @Column(name = "NAME") + @ApiParam(value = "名称") private String name; - @Column(name="GROUP_NAME") - @ApiParam(value ="组名称") + @Column(name = "GROUP_NAME") + @ApiParam(value = "组名称") private String groupName; - @Column(name="TASK_CYCLE_ID") - @ApiParam(value ="任务周期ID" , example = "-1") + @Column(name = "TASK_CYCLE_ID") + @ApiParam(value = "任务周期ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long taskCycleId; - @Column(name="TASK_CYCLE_NAME_RDD") - @ApiParam(value ="任务周期名称") + @Column(name = "TASK_CYCLE_NAME_RDD") + @ApiParam(value = "任务周期名称") private String taskCycleNameRdd; - @Column(name="TASK_CYCLE_EXPS_RDD") - @ApiParam(value ="任务周期表达式") + @Column(name = "TASK_CYCLE_EXPS_RDD") + @ApiParam(value = "任务周期表达式") private String taskCycleExpsRdd; - @Column(name="TASK_PLAN_EXEC_NUM") - @ApiParam(value ="定时任务运行次数" , example ="0") + @Column(name = "TASK_PLAN_EXEC_NUM") + @ApiParam(value = "定时任务运行次数", example = "0") private Integer taskPlanExecNum; - public int getTaskPlanExecNumValue(){ - if(taskPlanExecNum == null){ + /** + * 获取定时任务运行次数 + * @return 定时任务运行次数 + */ + public int getTaskPlanExecNumValue() { + if (taskPlanExecNum == null) { return 0; - }else{ + } else { return taskPlanExecNum.intValue(); } } // 枚举 ImppEnumUtil.TASK_METHOD_TYPE.CLASS_METHOD - @Column(name="TASK_METHOD_TYPE") - @ApiParam(value ="任务执行类型" ,example = "-1") + @Column(name = "TASK_METHOD_TYPE") + @ApiParam(value = "任务执行类型", example = "-1") private Integer taskMethodType; - @Column(name="TASK_ID") - @ApiParam(value ="定时任务id") + @Column(name = "TASK_ID") + @ApiParam(value = "定时任务id") @JsonSerialize(using = ToStringSerializer.class) private Long taskId; - @Column(name="TASK_NAME_RDD") - @ApiParam(value ="定时任务名称") + @Column(name = "TASK_NAME_RDD") + @ApiParam(value = "定时任务名称") private String taskNameRdd; - @Column(name="TASK_SOFT_TYPE_RDD") - @ApiParam(value ="任务所属模块") + @Column(name = "TASK_SOFT_TYPE_RDD") + @ApiParam(value = "任务所属模块") private Integer taskSoftTypeRdd; - @Column(name="TASK_PLAN_PARAM") - @ApiParam(value ="任务计划参数") + @Column(name = "TASK_PLAN_PARAM") + @ApiParam(value = "任务计划参数") private String taskPlanParam; - @Column(name="TASK_CYCLE_START_DATE_TIME_RDD") - @ApiParam(value ="任务开始时间") + @Column(name = "TASK_CYCLE_START_DATE_TIME_RDD") + @ApiParam(value = "任务开始时间") private String taskCycleStartDateTimeRdd; - @Column(name="TASK_CYCLE_END_DATE_TIME_RDD") - @ApiParam(value ="任务结束时间") + @Column(name = "TASK_CYCLE_END_DATE_TIME_RDD") + @ApiParam(value = "任务结束时间") private String taskCycleEndDateTimeRdd; - @Column(name="TASK_PLAN_DESCRIPTION") - @ApiParam(value ="任务计划描述" , access ="任务计划描述") + @Column(name = "TASK_PLAN_DESCRIPTION") + @ApiParam(value = "任务计划描述", access = "任务计划描述") private String taskPlanDescription; // 枚举 CommonEnumUtil.TRUE_OR_FALSE - @Column(name="TASK_PLAN_STATUS") - @ApiParam(value ="任务状态" , example ="1") + @Column(name = "TASK_PLAN_STATUS") + @ApiParam(value = "任务状态", example = "1") private Integer taskPlanStatus; - @Column(name="LAST_RUN_DATE_TIME") - @ApiParam(value ="最后运行时间" , access ="最后运行时间") + @Column(name = "LAST_RUN_DATE_TIME") + @ApiParam(value = "最后运行时间", access = "最后运行时间") private String lastRunDateTime; // 枚举 CommonEnumUtil.TRUE_OR_FALSE diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java index 40d72be..c44ee4b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java @@ -26,6 +26,14 @@ public class SwebPOForPubListResultItemModel extends BaseBean { @ApiParam(value = "零件号") private String partNo; + @ApiParam("供应商编号") + @Column(name = "VENDOR_CODE") + private String vendorCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; + @Column(name = "PART_NAME") @ApiParam(value = "零件名称") private String partName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 1c58e3c..c30c597 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.ArrayUtils; @@ -86,7 +87,6 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); @@ -647,7 +647,6 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsASNMasterDetails.getItem(), "item", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); @@ -989,7 +988,6 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItem(), "item", result); HqlPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); @@ -1020,7 +1018,6 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result); HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); @@ -1075,6 +1072,26 @@ public class WmsHqlPack { } /** + * 库存条码开窗 查询条件封装 + * + * @param wmsStockSn + * @return + */ + public static String packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "", + WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue() + ""), "snStatus", result); + //单号 + HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(),"sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getDateCode(),"dateCode",result); + getStringBuilderPack(wmsStockSn, result); + + return result.toString(); + } + + /** * 质检单明细信息 查询条件封装 * * @param wmsQCDetails @@ -1099,11 +1116,10 @@ public class WmsHqlPack { */ public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) { StringBuffer result = new StringBuffer(); - //单号 HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); - //行号 - HqlPack.getNumEqualPack(wmsQCTrans.getItem(), "item", result); + //物料 + HqlPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result); getStringBuilderPack(wmsQCTrans, result); @@ -1543,6 +1559,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); HqlPack.getInPackString(data, columnName, result); + HqlPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", result); HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result); getStringBuilderPack(bean, result); return result.toString(); @@ -1661,4 +1678,41 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 查询脚本持久化 查询条件封装 + * @return + */ + public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(scriptPersistence.getScriptNo(), "scriptNo", packBean); + DdlPreparedPack.getStringRightLikerPack(scriptPersistence.getScriptName(), "scriptName", packBean); + DdlPreparedPack.getNumEqualPack(scriptPersistence.getScriptType(), "scriptType", packBean); + DdlPreparedPack.getNumEqualPack(scriptPersistence.getLanguageType(), "languageType", packBean); + + getStringBuilderPack(scriptPersistence, packBean); + + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); + return packBean; + } + + /** + * 盘点主表 分页查询(散件) + * + * @param wmsCSOrderMaster + * @return + */ + public static String packHqlWmsCSOrderMasterPart(WmsCSOrderMaster wmsCSOrderMaster) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "", + WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue() + ""), "orderStatus", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); + HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); + + getStringBuilderPack(wmsCSOrderMaster, result); + + return result.toString(); + } }