diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 8fd5bbc..1c73450 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -146,6 +146,10 @@ public class LacSuitTask extends BaseBean { private List lacSuitTaskParamList; @Transient + @ApiParam(value ="适配出参") + private List lacSuitTaskOutParamList; + + @Transient @ApiParam(value ="入参适配") private List inputParamAdapterList; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index 697b68e..76e34fa 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -96,4 +96,11 @@ public class LacSuitTaskParam extends BaseBean { @Transient @ApiParam(value ="参数值") private Object value; + + public String getValueStr() { + if (value == null) { + return null; + } + return value.toString(); + } } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 10b2e48..fdf9175 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -119,6 +119,10 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + if(bean!=null) { + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getParamName(), "paramName", ddlPackBean); + } return ddlPackBean; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 4b67424..50edbaf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -832,7 +832,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysDictionaryByIdsAndIsDefault(Long[] ids) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 DdlPreparedPack.getInPack(StringUtils.join(ids,","),"id",result); @@ -877,7 +877,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate); // hql拼接 DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 755a876..7bea734 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -60,6 +60,10 @@ public class WmsCSRange extends BaseBean { @ApiParam("单位") public String unit; + @Column(name="SRC_ORDER_NO") + @ApiParam("原单号") + public String srcOrderNo; + @Transient @ApiParam("存储区编号组") @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index dce4072..9c02389 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -156,6 +156,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("源单行号") public String srcItem; + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + public String custOrderNo; + @Transient @ApiParam("实际批次") private String actualLot;