From 186a9ccb0d62c25061b9c8279a0dde26f835dcab Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 25 Apr 2019 18:05:33 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 20 ++++++++++---- .../i3plus/pojo/model/wms/WmsOrderMasterModel.java | 31 ++++++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java 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 dd4ba2e..8822535 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 @@ -586,11 +586,11 @@ public class WmsEnumUtil { ASN("ASN", "ASN"), PO("PO", "PO"), SO("SO", "SO"), - MOVE("MOVE", "MOVE"), - IN_STOCK("IN_STOCK", "IN_STOCK"), - SHIPPING("SHIPPING", "SHIPPING"), - QC("QC", "QC"), - CS("CS", "CS"); + MOVE("MOVE", "移库单"), + IN_STOCK("IN_STOCK", "入库单"), + SHIPPING("SHIPPING", "发运单"), + QC("QC", "质检"), + CS("CS", "盘点"); private String value; private String description; @@ -619,6 +619,16 @@ public class WmsEnumUtil { } return null; } + + public static String getDes(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } } /** diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java new file mode 100644 index 0000000..87de1e1 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import io.swagger.models.auth.In; +import lombok.Data; + +/** + * @Description : 单据Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-03-07 19:18 + * @Modify: + **/ +@Data +@Api("单据Model") +public class WmsOrderMasterModel extends BaseBean { + @ApiParam("状态") + public Integer orderStatus; + + @ApiParam("不同状态的小计") + public Long statusQty; + + public WmsOrderMasterModel() { + } + public WmsOrderMasterModel(Integer orderStatus, Long statusQty) { + this.orderStatus = orderStatus; + this.statusQty =statusQty; + } +} From 3112e5e72c3e8e37e4fc16fd0f249083c61d2c87 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Thu, 25 Apr 2019 18:10:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index f560afe..c62ae4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -115,10 +115,13 @@ public class MesPlanOrder extends BaseBean { @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") public String endTimeEnd; + @Transient public List planTypeEnum; + @Transient public List planOrderStatusEnum; + @Transient public List getPlanTypeEnum() { return Arrays.asList(MesEnumUtil.PLAN_ORDER_TYPE.values()); } From ec9764d3d71b3f11cc29461ae5c81eb687c00a91 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 25 Apr 2019 18:15:15 +0800 Subject: [PATCH 3/6] d --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.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/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index d1aee88..c61f2c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -38,7 +38,7 @@ public class WmsASNMaster extends BaseBean { @ApiParam("单据类型") public String asnType; - @Column(name = "MASTER_ORDER_STATUS") + @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") public Integer asnStatus; From 3926ba11c1f35d512922dd9bc475d28a816e6965 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 25 Apr 2019 18:53:50 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsOrderMasterModel.java | 23 ---------------------- 1 file changed, 23 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java deleted file mode 100644 index 6107123..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.persistence.Column; - -/** - * @Description : 单据Model - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-03-07 19:18 - * @Modify: - **/ -@Data -@Api("单据Model") -public class WmsOrderMasterModel extends BaseBean { - @Column(name = "ORDER_NO") - @ApiParam("订单号") - public String orderNo; -} From 4309aeb9975a5641825263a955152a7e466d8881 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 25 Apr 2019 18:57:06 +0800 Subject: [PATCH 5/6] d --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java index 87de1e1..89047cc 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; -import io.swagger.models.auth.In; import lombok.Data; /** From 1a8a6418d85bca72dbd4d68da495f303a7db9143 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 25 Apr 2019 19:50:14 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8A=A0=E4=B8=8A=E2=80=9C?= =?UTF-8?q?snControl=E2=80=9D?= 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 | 1 + 1 file changed, 1 insertion(+) 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 472580e..5878f68 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 @@ -241,6 +241,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); getStringBuilderPack(wmsPart, result);