From ec9764d3d71b3f11cc29461ae5c81eb687c00a91 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 25 Apr 2019 18:15:15 +0800 Subject: [PATCH 01/49] 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 02/49] =?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 03/49] 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 04/49] =?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); From 89d6ef61f452f56158061c51cc417b4f5c0bd8f6 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 26 Apr 2019 09:12:38 +0800 Subject: [PATCH 05/49] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 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 8822535..9b30cff 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 @@ -139,17 +139,19 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "处理中"), - RECEIPT_FINISH(30, "已完成"), - CLOSED(40, "已关闭"), - CANCELLED(50, "已取消"); + CREATE(10, "CREATE","新建"), + RECEIPT(20, "RECEIPT","处理中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH","已完成"), + CLOSED(40, "CLOSED","已关闭"), + CANCELLED(50, "CANCELLED","已取消"); private int value; + private String code; private String description; - MASTER_ORDER_STATUS(int value, String description) { + MASTER_ORDER_STATUS(int value,String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -157,6 +159,10 @@ public class WmsEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } From 34e6d97b27d284bbfc5271238a20235b14dc073b Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 26 Apr 2019 09:51:15 +0800 Subject: [PATCH 06/49] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 53395a7..632dcd4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -111,8 +111,8 @@ public class MesHqlPack { } /** - * 物料信息查询条件封装 - * @param mesPart + * 生产工单查询条件封装 + * @param mesWorkOrder * @return */ public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { From eee0539562942a097e3df116b02a1dcfd087899f Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 26 Apr 2019 09:54:59 +0800 Subject: [PATCH 07/49] =?UTF-8?q?sweb=E5=85=AC=E5=91=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 5a95b6f..5159e87 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -430,7 +430,8 @@ public class ImppEnumUtil { MAIL(1,"邮件","邮件"), LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"); + SWEB_NOTICE(3,"SWEB通知","SWEB通知"), + SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); private int value; private String name; 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 34ff73c..c729338 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 @@ -613,6 +613,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(),"messageSoftType",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result); From 950c6dee36de760074963ca4edba1516ac8e117a Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 26 Apr 2019 10:19:51 +0800 Subject: [PATCH 08/49] =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 5159e87..752316c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1093,7 +1093,8 @@ public class ImppEnumUtil { public enum FILE_ATTACH_SOURCE { MAIL(1,"邮件","邮件"), LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"); + SWEB_NOTICE(3,"SWEB通知","SWEB通知"), + SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); private int value; private String name; From 85ae1e2455c589173a693d0c1ae9d2b4526ce2ee Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 26 Apr 2019 11:16:36 +0800 Subject: [PATCH 09/49] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 10 +++--- .../i3plus/pojo/mes/bean/MesProduceCategory.java | 38 ++++++++++++++++++++++ .../repository/MesProduceCategoryRepository.java | 16 +++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCategoryRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 6ae5e60..d4eeaff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -69,11 +69,11 @@ public class MesPart extends BaseBean { @ApiParam("默认工作中心") private String defaultWorkCenter; - @Column(name="PRODUCE_CATEGORY") - @ApiParam("产品类型") - private String produceCategory; + @Column(name="PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; @Transient - @ApiParam("分类名称") - private String categoryName; + @ApiParam("产品类型名称") + private String produceCategoryName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java new file mode 100644 index 0000000..538b63f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PRODUCE_CATEGORY") +@Api("系统业务动作") +public class MesProduceCategory extends BaseBean { + + @Column(name="PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name="PRODUCE_CTGY_NAME") + @ApiParam("产品类型名称") + private String produceCategoryName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCategoryRepository.java new file mode 100644 index 0000000..943e7f1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCategoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:28 + * @Modify: + **/ +@Repository +public interface MesProduceCategoryRepository extends BaseRepository { +} From cdd0e5fc0523e71fa337a81a6b46c9204dd1be43 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Fri, 26 Apr 2019 13:07:17 +0800 Subject: [PATCH 10/49] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 205 +++++++++++++++++++++ .../pojo/sweb/modelbean/SwebLoginUserModel.java | 5 + 2 files changed, 210 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 4b2e9fc..e55fa30 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -259,4 +259,209 @@ public class SwebEnumUtil { return tmp; } } + + /** + * 用户消息类型 + * 1.NOTICE：通知 + * 2.STATION_LETTER：站内信 + * 3.SWEB_NOTICE：SWEB通知 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_TYPE { + + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); + + private int value; + private String name; + private String description; + + MESSAGE_TYPE() { + } + + MESSAGE_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 附件来源 + * 1.NOTICE：通知 + * 2.STATION_LETTER：站内信 + * 3.SWEB_NOTICE：SWEB通知 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FILE_ATTACH_SOURCE { + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); + + private int value; + private String name; + private String description; + + FILE_ATTACH_SOURCE() { + } + + FILE_ATTACH_SOURCE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 前端系统平台 + * IMPP_FE：impp系统 + * SWEB_FE：sweb系统 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FE_PLATFORM { + IMPP_FE("IMPP_FE", "IMPP_FE", "impp系统"), + SWEB_FE("SWEB_FE", "SWEB_FE", "sweb系统"); + + private String value; + private String name; + private String description; + + FE_PLATFORM() { + } + + FE_PLATFORM(String value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index 8076ebd..3594480 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -31,4 +31,9 @@ public class SwebLoginUserModel implements Serializable { @ApiParam(value = "ip地址") private String ip; + + public SwebLoginUserModel(Long id, String userName) { + this.id = id; + this.userName = userName; + } } From 06dd8b42da51f3bc91d414a03b31ca9274c1696d Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 26 Apr 2019 14:04:49 +0800 Subject: [PATCH 11/49] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 5878f68..bad372f 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 @@ -874,19 +874,19 @@ public class WmsHqlPack { * @param wmsStockQuan * @return */ - public static String packWmsStockQuan(WmsStockQuan wmsStockQuan) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); getStringBuilderPack(wmsStockQuan, result); - return result.toString(); + return result; } /** From 062d56573f24b0e24261a6fd804b0447a7728c40 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 26 Apr 2019 14:09:14 +0800 Subject: [PATCH 12/49] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 bad372f..9283733 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 @@ -375,16 +375,17 @@ public class WmsHqlPack { * @param wareHouse * @return */ - public static String packHqlWareHouseUnique(WareHouse wareHouse) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWareHouseUnique(WareHouse wareHouse) { + DdlPackBean result = new DdlPackBean(); +// StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); - HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); - HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); + DdlPreparedPack.getStringEqualPack(wareHouse.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(wareHouse.getCode(), "code", result); + DdlPreparedPack.getNumNOEqualPack(wareHouse.getId(), "id", result); getStringBuilderPack(wareHouse, result); - return result.toString(); + return result; } /** From a91ff1feaf58b02e563acbe7e5eeb71ed00077b8 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 26 Apr 2019 14:28:28 +0800 Subject: [PATCH 13/49] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 9283733..42555f9 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 @@ -377,7 +377,6 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWareHouseUnique(WareHouse wareHouse) { DdlPackBean result = new DdlPackBean(); -// StringBuffer result = new StringBuffer(); DdlPreparedPack.getStringEqualPack(wareHouse.getName(), "name", result); DdlPreparedPack.getStringEqualPack(wareHouse.getCode(), "code", result); @@ -970,15 +969,15 @@ public class WmsHqlPack { * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); - HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsMoveMaster, result); - return result.toString(); + return result; } /** @@ -989,7 +988,6 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { DdlPackBean packBean = new DdlPackBean(); -// StringBuffer result = new StringBuffer(); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", packBean); From 7f8217e644728509e790124daab012cdcdd22bdc Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 26 Apr 2019 14:44:47 +0800 Subject: [PATCH 14/49] =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/TestInfo.java | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java deleted file mode 100644 index 37c5121..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; - -/** - * @Description : 测试类 - * @Reference : - * @Author : yunhao - * @CreateDate : 2019-02-24 16:21 - * @Modify: - **/ -public class TestInfo extends BaseBean { - - - /** - * 执行耗时 - */ - private long executeTime; - - public TestInfo(){ - - } - - public TestInfo(long executeTime){ - this.executeTime = System.currentTimeMillis() - executeTime; - } -} From 85178af7f9197fa6640a9430e73f8aa289020578 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 26 Apr 2019 15:59:00 +0800 Subject: [PATCH 15/49] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 5257aed..beb96bf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -100,6 +100,14 @@ public class SysMessage extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long readCount; + public long getReadCountVal(){ + if(readCount == null){ + return 0; + } else { + return readCount.longValue(); + } + } + public SysMessage() { } From 927799e1db675a44fa1b9bac11e1ed1ac947903d Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 26 Apr 2019 17:48:18 +0800 Subject: [PATCH 16/49] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AE=B9?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 15a11c4..dab72a9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -174,6 +174,10 @@ public class WmsStockSn extends BaseBean { @Transient public Boolean isSet = false; + @ApiParam(value = "加减库容标志") + @Transient + public Boolean isAdd; + public WmsStockSn(){} public WmsStockSn(String partNo){ 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 5878f68..2e4bb62 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 @@ -1024,6 +1024,8 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); + HqlPack.getStringEqualPack(wmsMoveSn.getDestLocateNo(), "destLocateNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getSrcLocateNo(), "srcLocateNo", result); getStringBuilderPack(wmsMoveSn, result); return result.toString(); From 1aee9a6cf558b8bf5e6b55fc0a919fbeefef4cd2 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 26 Apr 2019 18:36:21 +0800 Subject: [PATCH 17/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84findByHqlWhere=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 178 ++++++++++----------- 1 file changed, 89 insertions(+), 89 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 42555f9..bc47531 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 @@ -79,19 +79,19 @@ public class WmsHqlPack { * @param wmsPOMasterDetails * @return */ - public static String packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); - HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); - HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result); - return result.toString(); + return result; } /** @@ -155,20 +155,20 @@ public class WmsHqlPack { * @param wmsPOMaster * @return */ - public static String packHqlWmsPOMaster(WmsPOMaster wmsPOMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPOMaster(WmsPOMaster wmsPOMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); - HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); - HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); + DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); getStringBuilderPack(wmsPOMaster, result); - return result.toString(); + return result; } /** @@ -177,22 +177,22 @@ public class WmsHqlPack { * @param wmsPOMaster * @return */ - public static String packHqlWmsPOMasterPart(WmsPOMaster wmsPOMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPOMasterPart(WmsPOMaster wmsPOMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", + DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""), "poStatus", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); - HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); getStringBuilderPack(wmsPOMaster, result); - return result.toString(); + return result; } /** @@ -254,22 +254,22 @@ public class WmsHqlPack { * @param wmsIbCheckPlan * @return */ - public static String packHqlWmsIbCheckPlan(WmsIbCheckPlan wmsIbCheckPlan) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsIbCheckPlan(WmsIbCheckPlan wmsIbCheckPlan) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); if (wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { - HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); + DdlPreparedPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); } if (wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { - HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); + DdlPreparedPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); } - return result.toString(); + return result; } /** @@ -439,12 +439,12 @@ public class WmsHqlPack { * @param wmsLocate * @return */ - public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsLocatesByType(WmsLocate wmsLocate) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); + DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); getStringBuilderPack(wmsLocate, result); - return result.toString(); + return result; } /** @@ -453,17 +453,17 @@ public class WmsHqlPack { * @param wmsLocatePart * @return */ - public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsLocatePart, result); - return result.toString(); + return result; } /** @@ -751,15 +751,15 @@ public class WmsHqlPack { * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSLocate.getLocateNo(), ";locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSLocate.getLocateNo(), ";locateNo", result); getStringBuilderPack(wmsCSLocate, result); - return result.toString(); + return result; } /** @@ -768,17 +768,17 @@ public class WmsHqlPack { * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSPart(WmsCSPart wmsCSPart) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); - HqlPack.getNumEqualPack(wmsCSPart.getIsAdjust(), "isAdjust", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSPart.getIsAdjust(), "isAdjust", result); + DdlPreparedPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsCSPart, result); - return result.toString(); + return result; } /** @@ -787,15 +787,15 @@ public class WmsHqlPack { * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSZone(WmsCSZone wmsCSZone) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSZone.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSZone.getZoneNo(), "zoneNo", result); getStringBuilderPack(wmsCSZone, result); - return result.toString(); + return result; } /** @@ -1154,18 +1154,18 @@ public class WmsHqlPack { * @param wmsCSOrderMaster * @return */ - public static String packHqlWmsCSOrderMasters(WmsCSOrderMaster wmsCSOrderMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSOrderMasters(WmsCSOrderMaster wmsCSOrderMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); - HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); - HqlPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); getStringBuilderPack(wmsCSOrderMaster, result); - return result.toString(); + return result; } /** @@ -1174,15 +1174,15 @@ public class WmsHqlPack { * @param wmsCSOrderDetails * @return */ - public static String packHqlWmsCSOrderDetails(WmsCSOrderDetails wmsCSOrderDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSOrderDetails(WmsCSOrderDetails wmsCSOrderDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsCSOrderDetails, result); - return result.toString(); + return result; } /** @@ -1191,16 +1191,16 @@ public class WmsHqlPack { * @param wmsCSFactTrans * @return */ - public static String packHqlWmsCSFactTrans(WmsCSFactTrans wmsCSFactTrans) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSFactTrans(WmsCSFactTrans wmsCSFactTrans) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result); getStringBuilderPack(wmsCSFactTrans, result); - return result.toString(); + return result; } /** @@ -1353,17 +1353,17 @@ public class WmsHqlPack { * @param wmsPoSn * @return */ - public static String packHqlWmsPoSn(WmsPoSn wmsPoSn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPoSn(WmsPoSn wmsPoSn) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsPoSn, result); - return result.toString(); + return result; } /** @@ -1668,17 +1668,17 @@ public class WmsHqlPack { * @param wmsCSOrderMaster * @return */ - public static String packHqlWmsCSOrderMasterPart(WmsCSOrderMaster wmsCSOrderMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSOrderMasterPart(WmsCSOrderMaster wmsCSOrderMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "", + DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "", WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue() + ""), "orderStatus", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsCSOrderMaster, result); - return result.toString(); + return result; } } From a6d0def85dfc24f33fb314b61579345f1cc530c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 26 Apr 2019 19:19:13 +0800 Subject: [PATCH 18/49] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 c5887fd..5093990 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 @@ -357,16 +357,16 @@ public class WmsHqlPack { * @param wareHouse * @return */ - public static String packHqlWareHouse(WareHouse wareHouse) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWareHouse(WareHouse wareHouse) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); - HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); - HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(wareHouse.getAddress(), "address", result); + DdlPreparedPack.getStringLikerPack(wareHouse.getCode(), "code", result); + DdlPreparedPack.getStringLikerPack(wareHouse.getName(), "name", result); getStringBuilderPack(wareHouse, result); - return result.toString(); + return result; } /** From 54af172d434f4b4228274cf5044d3977ed2d06f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 26 Apr 2019 19:26:22 +0800 Subject: [PATCH 19/49] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 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 185ff0d..18dda30 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 @@ -317,20 +317,20 @@ public class WmsHqlPack { * @param basVendor * @return */ - public static String packHqlBasVendor(BasVendor basVendor) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBasVendor(BasVendor basVendor) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result); - HqlPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result); - HqlPack.getStringLikerPack(basVendor.getVendorOwner(), "vendorOwner", result); - HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); - HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); - HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); - HqlPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorOwner(), "vendorOwner", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); + DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); getStringBuilderPack(basVendor, result); - return result.toString(); + return result; } /** @@ -472,17 +472,17 @@ public class WmsHqlPack { * @param basVendor * @return */ - public static String packHqlBasVendorUnique(BasVendor basVendor) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) { + DdlPackBean result =new DdlPackBean(); - HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result); - HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); - HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); + DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result); + DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); + DdlPreparedPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); getStringBuilderPack(basVendor, result); - return result.toString(); + return result; } public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { From 54211af6f4baa77eff928890697ba5e123dd5da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 26 Apr 2019 19:39:05 +0800 Subject: [PATCH 20/49] =?UTF-8?q?asn=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 76 +++++++++++----------- 1 file changed, 38 insertions(+), 38 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 18dda30..098368c 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 @@ -576,20 +576,20 @@ public class WmsHqlPack { * @param wmsASNMaster * @return */ - public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { + DdlPackBean result =new DdlPackBean(); - HqlPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); - HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result); - HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); - HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); + DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); + DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); getStringBuilderPack(wmsASNMaster, result); - return result.toString(); + return result; } /** @@ -625,49 +625,49 @@ public class WmsHqlPack { * @param wmsCheckFactRecord * @return */ - public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { + DdlPackBean result =new DdlPackBean(); //采购单号 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result); //ASN单号 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); //条码 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getSn(), "getSn", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getSn(), "getSn", result); //物料编码 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); //供应商编号 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); getStringBuilderPack(wmsCheckFactRecord, result); - return result.toString(); + return result; } - public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { + DdlPackBean result =new DdlPackBean(); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanDate(), "planDate", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanTime(), "planTime", result); - HqlPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result); - HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpAreaNo(), "erpAreaNo", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPlanDate(), "planDate", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPlanTime(), "planTime", result); + DdlPreparedPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result); + DdlPreparedPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result); + DdlPreparedPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getErpAreaNo(), "erpAreaNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); getStringBuilderPack(wmsASNMasterDetails, result); - return result.toString(); + return result; } /** From 3918b6b8e356ad66a977fb9f0f4101e997d8a841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 26 Apr 2019 19:44:31 +0800 Subject: [PATCH 21/49] =?UTF-8?q?move=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 098368c..018648f 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 @@ -951,16 +951,16 @@ public class WmsHqlPack { * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { + DdlPackBean result =new DdlPackBean(); - HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); + DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); getStringBuilderPack(wmsMoveMaster, result); - return result.toString(); + return result; } /** From cf4b412180ea4da366b317e3db4da8ca19394609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Sat, 27 Apr 2019 13:35:27 +0800 Subject: [PATCH 22/49] =?UTF-8?q?=E4=BC=98=E5=8C=96sql=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 94 +++++++++++----------- 1 file changed, 47 insertions(+), 47 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 018648f..d92af1f 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 @@ -393,21 +393,21 @@ public class WmsHqlPack { * @param wmsZones * @return */ - public static String packHqlWmsZones(WmsZones wmsZones) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsZones(WmsZones wmsZones) { + DdlPackBean result = new DdlPackBean(); //仓库代码 - HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); + DdlPreparedPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); + DdlPreparedPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); getStringBuilderPack(wmsZones, result); - return result.toString(); + return result; } /** @@ -534,19 +534,19 @@ public class WmsHqlPack { * @param basCustomer * @return */ - public static String packHqlBasCustomer(BasCustomer basCustomer) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBasCustomer(BasCustomer basCustomer) { + DdlPackBean result = new DdlPackBean(); //客户编号 - HqlPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); //客户简称 - HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); + DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称 - HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); + DdlPreparedPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); getStringBuilderPack(basCustomer, result); - return result.toString(); + return result; } /** @@ -555,19 +555,19 @@ public class WmsHqlPack { * @param wmsShippingFlag * @return */ - public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { + DdlPackBean result = new DdlPackBean(); //供应商编号 - HqlPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result); + DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); + DdlPreparedPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); //供应商全称 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); + DdlPreparedPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); getStringBuilderPack(wmsShippingFlag, result); - return result.toString(); + return result; } /** @@ -676,29 +676,29 @@ public class WmsHqlPack { * @param wmsFGInStock * @return */ - public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsFGInStock.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getWoNo(), "woNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(), "partNameRdd", result); - HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(), "qty", result); - HqlPack.getStringEqualPack(wmsFGInStock.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsFGInStock.getSn(), "sn", result); - HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result); - HqlPack.getStringLikerPack(wmsFGInStock.getRemark(), "remark", result); - HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result); - HqlPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); - HqlPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWoNo(), "woNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getNumEqualPack(wmsFGInStock.getQty(), "qty", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getUnit(), "unit", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getSn(), "sn", result); + DdlPreparedPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getRemark(), "remark", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); getStringBuilderPack(wmsFGInStock, result); - return result.toString(); + return result; } /** @@ -707,19 +707,19 @@ public class WmsHqlPack { * @param wmsTaskInfo * @return */ - public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); - HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); + DdlPreparedPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); getStringBuilderPack(wmsTaskInfo, result); - return result.toString(); + return result; } /** From 6da4a6f33cdc9375398be2a899a6108deb536cd0 Mon Sep 17 00:00:00 2001 From: jiajack Date: Sun, 28 Apr 2019 10:04:36 +0800 Subject: [PATCH 23/49] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9B=B8=E5=85=B3=E7=9A=84=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java | 38 ++++++++++++++++++++++ .../pojo/mes/pcn/repository/MesAreaRepository.java | 16 +++++++++ 2 files changed, 54 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java new file mode 100644 index 0000000..d6549d0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_AREA") +@Api("生产区域") +public class MesArea extends BaseBean { + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String areaName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java new file mode 100644 index 0000000..c91b713 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesAreaRepository extends BaseRepository { +} From 15a399e86d12eca0d1763584d5a6c9d26166b26c Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sun, 28 Apr 2019 10:52:50 +0800 Subject: [PATCH 24/49] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E3=80=81=E6=8A=BD=E7=82=B9=E8=AE=B0=E5=BD=95=E3=80=81=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E4=B8=89=E5=BC=A0=E8=A1=A8=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?sql=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 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 d92af1f..e479c0f 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 @@ -598,25 +598,25 @@ public class WmsHqlPack { * @param wmsShopping * @return */ - public static String packHqlWmsShipping(WmsShopping wmsShopping) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsShipping(WmsShopping wmsShopping) { + DdlPackBean result = new DdlPackBean(); //发运单号 - HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 - HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); //物料编码 - HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result); //条码 - HqlPack.getStringEqualPack(wmsShopping.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getSn(), "sn", result); //发运状态 - HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); //特殊发货标志 - HqlPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); getStringBuilderPack(wmsShopping, result); - return result.toString(); + return result; } /** @@ -1058,21 +1058,21 @@ public class WmsHqlPack { * @param wmsQCMaster * @return */ - public static String packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) { + DdlPackBean result = new DdlPackBean(); //单号 - HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 - HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); + DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); //关联单据类型 - HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); + DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); //关联单据号 - HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); + DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsQCMaster, result); - return result.toString(); + return result; } /** @@ -1121,15 +1121,15 @@ public class WmsHqlPack { * @param wmsQCDetails * @return */ - public static String packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) { + DdlPackBean result = new DdlPackBean(); //单号 - HqlPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsQCDetails, result); - return result.toString(); + return result; } /** @@ -1138,16 +1138,16 @@ public class WmsHqlPack { * @param wmsQCTrans * @return */ - public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) { + DdlPackBean result = new DdlPackBean(); //单号 - HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); //物料 - HqlPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result); getStringBuilderPack(wmsQCTrans, result); - return result.toString(); + return result; } /** From 8346b4c6f65fbe0245738254208ee9336ebd67b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Sun, 28 Apr 2019 10:58:22 +0800 Subject: [PATCH 25/49] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 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 d92af1f..f0b738d 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 @@ -1015,19 +1015,19 @@ public class WmsHqlPack { * @param wmsMoveSn * @return */ - public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); - HqlPack.getStringEqualPack(wmsMoveSn.getDestLocateNo(), "destLocateNo", result); - HqlPack.getStringEqualPack(wmsMoveSn.getSrcLocateNo(), "srcLocateNo", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getDestLocateNo(), "destLocateNo", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSrcLocateNo(), "srcLocateNo", result); getStringBuilderPack(wmsMoveSn, result); - return result.toString(); + return result; } /** From 3192d0cd2d5722d1d59a8138396c7ff548bc877d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Sun, 28 Apr 2019 11:12:40 +0800 Subject: [PATCH 26/49] =?UTF-8?q?hqlpack=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 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 8d48a59..b42fd28 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 @@ -932,17 +932,17 @@ public class WmsHqlPack { * @param wmsPackage * @return */ - public static String packWmsPackAge(WmsPackage wmsPackage) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsPackAge(WmsPackage wmsPackage) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); - HqlPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); - HqlPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); + DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); + DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); getStringBuilderPack(wmsPackage, result); - return result.toString(); + return result; } /** @@ -1390,20 +1390,20 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); - HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); - HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + public static DdlPackBean packHqlWmsStockSn(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); getStringBuilderPack(wmsStockSn, result); - return result.toString(); + return result; } /** @@ -1412,15 +1412,15 @@ public class WmsHqlPack { * @param wmsSnPrintRcd * @return */ - public static String packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result); + public static DdlPackBean packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsSnPrintRcd, result); - return result.toString(); + return result; } /** From 6d2f783930ad79198cc83ebb10e157d190a46a3c Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sun, 28 Apr 2019 11:17:37 +0800 Subject: [PATCH 27/49] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93=E3=80=81=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BA=A4=E6=98=93=E6=9D=A1=E7=A0=81sql=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 74 +++++++++++----------- 1 file changed, 37 insertions(+), 37 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 8d48a59..a43b6a5 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 @@ -895,14 +895,14 @@ public class WmsHqlPack { * @param tranNo * @return */ - public static String packWmsTransSn(String tranNo) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsTransSn(String tranNo) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(tranNo, "transNo", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getStringEqualPack(tranNo, "transNo", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - return result.toString(); + return result; } /** @@ -911,19 +911,19 @@ public class WmsHqlPack { * @param wmsTransQuan * @return */ - public static String packWmsTransQuan(WmsTransQuan wmsTransQuan) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsTransQuan(WmsTransQuan wmsTransQuan) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsTransQuan, result); - return result.toString(); + return result; } /** @@ -1390,20 +1390,20 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); - HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); - HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + public static DdlPackBean packHqlWmsStockSn(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); getStringBuilderPack(wmsStockSn, result); - return result.toString(); + return result; } /** @@ -1429,12 +1429,12 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); - HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); - return result.toString(); + public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + return result; } /** @@ -1443,12 +1443,12 @@ public class WmsHqlPack { * @param wmsStockQuan * @return */ - public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); + public static DdlPackBean packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsStockQuan, result); - return result.toString(); + return result; } /** From 0294f12b5b1d3f583ffe510a39f2a21895521449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Sun, 28 Apr 2019 11:22:53 +0800 Subject: [PATCH 28/49] =?UTF-8?q?=E4=BC=98=E5=8C=96hql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 32 ++++++++++------------ 1 file changed, 15 insertions(+), 17 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 b42fd28..10f86ec 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 @@ -728,21 +728,21 @@ public class WmsHqlPack { * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ - public static String packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) { + DdlPackBean result = new DdlPackBean(); // 来源单据类型 - HqlPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result); // 来源单据号 - HqlPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); // 打印机 - HqlPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); // 打印机状态 - HqlPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result); + DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result); getStringBuilderPack(wmsSnPrint, result); - return result.toString(); + return result; } /** @@ -826,25 +826,23 @@ public class WmsHqlPack { } /** - * 根据条件查询责任区分配信息封装类 - * - * @param wmsTempOrderLock 责任区分配信息 - * @return 责任区分配信息 + * 根据条件查询单据锁定封装类 + * @return 单据锁定信息 */ - public static String packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) { + DdlPackBean result = new DdlPackBean(); // 订单号 - HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); // 业务类型 - HqlPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); + DdlPreparedPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); // 物料代码 - HqlPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result); getStringBuilderPack(wmsTempOrderLock, result); - return result.toString(); + return result; } /** From 19f62ab85030abb36b942a1f899e4f42df373b6f Mon Sep 17 00:00:00 2001 From: Silliter Date: Sun, 28 Apr 2019 11:36:45 +0800 Subject: [PATCH 29/49] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 10 +++++----- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 9 ++++++++- .../i3plus/pojo/wms/bean/WmsActionStepCall.java | 12 ++++++------ .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 12 +++++++----- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 13 ++++++++----- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 12 +++++++----- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 11 ++++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 12 +++++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 10 +++++----- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 11 ++++++----- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 9 ++++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 20 +++++++++++++++----- .../estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 9 ++++++++- 16 files changed, 114 insertions(+), 57 deletions(-) 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 c61f2c7..791465e 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 @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_ASN_MASTER") +@Table(name = "WMS_DOC_ASN_MASTER", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("ASN主表信息") public class WmsASNMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 42f8cf8..0acbebb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.util.List; @@ -28,7 +29,13 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_ASN_DETAILS") +@Table(name = "WMS_DOC_ASN_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SN_1D"), + @Index(columnList = "SN_2D"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("ASN订单明细信息") public class WmsASNMasterDetails extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 74eb9a6..c9e8915 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -4,17 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 作业步骤调用 @@ -28,7 +24,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_STEP_CALL") +@Table(name="WMS_ACTION_STEP_CALL", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "AS_ID"), + @Index(columnList = "AM_ID") +}) @Api("作业步骤调用信息") public class WmsActionStepCall extends BaseBean { 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 db7518b..d075d60 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 @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :移库单明细实体(用于转储类业务) @@ -26,7 +23,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_MOVEMENT_DETAILS") +@Table(name = "WMS_DOC_MOVEMENT_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SRC_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("移库单明细表") public class WmsDocMovementDetails extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index bd4c822..bff377e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -9,10 +9,7 @@ import lombok.ToString; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -27,7 +24,13 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_MOVEMENT_MASTER") +@Table(name = "WMS_DOC_MOVEMENT_MASTER", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "REF_NO"), + @Index(columnList = "ERP_SRC_NO"), + @Index(columnList = "BUSI_TYPE"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("移库单表") @ToString public class WmsDocMovementMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 1f090fe..9181e8a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 移库单条码表 @@ -27,7 +24,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_MOVEMENT_SN") +@Table(name="WMS_DOC_MOVEMENT_SN", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SN"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("移库条码信息") public class WmsDocMovementSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 32a91fa..3c78462 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 库存移动单明细信息 @@ -25,7 +22,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_DETAILS") +@Table(name="WMS_MOVE_DETAILS", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("库存移动单明细信息") public class WmsMoveDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 6926673..86e3fd6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_MOVE_MASTER") +@Table(name = "WMS_MOVE_MASTER", indexes = { + @Index(columnList = "TRANS_TYPE_CODE"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("库存移动单主表信息") public class WmsMoveMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 4231c17..28ddb48 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 库存移动单条码信息 @@ -26,7 +23,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_SN") +@Table(name="WMS_MOVE_SN", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "SN"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("库存移动单条码信息") public class WmsMoveSn extends BaseBean { 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 79d47dd..e2f4114 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 @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_PO_MASTER") +@Table(name = "WMS_DOC_PO_MASTER", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("PO主表信息") public class WmsPOMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 1fc9671..8e8a2b3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : PO订单明细信息 @@ -26,7 +23,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_PO_DETAILS") +@Table(name = "WMS_DOC_PO_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("PO订单明细信息") public class WmsPOMasterDetails extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 9fdfdd0..1c3da68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,13 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_PO_SN") +@Table(name="WMS_DOC_PO_SN", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SN_1D"), + @Index(columnList = "SN_2D"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("PO条码信息") public class WmsPoSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index cddb417..fb9a9df 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -22,7 +23,11 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name = "WMS_STOCK_QUAN") +@Table(name = "WMS_STOCK_QUAN", indexes = { + @Index(columnList = "WH_NO"), + @Index(columnList = "ZONE_NO"), + @Index(columnList = "LOCATE_NO") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index dab72a9..8f88bd1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -10,10 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.Date; /** @@ -25,7 +22,20 @@ import java.util.Date; **/ @Data @Entity -@Table(name = "WMS_STOCK_SN") +@Table(name = "WMS_STOCK_SN", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "REF_SRC"), + @Index(columnList = "SN"), + @Index(columnList = "SN_2D"), + @Index(columnList = "WH_NO"), + @Index(columnList = "ZONE_NO"), + @Index(columnList = "LOCATE_NO"), + @Index(columnList = "LOT_NO"), + @Index(columnList = "FIX_LOT_NO"), + @Index(columnList = "DATE_CODE"), + @Index(columnList = "VENDOR_NO") + }) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 34b8db4..16b0109 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_TASK_DETAILS") +@Table(name = "WMS_TASK_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "ITEM_STATUS") +}) @Api("作业任务明细信息") public class WmsTaskDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 7c4009d..831b583 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,13 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_TRANS_QUAN") +@Table(name = "WMS_TRANS_QUAN", indexes = { + @Index(columnList = "WH_NO"), + @Index(columnList = "ZONE_NO"), + @Index(columnList = "LOCATE_NO"), + @Index(columnList = "REF_SRC"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("库存交易信息") public class WmsTransQuan extends BaseBean { From 48eedb360ec8748ed3b84da759114174ce652a1d Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sun, 28 Apr 2019 11:55:16 +0800 Subject: [PATCH 30/49] =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2sql?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 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 56b4e51..47c5ee8 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 @@ -851,19 +851,19 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packWmsStockSn(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsStockSn(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); getStringBuilderPack(wmsStockSn, result); - return result.toString(); + return result; } /** @@ -1099,18 +1099,18 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "", + DdlPreparedPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "", WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue() + ""), "snStatus", result); //单号 - HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringLeftLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); getStringBuilderPack(wmsStockSn, result); - return result.toString(); + return result; } /** From 0eb50142fe363356a2f6657c8bccb83229305d24 Mon Sep 17 00:00:00 2001 From: Silliter Date: Sun, 28 Apr 2019 13:16:59 +0800 Subject: [PATCH 31/49] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= 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, 3 insertions(+), 3 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 47c5ee8..c95477d 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 @@ -86,8 +86,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result); @@ -142,7 +142,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); - DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); From e4c1f3ae72acf88d265c5cb231e66289180323e5 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 28 Apr 2019 19:07:02 +0800 Subject: [PATCH 32/49] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 15 ++++++++++++- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 8 +++++-- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 26 ++++++++++++++++++++++ 5 files changed, 54 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 2a7b1bd..d0bdab0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -36,6 +36,10 @@ public class MesProduceSn extends BaseBean { @ApiParam("物料号") private String partNo; + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + @Column(name="QTY") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 772cbbb..f8f1238 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -33,12 +34,16 @@ public class MesQueueOrder extends BaseBean { @Column(name="VIN_CODE") @ApiParam("Vin") - private Integer vinCode; + private String vinCode; @Column(name="CUST_FLAG_NO") @ApiParam("客户标识号") private String custFlagNo; + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + @Column(name="SEQ") @ApiParam("排序") private Double seq; @@ -59,6 +64,14 @@ public class MesQueueOrder extends BaseBean { @ApiParam("区域代码") private String areaCode; + @Transient + @ApiParam("起始车号") + private String custFlagNoStart; + + @Transient + @ApiParam("截至车号") + private String custFlagNoEnd; + public int getStatusVal() { return this.status == null ? 0 : this.status; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 8afd878..f6d1fe1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -33,7 +33,11 @@ public class MesQueueOrderDetail extends BaseBean { @Column(name="PART_NO") @ApiParam("物料号") - private Integer partNo; + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; @Column(name="SERIAL_NUMBER") @ApiParam("产品条码") @@ -53,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean { @Column(name="WORK_TYPE") @ApiParam("生产类型") - private String workType; + private String workOrderType; @Column(name="PRODUCE_CATEGORY") @ApiParam("产品类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index cd971f2..20ddb88 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -88,6 +88,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("工作中心代码") private String workCenterCode; + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + @Column(name="WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 632dcd4..1751295 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesPart; import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder; import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; import org.apache.commons.lang3.StringUtils; @@ -155,4 +156,29 @@ public class MesHqlPack { DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean); return packBean; } + + /** + * 生产队列查询条件封装 + * @param mesQueueOrder + * @return + */ + public static DdlPackBean getQueueOrder(MesQueueOrder mesQueueOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoStart())) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustFlagNoStart(), "custFlagNo", packBean); + } + + if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) { + DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean); + } + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesQueueOrder.getCreateDateTimeStart(), + mesQueueOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + + DdlPreparedPack.getOrderDefault(mesQueueOrder); + DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean); + return packBean; + } } From 82de566e9085c0d4ba540f4e205fe6e2aeb503aa Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 28 Apr 2019 19:31:50 +0800 Subject: [PATCH 33/49] =?UTF-8?q?=E5=B0=81=E8=A3=85=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2>=3D=20<=3D=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 1082439..0f56525 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -307,6 +307,30 @@ public class DdlPreparedPack { } /** + * 封装String对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data); + } + } + + /** + * 封装String对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data); + } + } + + /** * 封装double对象成大于语句 * * @param columnName 列名 From 7da662787821fcf33c5d7704338ea8922cb9fadc Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Sun, 28 Apr 2019 20:09:02 +0800 Subject: [PATCH 34/49] =?UTF-8?q?sweb=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 85 +++++++++++++++++++--- .../cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 8 ++ 2 files changed, 84 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index e55fa30..9c0ef71 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -269,8 +269,8 @@ public class SwebEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_TYPE { - MAIL(1, "邮件", "邮件"), - LETTER(2, "站内信", "站内信"), +// MAIL(1, "邮件", "邮件"), +// LETTER(2, "站内信", "站内信"), SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); @@ -410,15 +410,15 @@ public class SwebEnumUtil { SWEB_FE("SWEB_FE", "SWEB_FE", "sweb系统"); private String value; - private String name; + private String code; private String description; FE_PLATFORM() { } - FE_PLATFORM(String value, String name, String description) { + FE_PLATFORM(String value, String code, String description) { this.value = value; - this.name = name; + this.code = code; this.description = description; } @@ -426,8 +426,8 @@ public class SwebEnumUtil { return value; } - public String getName() { - return name; + public String getCode() { + return code; } public String getDescription() { @@ -438,7 +438,7 @@ public class SwebEnumUtil { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { - tmp = values()[i].name; + tmp = values()[i].code; } } return tmp; @@ -457,7 +457,74 @@ public class SwebEnumUtil { public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].name.equals(code)) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 用户消息状态 + * 1.READ：已读 + * 2.UNREAD：未读 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_STATUS { + + READ(1,"已读","fa cell-fa fa-file-text"), + UNREAD(2,"未读","fa cell-fa fa-file-o"); + + private int value; + private String code; + private String description; + + MESSAGE_STATUS() { + } + + MESSAGE_STATUS(int value, String description, String code) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { tmp = values()[i].description; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index ad39328..78d6fdc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -63,4 +63,12 @@ public class BasVendor extends BaseBean{ @Column(name = "PASSWORD") @ApiParam(value = "密码") private String password; + + public BasVendor() { + } + + public BasVendor(Long id,String userName) { + this.id = id; + this.userName = userName; + } } \ No newline at end of file From bb811306ffde6ee16f80491a2723f5411d30b68d Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Mon, 29 Apr 2019 10:44:41 +0800 Subject: [PATCH 35/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20wmsShopping=20?= =?UTF-8?q?=E4=B8=BA=20wmsShipping?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/bean/{WmsShopping.java => WmsShipping.java} | 2 +- .../pojo/wms/repository/WmsShoppingRepository.java | 4 ++-- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/{WmsShopping.java => WmsShipping.java} (97%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java similarity index 97% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 9d87af8..c777851 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -28,7 +28,7 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="WMS_DOC_SHIPPING") @Api("产品发运信息") -public class WmsShopping extends BaseBean { +public class WmsShipping extends BaseBean { @Column(name="ORDER_NO") @ApiParam("发运单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.java index e6e6250..2d3bf04 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsShopping; +import cn.estsh.i3plus.pojo.wms.bean.WmsShipping; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsShoppingRepository extends BaseRepository { +public interface WmsShoppingRepository extends BaseRepository { } 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 c95477d..615e686 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 @@ -595,26 +595,26 @@ public class WmsHqlPack { /** * 产品发运信息 查询条件封装 * - * @param wmsShopping + * @param wmsShipping * @return */ - public static DdlPackBean packHqlWmsShipping(WmsShopping wmsShopping) { + public static DdlPackBean packHqlWmsShipping(WmsShipping wmsShipping) { DdlPackBean result = new DdlPackBean(); //发运单号 - DdlPreparedPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsShipping.getOrderNo(), "orderNo", result); //客户编码 - DdlPreparedPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsShipping.getCustNo(), "custNo", result); //物料编码 - DdlPreparedPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsShipping.getPartNo(), "partNo", result); //条码 - DdlPreparedPack.getStringEqualPack(wmsShopping.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsShipping.getSn(), "sn", result); //发运状态 - DdlPreparedPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result); //特殊发货标志 - DdlPreparedPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); + DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result); - getStringBuilderPack(wmsShopping, result); + getStringBuilderPack(wmsShipping, result); return result; } From bb922f42fb37e681f8606e27e71c1cee2408cf0f Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Mon, 29 Apr 2019 14:23:08 +0800 Subject: [PATCH 36/49] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/softswitch/DataSwitchModel.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java new file mode 100644 index 0000000..cf5b891 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 数据模型转换对象 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-04-29 11:11 + * @Modify: + **/ +public class DataSwitchModel { + + private String stringVal; + + private Long longVal; + + private Double doubleVal; + + private List listVal; + + private Map mapVal; + + private Object[] arrayVal; +} From b3f4ccbb78a05893abecc3aedd44c6691baa3c3a Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 29 Apr 2019 15:43:07 +0800 Subject: [PATCH 37/49] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 84 ++++++++++++++++++++++ .../wms/engine/script/EngineScriptPersistence.java | 21 ++++-- 2 files changed, 99 insertions(+), 6 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 9b30cff..1126543 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 @@ -2102,4 +2102,88 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 脚本类型 + * 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 + */ + public enum SCRIPT_TYPE { + MODUAL(10,"Modual","组件脚本"), + FORM(20,"Form","表单脚本"), + REPORT(30,"Report","报表脚本"), + JOB(40,"Job","JOB脚本"), + OTHER(50,"Other","其他脚本"); + + private String description; + private int value; + private String code; + + SCRIPT_TYPE(int value, String code, String description) { + this.description = description; + this.value = value; + this.code = code; + } + + public String getCode() { + return this.code; + } + + public int getIndex() { + return this.value; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 脚本语言类型 + * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + */ + public enum LANGUAGE_TYPE { + GROOVY(1,"Groovy", 10), + PYTHON(2,"Python", 20), + JS(3,"JavaScript", 30); + // 下面这2种语言没人会写，暂不支持 + //SCALA(40,"scala"), + //JRUBY(50,"jruby"); + + private int index; + private String description; + private int value; + + private LANGUAGE_TYPE(int index, String description, int value) { + this.index = index; + this.description = description; + this.value = value; + } + + public String getDescription() { + return description; + } + + public int getIndex() { + return this.index; + } + + public int getValue() { + return value; + } + + // 根据枚举编号获取语言代码 + public static String getCodeByIndex(int index) { + for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) { + if (languageType.getIndex() == index) { + return languageType.getDescription(); + } + } + + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java index 7e498d3..c928ee1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java @@ -4,11 +4,15 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import javax.script.CompiledScript; +import javax.script.ScriptContext; +import javax.script.ScriptEngine; +import javax.script.ScriptException; /** * 脚本持久化实体类 @@ -20,6 +24,7 @@ import javax.script.CompiledScript; @Entity @DynamicInsert @DynamicUpdate +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) @Table(name = "SCRIPT_PERSISTENCE") @Api("系统动态脚本") @@ -27,30 +32,34 @@ public class EngineScriptPersistence extends BaseBean { // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) private String scriptNo; + // 脚本的中文名称 @Column(name = "SCRIPT_NAME", length = 50) private String scriptName; + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 @Column(name = "SCRIPT_TYPE") - private int scriptType; + private Integer scriptType; + // 脚本编写的语言 // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby @Column(name = "LANGUAGE_TYPE") - private int languageType; + private Integer languageType; + // 脚本的具体内容 @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") private String scriptContent; + // 脚本的描述，包含脚本的用法，参数说明等 @Column(name = "SCRIPT_REMARK", length = 2000) private String scriptRemark; + // 编译后的脚本内容，通过预编译加快脚本的运行速度 @Transient - private CompiledScript compiledScript; - - public EngineScriptPersistence() {} + private Object compiledScript; // 构造方法，便于批量创建数据 - public EngineScriptPersistence(long id, String scriptNo, String scriptName, int scriptType, int languageType, + public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType, String scriptContent, String scriptRemark) { this.id = id; this.scriptNo = scriptNo; From c03c7d3331275b33b88d7f21d998816809d0bf14 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 29 Apr 2019 16:10:47 +0800 Subject: [PATCH 38/49] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 615e686..6fec350 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 @@ -7,6 +7,7 @@ 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.wms.bean.*; +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; @@ -1663,6 +1664,24 @@ public class WmsHqlPack { } /** + * 查询规则持久化 查询条件封装 + * + * @return + */ + public static DdlPackBean packEngineRulePersistence(EngineRulePersistence rulePersistence) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(rulePersistence.getRuleNo(), "ruleNo", packBean); + DdlPreparedPack.getStringRightLikerPack(rulePersistence.getRuleName(), "ruleName", packBean); + DdlPreparedPack.getNumEqualPack(rulePersistence.getRuleContent(), "ruleContent", packBean); + + getStringBuilderPack(rulePersistence, packBean); + + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); + return packBean; + } + + + /** * 盘点主表 分页查询(散件) * * @param wmsCSOrderMaster From afae8d085e42a79c90a65e44081264deffcf77ab Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 29 Apr 2019 17:42:56 +0800 Subject: [PATCH 39/49] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 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 6fec350..3c50daf 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 @@ -1537,19 +1537,19 @@ public class WmsHqlPack { * @param wmsDataAuth * @return */ - public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) { + DdlPackBean result = new DdlPackBean(); if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) { - HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result); + DdlPreparedPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result); } if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) { - HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); + DdlPreparedPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); } if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) { - HqlPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result); + DdlPreparedPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result); } getStringBuilderPack(wmsDataAuth, result); - return result.toString(); + return result; } /** @@ -1558,11 +1558,11 @@ public class WmsHqlPack { * @param taskDetails * @return */ - public static String packHqlWmsTaskDetails(WmsTaskDetails taskDetails) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result); + public static DdlPackBean packHqlWmsTaskDetails(WmsTaskDetails taskDetails) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result); getStringBuilderPack(taskDetails, result); - return result.toString(); + return result; } /** From 931a4a04d30aeaf85b309a9d64b21744d5041765 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 29 Apr 2019 18:32:10 +0800 Subject: [PATCH 40/49] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 +++++++++---- 1 file changed, 9 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 3c50daf..58e8c9c 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 @@ -1606,11 +1606,16 @@ public class WmsHqlPack { * @param wmsConfig * @return */ - public static String packHqlWmsConfig(WmsConfig wmsConfig) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result); + public static DdlPackBean packHqlWmsConfig(WmsConfig wmsConfig) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result); + DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result); + DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result); + DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigValueType(), "configValueType", result); + getStringBuilderPack(wmsConfig, result); - return result.toString(); + return result; } /** From da153214f98df623b24e9812d3b554fb3e756b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 29 Apr 2019 19:10:47 +0800 Subject: [PATCH 41/49] =?UTF-8?q?=E4=BC=98=E5=8C=96?= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 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 6fec350..fa67fd0 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 @@ -182,8 +182,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", - WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""), "poStatus", result); + DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(), + WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue()}, "poStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); From 7fc2fe8914f49faeda3192e2c6e341c3c7790031 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 29 Apr 2019 20:29:10 +0800 Subject: [PATCH 42/49] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E9=98=9F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 2 +- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) 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 c62ae4a..193c0fb 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 @@ -142,7 +142,7 @@ public class MesPlanOrder extends BaseBean { return this.status == null ? 0 : this.status; } - public int getOrderTypeVal() { + public int getPlanTypeVal() { return this.planType == null ? 0 : this.planType; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 1751295..23436d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesPart; import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; @@ -49,13 +50,13 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) { DdlPreparedPack.getStringEqualPack(mesPlanOrder.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "")) { + if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) { - DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatusVal(), "status", packBean); + if (StringUtils.isNotEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) { + if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) { DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean); } @@ -71,11 +72,11 @@ public class MesHqlPack { DdlPreparedPack.timeBuilder( mesPlanOrder.getCreateDateTimeStart(), mesPlanOrder.getCreateDateTimeEnd(), - "createDateTime", packBean, true); + "createDatetime", packBean, true); // 排序 - DdlPreparedPack.getOrderDefault(mesPlanOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPlanOrder.getOrderByParam()} , packBean); + DdlPreparedPack.getOrderDefault(mesPlanOrder); + DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPlanOrder.getOrderByParam()} , packBean); return packBean; } @@ -124,7 +125,7 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "")) { + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) { @@ -133,7 +134,7 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "")) { + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); } if (StringUtils.isNotEmpty(mesWorkOrder.getProdCfgCode())) { @@ -171,6 +172,7 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) { DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean); } + DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean); // 时间段查询 DdlPreparedPack.timeBuilder( mesQueueOrder.getCreateDateTimeStart(), From 5e625f45b8d02f32042fc928debfd537c2b636f1 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Mon, 29 Apr 2019 20:37:14 +0800 Subject: [PATCH 43/49] =?UTF-8?q?=E5=A2=9E=E5=8A=A0WmsMoveMastersql?= 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 361ba1a..13bf512 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 @@ -954,6 +954,7 @@ public class WmsHqlPack { DdlPackBean result =new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(),"transTypeCode",result); DdlPreparedPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); From b17b15964f2b62240ff031a6b44b9e0ad76a127a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 30 Apr 2019 09:25:23 +0800 Subject: [PATCH 44/49] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8F=E8=B0=83=E7=94=A8=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsActionGroupDetailsModel.java | 32 ++++++++++++++ .../i3plus/pojo/model/wms/WmsActionGroupModel.java | 26 ++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 4 ++ .../pojo/wms/modelbean/WmsOrderDetailsModel.java | 49 ---------------------- 4 files changed, 62 insertions(+), 49 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java new file mode 100644 index 0000000..2f06b5a --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 作业流程明细Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-04-29 15:39 + * @Modify: + **/ +@Data +@Api("作业流程明细Model") +public class WmsActionGroupDetailsModel { + @ApiParam("作业流程明细") + public WmsActionGroupDetails wmsActionGroupDetails; + @ApiParam("作业步骤") + public WmsActionStep wmsActionStep; + @ApiParam("作业步骤调用") + public List wmsActionStepCallList; + @ApiParam("作业步骤调用参数") + public List wmsActionStepCallParamList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java new file mode 100644 index 0000000..260eda7 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** +* @Description : 作业流程Model +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2019-04-29 15:39 +* @Modify: +**/ +@Data +@Api("作业流程Model") +public class WmsActionGroupModel { + @ApiParam("流程") + public WmsActionGroup wmsActionGroup; + @ApiParam("流程明细Model集合") + public List wmsActionGroupDetailsModelList; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index eb5b996..4830c63 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -52,6 +52,10 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "明细处理组件编号", example = "0") private Long detailsAmId; + @Column(name="SUBMIT_AM_ID") + @ApiParam(value = "提交组件编号", example = "0") + private Long submitAmId; + @Column(name="END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") private Long endAmId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java deleted file mode 100644 index 755af50..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.util.List; - -/** - * @Description : 单据明细Model - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-03-07 19:18 - * @Modify: - **/ -@Data -@Entity -//以子类table为准 -@javax.persistence.Inheritance(strategy= InheritanceType.TABLE_PER_CLASS) -@JsonInclude(value = JsonInclude.Include.NON_EMPTY) -@Api("单据明细Model") -public class WmsOrderDetailsModel extends BaseBean { - - @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - @Column(name = "ITEM") - @ApiParam("行号") - public Integer item; - @Column(name = "QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - @Column(name = "ORDER_NO") - @ApiParam("订单号") - public String orderNo; -} From 78c3ff3a475ff57a78bfb2e883b8056e6dd47153 Mon Sep 17 00:00:00 2001 From: jiajack Date: Tue, 30 Apr 2019 17:33:47 +0800 Subject: [PATCH 45/49] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java index 66909dd..41aace7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -18,13 +18,13 @@ import java.util.List; public class StationResultBean implements Serializable { /** - * 根据客户端所需数据结构，约定不同数据类型 + * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepHtml：工步内容 */ @ApiParam("数据类型") private String flagType; @ApiParam("是否错误信息") - private boolean fail; + private boolean error; @ApiParam("执行结果信息") private String message; From e790b209e562f1b52308c96583ea432ce57fbc0f Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 30 Apr 2019 19:16:35 +0800 Subject: [PATCH 46/49] =?UTF-8?q?sweb=E5=BC=80=E7=AA=97=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsBasVendorModel.java | 26 +++++++++++++++++++++ .../i3plus/pojo/wms/modelbean/WmsPartModel.java | 27 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java new file mode 100644 index 0000000..bd413a9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 供应商微服调用Model + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-30 19:18 + * @Modify: + **/ +@Data +@Api("供应商微服调用Model") +public class WmsBasVendorModel extends BaseBean { + + @ApiParam("供应商") + private BasVendor basVendor; + + @ApiParam("分页对象") + private Pager pager; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java new file mode 100644 index 0000000..f842855 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsPart; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 供应商微服调用Model + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-30 19:18 + * @Modify: + **/ +@Data +@Api("供应商微服调用Model") +public class WmsPartModel extends BaseBean { + + @ApiParam("物料") + private WmsPart wmsPart; + + @ApiParam("分页对象") + private Pager pager; +} From d1ac366574eb5b3661858c3e96813ded3a883cf3 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 30 Apr 2019 19:45:01 +0800 Subject: [PATCH 47/49] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=8B=A6=E6=88=AA=E5=99=A8=E5=BC=80=E5=8F=911.1?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=20=20=20=20=20=20=20=20=20=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java index aefdef9..ef4c996 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java @@ -42,16 +42,28 @@ public class BfElementTree extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long treeParentId; + @Column(name = "TREE_PARENT_RDD") + @ApiParam(value = "父级属性ID") + private String treeParentRdd; + @Column(name = "TREE_ATTR_NAME_ID") @ApiParam(value = "显示属性ID") @JsonSerialize(using = ToStringSerializer.class) private Long treeAttrNameId; + @Column(name = "TREE_ATTR_NAME_RDD") + @ApiParam(value = "显示属性ID") + private String treeAttrNameRdd; + @Column(name = "TREE_ATTR_VALUE_ID") @ApiParam(value = "取值属性ID") @JsonSerialize(using = ToStringSerializer.class) private Long treeAttrValueId; + @Column(name = "TREE_ATTR_VALUE_RDD") + @ApiParam(value = "取值属性ID") + private String treeAttrValueRdd; + @Column(name="TREE_IS_OPEN_ALL") @ApiParam(value ="是否全部展开") private Integer treeIsOpenAll; From 0aaa8112a864392b36e1f10a05c3ae7da0f786e8 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 30 Apr 2019 19:46:54 +0800 Subject: [PATCH 48/49] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=8B=A6=E6=88=AA=E5=99=A8=E5=BC=80=E5=8F=911.1?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=20=20=20=20=20=20=20=20=20=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/model/form/ElementModel.java | 12 ++++++++++++ .../cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 7f8fbae..8466ff9 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -105,6 +105,10 @@ public class BfElement extends BaseBean { private BfDataObject dataObject; @Transient + @ApiParam(value = "数据对象") + private BfElementProperty elementSortProperty; + + @Transient @ApiParam(value = "元素表单") private BfElementGrid elementGrid; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java index 82e59d5..822b260 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.form; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.form.bean.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -7,6 +8,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; +import javax.persistence.Transient; import java.util.List; /** @@ -36,6 +38,9 @@ public class ElementModel{ @ApiParam(value = "元素基础属性信息") private List propertyList; + @ApiParam(value = "元素查询排序") + private BfElementProperty propertySort; + @ApiParam(value = "元素基础虚拟属性信息") private List virtualList; @@ -51,4 +56,11 @@ public class ElementModel{ @ApiParam(value = "元素类型") private Integer elementType; + @ApiParam(value = "排序属性") + public String orderByParam; + + //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc + @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") + public Integer ascOrDesc = 1; + } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java index ff730f1..c329c15 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java @@ -59,7 +59,7 @@ public class BrRefReportTypeset extends BaseBean { /** * 关联元素或模板html */ - @Column(name = "REF_HTML") + @Column(name = "REF_HTML",columnDefinition = "TEXT") @ApiParam(value = "关联对象html") private String refHtml; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java index a88c054..f37e43e 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java @@ -55,7 +55,7 @@ public class BrReport extends BaseBean { @ApiParam(value ="布局名称") private String layoutNameRdd; - @Column(name="LAYOUT_HTML") + @Column(name="LAYOUT_HTML",columnDefinition = "TEXT") @ApiParam(value ="报表html") private String reportHtml; From cb628b0125f58f2b51c0fb6a5c02685c7cc210c3 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 30 Apr 2019 22:08:58 +0800 Subject: [PATCH 49/49] =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E6=8C=81=E4=B9=85?= =?UTF-8?q?=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 6f6fcb2..58fc14d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -22,14 +22,13 @@ import java.io.Serializable; * @Modify: **/ @Data -@Entity +@MappedSuperclass +//@Entity //以子类table为准 -@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) +//@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) //@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public abstract class BaseBean implements Serializable { - private static final long serialVersionUID = 1L; - //此处使用hibernate的主键策略方式 //手动设置,使用iplus-platform-common中的idtool生成 //将Long类型系列化成String避免精度丢失 @@ -130,7 +129,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") @AnnoOutputColumn(hidden = true) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc - public Integer ascOrDesc = 1; + public transient Integer ascOrDesc = 1; //排序方式 public String orderBy(){