From cb8a090aea918ec19e838e5c26ce4365d41619e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 30 Mar 2020 15:01:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=A2=E6=AC=A1=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java | 7 ++++++- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java index 781c348..f235943 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java @@ -48,5 +48,10 @@ public class WmsBusiType extends BaseBean { @ApiParam("移动类型") public Integer moveType; - + /** + * 是否启用波次计划 10-是，20-否 + */ + @Column(name = "IS_ENABLE_WAVE") + @ApiParam("是否启用波次计划") + public Integer isEnableWave; } 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 10e116b..88f3576 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 @@ -140,6 +140,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "已移库数量", example = "1") private Double moveQty; + @Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "任务生成数量", example = "1") + private Double taskGenerateQty; + @Column(name = "SRC_AREA_NO") @ApiParam("源库存地代码") public String srcAreaNo; 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 68b8086..b9071f3 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 @@ -2877,4 +2877,18 @@ public class WmsHqlPack { return result; } + /** + * 插件信息分页查询条件 + * @param rule + * @return + */ + public static DdlPackBean packHqlWmsWaveRule(WmsWaveRule rule) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(rule.getRuleCode(), "ruleCode", result); + DdlPreparedPack.getStringBiggerPack(rule.getStartEffectDate(), "startEffectDate", result); + DdlPreparedPack.getStringSmallerPack(rule.getEndEffectDate(), "endEffectDate", result); + getStringBuilderPack(rule, result); + return result; + } + }