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..231b6d1 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, "已取消"); 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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index e04bbd6..e7018f3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -105,7 +105,11 @@ public class WmsCSOrderDetails extends BaseBean { @Transient @ApiParam("目标库位编号") - public String descLocateNo; + public String destLocateNo; + + @Transient + @ApiParam("前端表格编辑使用") + public Boolean isSet = false; public Double getQty() { return this.qty == null ? 0 : this.qty; @@ -133,4 +137,18 @@ public class WmsCSOrderDetails extends BaseBean { this.partNameRdd = partName; this.sn = sn; } + + public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName,String sn,Long id,String organizeCode,Integer transStatus){ + this.qty = qty; + this.partNo = partNo; + this.orderNo = orderNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.partNameRdd = partName; + this.sn = sn; + this.id = id; + this.organizeCode = organizeCode; + this.transStatus = transStatus; + } } 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(); + } }