From ef9293867f6d10026b74eaecee1dafe942d6536b Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 12 Dec 2019 10:02:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90bug6929=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E9=81=93=E5=8F=A3=E6=95=B0=E9=87=8F=E9=95=BF=E5=BA=A6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=99=90=E5=88=B6=E3=80=91=E3=80=90bug6928=20?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E9=81=93=E5=8F=A3=E4=B8=BA0=E6=97=B6?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4=E4=B8=BA1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 12dff4c..681ae56 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -159,7 +159,7 @@ public class WmsPOMaster extends BaseBean { @Transient private List orderNoList; - @Column(name = "DOCK") + @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") @ApiParam("道口") public String dock; From 59bdec9c6fb49ec2d7d910b95a9ed691c139b7de Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 12 Dec 2019 10:42:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=906933=20=E6=94=B6=E8=B4=A7=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E5=AE=B9=E5=99=A8=E6=9C=AA=E6=94=B6=E8=B4=A7=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=9C=8B=E6=9D=BF=E6=94=B6=E8=B4=A7=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E6=94=B6=E8=B4=A7=E5=AE=8C=E6=88=90=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=94=B6=E8=B4=A7=E7=9C=8B=E6=9D=BF=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 50a5461..4b4b298 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 @@ -4427,8 +4427,9 @@ public class WmsEnumUtil { WAIT_RECEIVING(10, "待收货"), RECEIVING(20, "收货中"), COMPLETE_RECEIVING(30, "收货完成"), - UN_RECEIVED(40, "延迟未收货"), - ELSE(50,"其他"); + CLOSE(40,"已关闭"), + CANCEL(50,"已取消"), + UN_RECEIVED(60, "延迟未收货"); private int value; private String description; 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 3/3] =?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);