From 67f7d66782331fa5ca91901a3f9af0c0d8890d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 12 Dec 2019 11:42:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=81=E5=BE=B7=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98#330?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 3c3d128..4b043a8 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 @@ -6,18 +6,14 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -1203,6 +1199,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); //关联单据号 DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result); + //单据状态 + DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderStatus(), "orderStatus", result); getStringBuilderPack(wmsQCMaster, result); From b52d5b392d30f7e196d27c241e56f19116e56c40 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 12 Dec 2019 14:17:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?task=20`1300`=204=20BI=20=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index 5c3ceb5..57862f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -47,7 +47,7 @@ public class MesRawPartSn extends BaseBean { @Column(name = "RAW_QTY") @ApiParam("数量") - private Long rawQty; + private Double rawQty; @Column(name = "LOT_NO") @ApiParam("生产批次") @@ -65,7 +65,7 @@ public class MesRawPartSn extends BaseBean { @ApiParam("供应商代码") private String supplierCode; - public long getRawQtyVal() { + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java index a55a07f..0e6b2b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java @@ -39,7 +39,7 @@ public class IfRawPartDataModel extends BaseBean { private String serialNumber; @ApiParam("数量") - private BigDecimal qty; + private Double qty; @ApiParam("单位") private String unit;