From 2478fc3b14e4de400b63dad335a2106c76fafe49 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 28 Jun 2020 10:13:39 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 5 ----- sonar-project.properties | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index 0b9d661..1363382 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -31,11 +31,6 @@ import java.io.Serializable; @Api("工位投料信息") public class MesCellFeed extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369479107782L; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..3428e74 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From aabd7b5d1d1dbdce6a8912d22aedd7427456e117 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 28 Jun 2020 21:02:23 +0800 Subject: [PATCH 02/19] Fix Bug #9112 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index e02f6cf..280de6b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -111,4 +111,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") private String custDeliveryLocation; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 141f713..2be9e5b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -127,4 +127,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "CT_NO") @ApiParam("容器编号") private String ctNo; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; } From 31d7b71872a5ebf8ba5245120d07a0c6cb60f884 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 29 Jun 2020 11:37:03 +0800 Subject: [PATCH 03/19] mes enum order type --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index b5b8273..3696fa3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3290,6 +3290,16 @@ public class MesEnumUtil { } return tmp; } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** From aaf9f8a21b0a24f7bd9027a247bd5c46fe3381ba Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 29 Jun 2020 22:43:45 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B9=90=E8=A7=82?= =?UTF-8?q?=E9=94=81=20=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 09296ef..add5b48 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 @@ -177,7 +177,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型名称") private String snTypeName; - + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; public MesProduceSn() { } From 614582ce36c7036b575fdb0d6312d726874d3965 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 29 Jun 2020 23:10:02 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B9=90=E8=A7=82=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 add5b48..6120f9d 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 @@ -180,7 +180,7 @@ public class MesProduceSn extends BaseBean implements Serializable { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; + public Integer lockVersion; public MesProduceSn() { } From bc76711a8443902f12b080e6a92c6f23689b8275 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jun 2020 17:29:33 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From c73ef2b93b8296134def865de7354610b1517389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 30 Jun 2020 18:34:39 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=B7=A5=E4=BD=8D=E5=92=8C=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E3=80=81=E4=BA=8C=E6=AC=A1=E7=AE=B1=E6=9D=A1=E7=A0=81Un-Pack-?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=BC=80=E5=8F=91=E4=B8=9A=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 0ff1771..19f6de5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4266,8 +4266,8 @@ public class MesPcnEnumUtil { public enum BAD_HANDLE_TYPE { BACK_SPRAY(10, "BACK_SPRAY", "返喷"), SCRAPPED(20, "SCRAPPED", "报废"), - POLISH(30, "POLISH", "抛光"), - DETERMINED(40, "DETERMINED", "待定"); + POLISHING(30, "POLISHING", "抛光"), + DETERMIND(40, "DETERMIND", "待定"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java index 80c483b..8dfadf4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java @@ -1,12 +1,12 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.util.List; /** @@ -39,22 +39,18 @@ public class PaintCheckModel { @ApiParam("界面编号") private String windowNo; - @ApiParam("缺陷类型") - private String defectType; - - @ApiParam("缺陷描述") - private String defectDesc; - @ApiParam("缺陷标识值") private String defectFlagValue; @ApiParam("不良品处理类型") private Integer defectActionType; - @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") private String prodCfgTypeCode; + @ApiParam("缺陷列表") + private List defectList; + @ApiParam("界面组件参数数据") List windowModuleParamList; } From 59c79b5134610cf76a7b1990b03b1fb49409319a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 30 Jun 2020 18:46:59 +0800 Subject: [PATCH 08/19] =?UTF-8?q?TASK=202205,=20=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B6=82=E8=A3=85=E4=BA=8C=E6=AC=A1=E7=AE=B1?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E3=80=82Finish=20Task=20#2?= =?UTF-8?q?205=20Cost:24h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 541d461..a46c53d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -123,6 +123,11 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("包装标签模板") private String packageLabelTemplate; + // 二维码 + @Column(name = "QR_CODE") + @ApiParam("包装二维码") + private String qrCode; + public MesPackage() { } From ab0ae20d40543cb639d0121cfeb5562938968134 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 1 Jul 2020 14:59:17 +0800 Subject: [PATCH 09/19] =?UTF-8?q?Finish=20Task=20#2234=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7JIT=E9=A2=84=E8=A3=85=E9=98=9F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 37 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 ++ .../pojo/mes/bean/MesQueueJitPlanDetail.java | 12 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 68 ++++++++++++++++++++++ 5 files changed, 157 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 161c474..998da89 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6438,4 +6438,40 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT预装队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_PLAN_STATUS { + CREATE(10, "创建"), + RELEASED(20, "已释放"), + ERROR(999, "异常"); + + private Integer value; + private String description; + + QUEUE_JIT_PLAN_STATUS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index d982dab..dee2d14 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.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; import java.io.Serializable; /** @@ -74,4 +75,40 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "VERSION") @ApiParam("版本号") private String version; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商编号") + private String supplierCode; + + @Column(name = "SUPPLIER_NAME") + @ApiParam("供应商名称") + private String supplierName; + + @Column(name = "FILE_NAME") + @ApiParam("解析文件名") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("解析文件路径") + private String fileUrl; + + @Transient + @ApiParam("计划上线开始时间") + private String planStartDate; + + @Transient + @ApiParam("计划上线结束时间") + private String planEndDate; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index 1d9faad..bba33d4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -50,4 +50,8 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("用量") private Double qty; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index 7111b75..402d4c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -46,4 +46,16 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { @Column(name = "PART_NAME") @ApiParam("产品名称") private String partName; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; } 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 3178eee..767ad06 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 @@ -3130,4 +3130,72 @@ public class MesHqlPack { } return packBean; } + + /** + * 客户JIT预装队列 + * @param queueJitPlan + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitPlan(MesQueueJitPlan queueJitPlan, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlan, organizeCode); + if (!StringUtils.isEmpty(queueJitPlan.getJisPlanNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getJisPlanNo(), "jisPlanNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getCustPlantCode())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustPlantCode(), "custPlantCode", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getCustFlagNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustFlagNo(), "custFlagNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getVinCode())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getVinCode(), "vinCode", packBean); + } + if (queueJitPlan.getStatus() != null) { + DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } + + /** + * 客户JIT预装队列明细 + * @param queueJitPlanDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitPlanDetail(MesQueueJitPlanDetail queueJitPlanDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanDetail, organizeCode); + if (!StringUtils.isEmpty(queueJitPlanDetail.getJisPlanNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getJisPlanNo(), "jisPlanNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlanDetail.getPartNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getPartNo(), "partNo", packBean); + } + return packBean; + } + + /** + * 客户JIT预装队列BOM + * @param queueJitPlanBom + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitPlanBom(MesQueueJitPlanBom queueJitPlanBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanBom, organizeCode); + if (!StringUtils.isEmpty(queueJitPlanBom.getJisPlanNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getJisPlanNo(), "jisPlanNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlanBom.getPartNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getPartNo(), "partNo", packBean); + } + return packBean; + } } From 0c0eea561d30a599d3d79c4e8c96cf58bc9fb823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 1 Jul 2020 19:33:49 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 578 +++++++++++---------- 1 file changed, 317 insertions(+), 261 deletions(-) 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 43a6f9d..a489f69 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 @@ -26,13 +26,14 @@ public class CoreHqlPack { /** * In 参数封装 + * * @param columnName * @return */ - public static String packHqlIds(String columnName, String[] params){ - StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + public static String packHqlIds(String columnName, String[] params) { + StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getInPack(String.join(",", params), columnName, result); return result.toString(); } @@ -40,42 +41,45 @@ public class CoreHqlPack { /** * In 参数封装 + * * @param columnName * @return */ - public static String packHqlIds(String columnName, Long[] params){ - StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + public static String packHqlIds(String columnName, Long[] params) { + StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(StringUtils.join(params,","),columnName,result); + HqlPack.getInPack(StringUtils.join(params, ","), columnName, result); return result.toString(); } /** * In 参数封装 + * * @param columnName * @return */ - public static DdlPackBean packHqlInStr(String columnName, String[] params){ + public static DdlPackBean packHqlInStr(String columnName, String[] params) { DdlPackBean ddlPackBean = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); DdlPreparedPack.getInPack(params, columnName, ddlPackBean); return ddlPackBean; } /** * In 参数封装 + * * @param columnName * @return */ - public static DdlPackBean packHqlIn(String columnName, List params){ + public static DdlPackBean packHqlIn(String columnName, List params) { DdlPackBean ddlPackBean = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); DdlPreparedPack.getInPack(params, columnName, ddlPackBean); return ddlPackBean; } @@ -83,24 +87,25 @@ public class CoreHqlPack { /** * 资源查询 + * * @param resource * @return */ - public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource){ + public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource) { DdlPackBean result = DdlPackBean.getDdlPackBean(); - if(resource != null){ - DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + if (resource != null) { + DdlPreparedPack.getNumEqualPack(resource.getResourceType(), "resourceType", result); // 是否多类型查询 - if(StringUtils.isNotBlank(resource.getResourceTypes())){ + if (StringUtils.isNotBlank(resource.getResourceTypes())) { DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); } - DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result); - DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); - DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); - DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result); - DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result); + DdlPreparedPack.getNumEqualPack(resource.getSoftType(), "softType", result); + DdlPreparedPack.getNumEqualPack(resource.getIsSystem(), "isSystem", result); + DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(), "languageCode", result); + DdlPreparedPack.getStringLikerPack(resource.getResourceKey(), "resourceKey", result); + DdlPreparedPack.getStringLikerPack(resource.getResourceValue(), "resourceValue", result); } return result; @@ -108,6 +113,7 @@ public class CoreHqlPack { /** * 语言 + * * @param localeLanguage * @return */ @@ -118,9 +124,9 @@ public class CoreHqlPack { // HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(), // "createDateTime", result, false); //字符串类型封装 - HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(),"languageCode",result); + HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(), "languageCode", result); //字符串类型封装 - HqlPack.getStringLikerPack(localeLanguage.getLanguageName(),"languageName",result); + HqlPack.getStringLikerPack(localeLanguage.getLanguageName(), "languageName", result); // 添加默认排序 HqlPack.getOrderDefault(localeLanguage); @@ -130,37 +136,39 @@ public class CoreHqlPack { /** * 岗位复杂查询 + * * @param position * @return */ - public static DdlPackBean packHqlSysPosition(SysPosition position){ - return packHqlSysPosition(position,null); + public static DdlPackBean packHqlSysPosition(SysPosition position) { + return packHqlSysPosition(position, null); } - public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){ + public static DdlPackBean packHqlSysPosition(SysPosition position, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode()); // 查询参数封装 - DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(position.getParentId(), "parentId", result); // String Like - DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); + DdlPreparedPack.getStringLikerPack(position.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(position.getPositionCode(), "positionCode", result); // In - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); return result; } /** * 岗位复杂查询 + * * @param position * @return */ - public static DdlPackBean packHqlSysPositionList(SysPosition position){ + public static DdlPackBean packHqlSysPositionList(SysPosition position) { DdlPackBean result = DdlPackBean.getDdlPackBean(position); // 查询参数封装 - DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(), "organizeCode", result); return result; } @@ -168,14 +176,15 @@ public class CoreHqlPack { /** * 岗位复杂查询 + * * @param bean * @return */ - public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean){ + public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean) { DdlPackBean result = DdlPackBean.getDdlPackBean(bean); // 查询参数封装 - DdlPreparedPack.getNumEqualPack(bean.getUserId(),"userId",result); + DdlPreparedPack.getNumEqualPack(bean.getUserId(), "userId", result); return result; } @@ -183,19 +192,20 @@ public class CoreHqlPack { /** * 组织复杂查询 + * * @param organize * @return */ - public static String packHqlSysOrganize(SysOrganize organize){ + public static String packHqlSysOrganize(SysOrganize organize) { StringBuffer result = new StringBuffer(); // 查询参数封装 - if(organize.getChildIdList() != null){ - HqlPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result); + if (organize.getChildIdList() != null) { + HqlPack.getInPack(StringUtils.join(organize.getChildIdList(), ","), "parentId", result); } - HqlPack.getStringLikerPack(organize.getName(),"name",result); - HqlPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringLikerPack(organize.getName(), "name", result); + HqlPack.getStringLikerPack(organize.getOrganizeCode(), "organizeCode", result); // 添加默认排序 HqlPack.getOrderDefault(organize); @@ -203,53 +213,54 @@ public class CoreHqlPack { return result.toString(); } - public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){ + public static DdlPackBean packHqlSysOrganize(SysOrganize organize, List idList) { HqlPack.getOrderDefault(organize); DdlPackBean result = DdlPackBean.getDdlPackBean(organize); - DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getNumEqualPack(organize.getParentId(),"parentId",result); + DdlPreparedPack.getStringLikerPack(organize.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(organize.getParentId(), "parentId", result); // 查询参数封装 - if(organize.getChildIdList() != null){ - DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result); + if (organize.getChildIdList() != null) { + DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(), ","), "parentId", result); } // Number In - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); return result; } - public static String packHqlSysOrganize(Long[] ids, Integer typeId){ + public static String packHqlSysOrganize(Long[] ids, Integer typeId) { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getInPack(StringUtils.join(ids,","),"id",result); - HqlPack.getNumEqualPack(typeId,"organizeType",result); + HqlPack.getInPack(StringUtils.join(ids, ","), "id", result); + HqlPack.getNumEqualPack(typeId, "organizeType", result); return result.toString(); } /** * 部门复杂查询 + * * @param department * @return */ @Deprecated - public static String packHqlSysDepartment(SysDepartment department){ + public static String packHqlSysDepartment(SysDepartment department) { StringBuffer result = new StringBuffer(); // if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ // department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); // } - HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); + HqlPack.getNumEqualPack(department.getParentId(), "parentId", result); // HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); - HqlPack.getStringLikerPack(department.getName(),"name",result); - HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); + HqlPack.getStringLikerPack(department.getName(), "name", result); + HqlPack.getStringLikerPack(department.getDepartmentCode(), "departmentCode", result); // 添加默认排序 HqlPack.getOrderDefault(department); @@ -257,36 +268,36 @@ public class CoreHqlPack { return result.toString(); } - public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List idList){ + public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(department); - DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); - DdlPreparedPack.getNumEqualPack(department.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); - DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getStringLikerPack(department.getName(), "name", result); + DdlPreparedPack.getNumEqualPack(department.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(department.getOrganizeId(), "organizeId", result); + DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(), "departmentCode", result); + DdlPreparedPack.getInPackList(idList, "id", result); result.setOrderByStr(department.orderBy()); return result; } - public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ + public static DdlPackBean packDdlBeanSysMenu(SysMenu menu, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(menu); - DdlPreparedPack.getInPackList(idList,"id",result); - if(menu != null){ - DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + DdlPreparedPack.getInPackList(idList, "id", result); + if (menu != null) { + DdlPreparedPack.getNumEqualPack(menu.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(menu.getMenuType(), "menuType", result); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(), "menuStatus", result); + DdlPreparedPack.getStringLikerPack(menu.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(menu.getMenuCode(), "menuCode", result); result.setOrderByStr(menu.orderBy()); - }else { + } else { menu = new SysMenu(); } - if(!StringUtils.isNotBlank(menu.getOrderByParam())){ + if (!StringUtils.isNotBlank(menu.getOrderByParam())) { menu.setOrderByParam("menuSort"); menu.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); result.setOrderByStr(menu.orderBy()); @@ -297,16 +308,17 @@ public class CoreHqlPack { /** * 系统角色复杂查询 + * * @param role * @return */ @Deprecated - public static String packHqlSysRole(SysRole role){ + public static String packHqlSysRole(SysRole role) { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); - HqlPack.getStringLikerPack(role.getName(),"name",result); + HqlPack.getNumEqualPack(role.getRoleStatus(), "roleStatus", result); + HqlPack.getStringLikerPack(role.getName(), "name", result); // 添加默认排序 HqlPack.getOrderDefault(role); @@ -316,37 +328,53 @@ public class CoreHqlPack { /** * 系统角色复杂查询 + * + * @param role + * @return + */ + public static DdlPackBean packDdlBeanSysRole(SysRole role) { + return packDdlBeanSysRole(role, null); + } + + /** + * 唯一校验 + * * @param role * @return */ - public static DdlPackBean packDdlBeanSysRole(SysRole role){ - return packDdlBeanSysRole(role,null); + public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringEqualPack(role.getName(), "name", result); + DdlPreparedPack.getNumEqualPack(role.getId(), "id", result); + return result; } - public static DdlPackBean packDdlBeanSysRole(SysRole role,List idList){ + public static DdlPackBean packDdlBeanSysRole(SysRole role, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(role); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); - DdlPreparedPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); - DdlPreparedPack.getStringLikerPack(role.getName(),"name",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(role.getRoleStatus(), "roleStatus", result); + DdlPreparedPack.getStringLikerPack(role.getName(), "name", result); + DdlPreparedPack.getInPackList(idList, "id", result); - return result; + return result; } /** * 系统参数复杂查询 + * * @param config * @return */ - public static DdlPackBean packHqlSysConfig(SysConfig config) { + public static DdlPackBean packHqlSysConfig(SysConfig config) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getStringLikerPack(config.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result); - DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result); + DdlPreparedPack.getStringLikerPack(config.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(config.getConfigCode(), "configCode", result); + DdlPreparedPack.getNumEqualPack(config.getConfigType(), "configType", result); DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result); // 添加默认排序 @@ -357,6 +385,7 @@ public class CoreHqlPack { /** * 字典信息复杂查询 + * * @param dictionary * @return */ @@ -368,7 +397,7 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result); DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 默认查询非顶级字典 - if (dictionary.getParentId() == null || dictionary.getParentId() < 1){ + if (dictionary.getParentId() == null || dictionary.getParentId() < 1) { DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); @@ -385,6 +414,7 @@ public class CoreHqlPack { /** * 硬件类型复杂查询 + * * @param toolType * @return */ @@ -392,7 +422,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(toolType.getName(),"name", result); + HqlPack.getStringLikerPack(toolType.getName(), "name", result); // 添加默认排序 HqlPack.getOrderDefault(toolType); @@ -402,6 +432,7 @@ public class CoreHqlPack { /** * 硬件复杂查询 + * * @param tool * @return */ @@ -409,13 +440,13 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(tool.getName(),"name",result); - HqlPack.getNumEqualPack(tool.getToolTypeId(),"toolTypeId",result); - HqlPack.getNumEqualPack(tool.getToolStatus(),"toolStatus",result); - HqlPack.getNumEqualPack(tool.getToolDataType(),"toolDataType",result); - HqlPack.getNumEqualPack(tool.getToolConnType(),"toolConnType",result); - HqlPack.getStringLikerPack(tool.getToolIp(),"toolIp",result); - HqlPack.getNumLikerPack(tool.getToolPort(),"toolPort",result); + HqlPack.getStringLikerPack(tool.getName(), "name", result); + HqlPack.getNumEqualPack(tool.getToolTypeId(), "toolTypeId", result); + HqlPack.getNumEqualPack(tool.getToolStatus(), "toolStatus", result); + HqlPack.getNumEqualPack(tool.getToolDataType(), "toolDataType", result); + HqlPack.getNumEqualPack(tool.getToolConnType(), "toolConnType", result); + HqlPack.getStringLikerPack(tool.getToolIp(), "toolIp", result); + HqlPack.getNumLikerPack(tool.getToolPort(), "toolPort", result); // 添加默认排序 HqlPack.getOrderDefault(tool); @@ -425,10 +456,11 @@ public class CoreHqlPack { /** * 消息复杂查询 + * * @param message * @return */ - public static DdlPackBean packHqlSysMessage(SysMessage message){ + public static DdlPackBean packHqlSysMessage(SysMessage message) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(message); // hql拼接 @@ -447,11 +479,12 @@ public class CoreHqlPack { DdlPreparedPack.getOrderDefault(message); - return ddlPackBean; + return ddlPackBean; } /** * 文件资源复杂查询 + * * @param file * @return */ @@ -466,11 +499,12 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result); DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false); - return result; + return result; } /** * 任务周期复杂查询 + * * @param sysTaskCycle * @return */ @@ -484,22 +518,23 @@ public class CoreHqlPack { // 添加默认排序 HqlPack.getOrderDefault(sysTaskCycle); - return result.toString(); + return result.toString(); } /** * 定时任务复杂查询 + * * @param sysTaskPlan * @return */ - public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ + public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(), "groupName", result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(), "taskPlanStatus", result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(), "taskCycleId", result); DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result); DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true); @@ -507,57 +542,58 @@ public class CoreHqlPack { // 添加默认排序 DdlPreparedPack.getOrderDefault(sysTaskPlan); - return result; + return result; } /** * 账号复杂查询 + * * @param user * @return */ - public static String packHqlSysUser(SysUser user){ + public static String packHqlSysUser(SysUser user) { StringBuffer result = new StringBuffer(); // And X = X - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); - HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); - - if(user.getRoleIdList() != null){ - HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(user.getDepartmentId(), "departmentId", result); + HqlPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); + HqlPack.getStringEqualPack(user.getOrganizeCode(), "organizeCode", result); + + if (user.getRoleIdList() != null) { + HqlPack.getInPack(StringUtils.join(user.getRoleIdList(), ","), "id", result); } - if(user.getDepartmentIdList() != null){ - HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(),","),"id",result); + if (user.getDepartmentIdList() != null) { + HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(), ","), "id", result); } // And Like % % - HqlPack.getStringLikerPack(user.getUserName(),"userName",result); - HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + HqlPack.getStringLikerPack(user.getUserName(), "userName", result); + HqlPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + HqlPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + HqlPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); // 添加默认排序 HqlPack.getOrderDefault(user); - return result.toString(); + return result.toString(); } - public static DdlPackBean packDdlBeanSysUser(SysUser user,List idList){ + public static DdlPackBean packDdlBeanSysUser(SysUser user, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(user); - DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); // DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); // DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); result.setOrderByStr(user.orderBy()); return result; @@ -565,52 +601,54 @@ public class CoreHqlPack { /** * 账号复杂查询 + * * @param user * @return */ - public static DdlPackBean packDdlSysUser(SysUser user){ + public static DdlPackBean packDdlSysUser(SysUser user) { DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(user); // And X = X - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack); - DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",ddlPack); - DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",ddlPack); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPack); + DdlPreparedPack.getNumEqualPack(user.getDepartmentId(), "departmentId", ddlPack); + DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", ddlPack); - if(user.getRoleIdList() != null){ - DdlPreparedPack.getInPack(user.getRoleIdList(),"id",ddlPack); + if (user.getRoleIdList() != null) { + DdlPreparedPack.getInPack(user.getRoleIdList(), "id", ddlPack); } - if(user.getDepartmentIdList() != null){ - DdlPreparedPack.getInPack(user.getDepartmentIdList(),"id",ddlPack); + if (user.getDepartmentIdList() != null) { + DdlPreparedPack.getInPack(user.getDepartmentIdList(), "id", ddlPack); } // And Like % % - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", ddlPack); // 添加默认排序 DdlPreparedPack.getOrderDefault(user); DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, ddlPack); - return ddlPack; + return ddlPack; } /** * 查询字典代码是否重复 + * * @param dictionary * @return */ - public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary){ + public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary) { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); - DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(), "dictionaryCode", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not - DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(), "id", result); // 添加默认排序 DdlPreparedPack.getOrderDefault(dictionary); @@ -620,18 +658,19 @@ public class CoreHqlPack { /** * 查询字典值是否重复 + * * @param dictionary * @return */ - public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary){ + public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary) { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); - DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(), "dictionaryValue", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not - DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(), "id", result); // 添加默认排序 DdlPreparedPack.getOrderDefault(dictionary); @@ -641,92 +680,95 @@ public class CoreHqlPack { /** * 用户信息 复杂查询拼接 + * * @param userInfo * @return */ - public static String packHqlSysUserInfo(SysUserInfo userInfo){ + public static String packHqlSysUserInfo(SysUserInfo userInfo) { StringBuffer result = new StringBuffer(); // And - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result); // HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); - HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); - HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); + HqlPack.getNumEqualPack(userInfo.getPositionId(), "positionId", result); + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + HqlPack.getStringEqualPack(userInfo.getOrganizeCode(), "organizeCode", result); - if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){ + if (userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()) { HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result); } // Like - HqlPack.getStringLikerPack(userInfo.getName(),"name",result); - HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + HqlPack.getStringLikerPack(userInfo.getName(), "name", result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 HqlPack.getOrderDefault(userInfo); - return result.toString(); + return result.toString(); } - public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List idList){ + public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(userInfo); // And - DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); - DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(), "positionId", result); + DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getInPackList(idList, "id", result); - if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){ - DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result); + if (userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()) { + DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(), "departmentId", result); } // Like - DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + DdlPreparedPack.getStringLikerPack(userInfo.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 result.setOrderByStr(userInfo.orderBy()); - return result; + return result; } /** * 用户信息 复杂查询拼接 + * * @param userInfo * @return */ - public static String packHqlSysUserInfo(SysUserInfo userInfo,List idList){ + public static String packHqlSysUserInfo(SysUserInfo userInfo, List idList) { StringBuffer result = new StringBuffer(); // And - HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - if(idList != null && !idList.isEmpty()){ + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + if (idList != null && !idList.isEmpty()) { HqlPack.getInPack(StringUtils.join(idList, ","), "id", result); } // Like - HqlPack.getStringLikerPack(userInfo.getName(),"name",result); - HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + HqlPack.getStringLikerPack(userInfo.getName(), "name", result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 HqlPack.getOrderDefault(userInfo); - return result.toString(); + return result.toString(); } /** * 查询语言代码是否重复 + * * @param localeLanguage * @return */ - public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage){ + public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(),"languageCode",result); - HqlPack.getNumNOEqualPack(localeLanguage.getId(),"id",result); + HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(), "languageCode", result); + HqlPack.getNumNOEqualPack(localeLanguage.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(localeLanguage); @@ -736,16 +778,17 @@ public class CoreHqlPack { /** * 检查系统资源是否重复 + * * @param localeResource * @return */ - public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource){ + public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result); - HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result); - HqlPack.getNumEqualPack(localeResource.getSoftType(),"softType",result); - HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result); + HqlPack.getStringEqualPack(localeResource.getLanguageCode(), "languageCode", result); + HqlPack.getStringEqualPack(localeResource.getResourceKey(), "resourceKey", result); + HqlPack.getNumEqualPack(localeResource.getSoftType(), "softType", result); + HqlPack.getNumNOEqualPack(localeResource.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(localeResource); @@ -755,16 +798,17 @@ public class CoreHqlPack { /** * 查询规则代码是否重复 + * * @param orderNoRule * @return */ - public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule){ + public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule) { StringBuffer result = new StringBuffer(); // and - HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); // not - HqlPack.getNumNOEqualPack(orderNoRule.getId(),"id",result); + HqlPack.getNumNOEqualPack(orderNoRule.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(orderNoRule); @@ -773,19 +817,20 @@ public class CoreHqlPack { } /** - * 单号规则复杂查询，分页，排序 + * 单号规则复杂查询，分页，排序 + * * @param orderNoRule * @return */ - public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){ + public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule) { DdlPackBean result = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); - DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); - DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(), "orderNoRuleStatus", result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(), "orderNo", result); if (orderNoRule.getSerialNo() != null) { DdlPreparedPack.getNumEqualPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result); } @@ -798,19 +843,20 @@ public class CoreHqlPack { /** * 用户消息关系表负责查询 + * * @param sysRefUserMessage * @return */ - public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage) { + 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); - HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result); + 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); + HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(), "receiverTime", result); + HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(), "receiverId", result); // 添加默认排序 HqlPack.getOrderDefault(sysRefUserMessage); @@ -820,44 +866,46 @@ public class CoreHqlPack { /** * 任务复杂查询 + * * @param sysTask * @return */ - public static DdlPackBean packHqlSysTask(SysTask sysTask){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + public static DdlPackBean packHqlSysTask(SysTask sysTask) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result); - DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result); - DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result); - DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result); + DdlPreparedPack.getStringLikerPack(sysTask.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(), "taskSoftType", result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(), "taskPackage", result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(), "taskClass", result); DdlPreparedPack.getOrderDefault(sysTask); return result; } - public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids) { + StringBuffer result = new StringBuffer(); - HqlPack.getInPack(StringUtils.join(ids,","),"id",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + HqlPack.getInPack(StringUtils.join(ids, ","), "id", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDefault", result); return result.toString(); } /** * 大小区间比较 + * * @param columnName * @param min * @param max * @return */ - public static String packHqlByInterval(String columnName,Object min,Object max){ - StringBuffer result = new StringBuffer(); + public static String packHqlByInterval(String columnName, Object min, Object max) { + StringBuffer result = new StringBuffer(); - HqlPack.getNumSmallerPack(max,columnName,result); - HqlPack.getNumBiggerPack(min,columnName,result); + HqlPack.getNumSmallerPack(max, columnName, result); + HqlPack.getNumBiggerPack(min, columnName, result); return result.toString(); } @@ -865,6 +913,7 @@ public class CoreHqlPack { /** * 字典信息查询id集合中是否存在默认数据 + * * @param ids * @return */ @@ -872,44 +921,47 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getInPack(StringUtils.join(ids,","),"id",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + DdlPreparedPack.getInPack(StringUtils.join(ids, ","), "id", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDefault", result); return result; } /** * 条码规则代码是否存在 + * * @param sysBarcodeRule * @return */ - public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule) { + StringBuffer result = new StringBuffer(); // and - HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result); + HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(), "barcodeRuleCode", result); // not - HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(),"id",result); + HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(), "id", result); return result.toString(); } /** * 条码规则复杂查询 + * * @param sysBarcodeRule * @return */ - public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule) { + StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(sysBarcodeRule.getName(),"name",result); - HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result); + HqlPack.getStringLikerPack(sysBarcodeRule.getName(), "name", result); + HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(), "barcodeRuleCode", result); return result.toString(); } /** * 打印模板复杂查询 + * * @param sysLabelTemplate * @return */ @@ -932,9 +984,9 @@ public class CoreHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate); // hql拼接 - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(),"templateName",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(),"organizeCode",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(), "organizeCode", ddlPackBean); DdlPreparedPack.timeBuilder(sysLabelTemplate.getModifyDateTimeStart(), sysLabelTemplate.getModifyDateTimeEnd(), "modifyDatetime", ddlPackBean, true); @@ -946,6 +998,7 @@ public class CoreHqlPack { /** * 打印模板参数复杂查询 + * * @param sysLabelTemplateParam * @return */ @@ -965,99 +1018,102 @@ public class CoreHqlPack { } - /** * 文件代码是否存在 + * * @param sysFile 查询条件 * @return DdlPackBean */ - public static DdlPackBean packHqlSysFileCode(SysFile sysFile){ + public static DdlPackBean packHqlSysFileCode(SysFile sysFile) { DdlPackBean result = DdlPackBean.getDdlPackBean(sysFile); // and - DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",result); + DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(), "fileCode", result); // not - DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(sysFile.getId(), "id", result); return result; } - public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){ + public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref) { DdlPackBean result = DdlPackBean.getDdlPackBean(ref); // Number Eq - DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result); + DdlPreparedPack.getNumEqualPack(ref.getUserId(), "userId", result); // String Eq - DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(), "organizeCode", result); return result; } - public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){ + public static DdlPackBean packDdlBeanSysRefUserRole(Long userId, Long roleId, String organizeCode) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // Number Eq - DdlPreparedPack.getNumEqualPack(userId,"userId",result); - DdlPreparedPack.getNumEqualPack(roleId,"roleId",result); + DdlPreparedPack.getNumEqualPack(userId, "userId", result); + DdlPreparedPack.getNumEqualPack(roleId, "roleId", result); // String Eq - DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); return result; } /** * 查询当前用户所有组织数据 + * * @param sysRefUserDepartments * @return */ - public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ + public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean); + DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()), "id", packBean); return packBean; } /** * 按条件查询字典 + * * @param sysDictionary * @return */ - public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){ + public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(sysDictionary); DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean); DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean); DdlPreparedPack.getStringEqualPack(sysDictionary.getParentNameRdd(), "parentNameRdd", packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(), "parentId", packBean); DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(),"dictionaryValue",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(), "dictionaryGroup", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(), "dictionaryValue", packBean); return packBean; } /** * 按条件查询字典 + * * @param bean * @return */ - public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean){ + public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean); - DdlPreparedPack.getNumEqualPack(bean.getRefId(),"refId",packBean); - DdlPreparedPack.getNumEqualPack(bean.getPlanId(),"planId",packBean); - DdlPreparedPack.getNumEqualPack(bean.getOperateType(),"operateType",packBean); - DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean); - DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean); - DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean); - DdlPreparedPack.timeBuilder(bean.getModifyDatetime(),"modifyDatetime",packBean,false,true); + DdlPreparedPack.getNumEqualPack(bean.getRefId(), "refId", packBean); + DdlPreparedPack.getNumEqualPack(bean.getPlanId(), "planId", packBean); + DdlPreparedPack.getNumEqualPack(bean.getOperateType(), "operateType", packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(), "refClass", packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(), "versionMethodName", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(), "pojoCompare", packBean); + DdlPreparedPack.timeBuilder(bean.getModifyDatetime(), "modifyDatetime", packBean, false, true); return packBean; } - public static DdlPackBean packSysDataSource(SysDataSource bean){ + public static DdlPackBean packSysDataSource(SysDataSource bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); DdlPreparedPack.getStringLikerPack(bean.getSourceHost(), "sourceHost", ddlPackBean); From 1d2c2b7be2b4f8c417d8be3fa0c908d7054bb5a1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 1 Jul 2020 22:23:20 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E6=99=BA?= =?UTF-8?q?=E8=83=BD=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/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b911540..d3df613 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 @@ -8330,7 +8330,7 @@ public class WmsEnumUtil { /** - * 发运看板状态 + * AUTO 命令状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AUTO_FORK_TASK_STATUS { From 3d826c5edcecefb26cc9ed5784aae249bc53ea46 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 1 Jul 2020 22:24:11 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E3=80=90=E6=99=BA=E8=83=BD=E5=8C=96?= =?UTF-8?q?=E5=BC=80=E5=8F=91-=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 91 ++++++++++++++++++++-- .../estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java | 7 ++ .../pojo/wms/modelbean/WmsAutoTaskModel.java | 4 + 3 files changed, 96 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 b911540..a24096c 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 @@ -8146,16 +8146,16 @@ public class WmsEnumUtil { /** * 动作类型 - * 10-锁定库存，20-解锁库存、30-锁定库位、40-解锁库位、50-锁定料车、60-解锁料车、70-生成任务、 + * 10-锁定库位，20-锁定库存、30-锁定料车、40-解锁库存、50-解锁库位、60-解锁料车、70-生成任务、 * 80-取消任务、90-递进交换 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STRATEGY_ACTION_TYPE { - LOCKING_IN_STOCK(10, "LOCKING_IN_STOCK", "锁定库存"), - UNLOCK_IN_STOCK(20, "UNLOCK_IN_STOCK", "解锁库存"), - LOCKING_LOCATE(30, "LOCKING_LOCATE", "锁定库位"), - UNLOCK_LOCATE(40, "UNLOCK_LOCATE", "解锁库位"), - LOCKING_FEED_CAR(50, "LOCKING_FEED_CAR", "锁定料车"), + LOCKING_LOCATE(10, "LOCKING_LOCATE", "锁定库位"), + LOCKING_IN_STOCK(20, "LOCKING_IN_STOCK", "锁定库存"), + LOCKING_FEED_CAR(30, "LOCKING_FEED_CAR", "锁定料车"), + UNLOCK_IN_STOCK(40, "UNLOCK_IN_STOCK", "解锁库存"), + UNLOCK_LOCATE(50, "UNLOCK_LOCATE", "解锁库位"), UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"), GENERATE_TASK(70, "GENERATE_TASK", "生成任务"), CANCEL_TASK(80, "CANCEL_TASK", "取消任务"), @@ -8374,4 +8374,83 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 自动化日志记录-操作类型 + * 10-单据生成，20-策略动作、30-任务生成、40-START、50-END、60-其它 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPERATE_TYPE { + ORDER_GENERATE(10, "ORDER_GENERATE", "单据生成"), + STRATEGIC_ACTION(20, "STRATEGIC_ACTION", "策略动作"), + TASK_GENERATE(30, "TASK_GENERATE", "任务生成"), + START(40, "START", "START"), + END(50, "END", "END"), + OTHER(60, "OTHER", "其它"); + + private int value; + private String code; + private String description; + + OPERATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static OPERATE_TYPE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java index 153e954..640c0d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,6 +47,11 @@ public class WmsAutoTaskLog extends BaseBean { @ApiParam("策略动作") public String strategyAction; + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OPERATE_TYPE.class) + public String operateType; + @Column(name = "ERROR_MSG") @ApiParam("错误信息") public String errorMsg; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java index bbfaa61..6b5d6b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.wms.bean.WmsAutoTaskLog; import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; @@ -64,6 +65,9 @@ public class WmsAutoTaskModel { @ApiParam("锁定条码") private List lockStockSnList; + @ApiParam("动作日志记录") + private WmsAutoTaskLog wmsAutoTaskLog; + @ApiParam("任务生成数量") private Double taskQty; From 7517a11a904d2acd0d5de7747312bc1b32587ab1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 3 Jul 2020 13:47:25 +0800 Subject: [PATCH 13/19] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2223]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 20 +---------- .../pojo/mes/model/ButtonComponentReqModel.java | 3 ++ .../mes/model/InjectionProductionControlModel.java | 42 ++++++++++++++++++++++ .../pojo/mes/model/MesWorkOrderExtendModel.java | 42 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationResultBean.java | 4 +++ 5 files changed, 92 insertions(+), 19 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java 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 0a67fe0..9cccc86 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 @@ -2,19 +2,16 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; -import com.alibaba.fastjson.JSONObject; 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 org.springframework.util.StringUtils; import javax.persistence.*; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description: @@ -159,7 +156,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Lob @Column(name = "EXTEND") @ApiParam("扩展数据") - private String extend; + public String extend; @Column(name = "RESERVED1") @ApiParam("预留字段1") @@ -273,10 +270,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { public String comButtonCode; @Transient - @ApiParam(value = "扩展数据MAP") - public Map extendMap; - - @Transient @ApiParam("工单源序号") private Double srcSeq; @@ -320,15 +313,4 @@ public class MesWorkOrder extends BaseBean implements Serializable { return this.approvalStatus == null ? 0 : this.approvalStatus; } - public Map getExtendMap() { - try { - if (!StringUtils.isEmpty(this.extend)) { - return JSONObject.parseObject(this.extend, Map.class); - } else { - return null; - } - } catch (Exception e) { - return null; - } - } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java index 93e598e..979d50d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java @@ -55,4 +55,7 @@ public class ButtonComponentReqModel { @ApiParam("用户信息") private String userInfo; + @ApiParam("json数据") + private String data; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java new file mode 100644 index 0000000..5c9d2e3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("注塑生产控制MODEL") +public class InjectionProductionControlModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("当前合格数量") + private String standardQtyCur; + + @ApiParam("当前合格数量") + private String completeQty; + + @ApiParam("总不合格数量") + private String scrapQty; + + @ApiParam("包装编号") + private String packageNo; + + @ApiParam("数量") + private String qty; + + @ApiParam("包装时间") + private String createDatetime; + + @ApiParam("箱条码状态") + private String printStatusName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java new file mode 100644 index 0000000..cf9c3a1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.springframework.beans.BeanUtils; +import org.springframework.util.StringUtils; + +import javax.persistence.Transient; +import java.util.HashMap; +import java.util.Map; + +/** + * @Description : 生产工单扩展 + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-03-30 13:42 + * @Modify: + **/ +@Data +@Api(value="生产工单扩展",description = "生产工单扩展") +public class MesWorkOrderExtendModel extends MesWorkOrder { + + @Transient + @ApiParam(value = "扩展数据MAP") + public Map extendMap; + + public Map getExtendMap() { + try { + if (!StringUtils.isEmpty(super.extend)) { + return JSONObject.parseObject(super.extend, Map.class); + } else { + return new HashMap<>(); + } + } catch (Exception e) { + return new HashMap<>(); + } + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java index 46db502..f039ece 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -58,4 +59,7 @@ public class StationResultBean implements Serializable { @ApiParam("特殊展示数据") private Object specialDisplayData; + + @ApiParam("工位参数") + private Map wcpcMap = new HashMap<>(); } From ad6249f412bb39236034f67df031b0ab6aeea633 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 3 Jul 2020 14:09:34 +0800 Subject: [PATCH 14/19] Finish Task #2235 Cost:8h --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/IfQueueShipping.java | 6 ++-- .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 6 +++- .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 --- .../pojo/mes/bean/MesQueueJitPlanDetail.java | 2 +- 5 files changed, 45 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 998da89..dfa6734 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6474,4 +6474,40 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT预装队列 工单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE { + SPARE_PART_PRODUCTION(10, "备件生产"), + REPRODUCTION_RMS(20, "重新生产-报功"), + REPRODUCTION_NOT_RMS(30, "重新生产-不报功"); + + private Integer value; + private String description; + + QUEUE_JIT_PLAN_WORK_ORDER_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index d65c83c..3088e6b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -126,10 +126,10 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "JIT_SEQ") @ApiParam("jit排序号") - private String jitSeq; + private Double jitSeq; @Column(name = "JIT_TYPE_FLAG") - @ApiParam("jit类型标识") + @ApiParam("JIT类型标识") private String jitTypeFlag; @Column(name = "CUST_POINT_DATE") @@ -138,7 +138,7 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "CUST_PLANT_CODE") @ApiParam("客户工厂代码") - private String custPlantDate; + private String custPlantCode; @Column(name = "DOCK_NO") @ApiParam("道口") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index 0f88155..db8ee80 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -79,7 +79,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "JIT_SEQ") @ApiParam("JIT排序号") - private String jitSeq; + private Double jitSeq; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") @@ -105,6 +105,10 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @ApiParam("解析文件路径") private String fileUrl; + @Column(name = "WORK_ORDER_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + @Transient @ApiParam("计划上线开始时间") private String planStartDate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index df5829a..5177ba9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -54,8 +54,4 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("用量") private Double qty; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品位置代码") - private String produceCtgyCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index 402d4c6..d290454 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -44,7 +44,7 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { private String partNo; @Column(name = "PART_NAME") - @ApiParam("产品名称") + @ApiParam("物料名称") private String partName; @Column(name = "PRODUCE_CTGY_CODE") From 7f4c173105e34b30e98dfa62bb162f8f24611866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 3 Jul 2020 16:47:40 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E3=80=902250=20=E6=80=BB=E8=A3=85?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0,2228=2006=201.2.4.6.1.7=20?= =?UTF-8?q?=E6=80=BB=E8=A3=85=E4=B8=8A=E7=BA=BF=E5=B7=A5=E4=BD=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 3 files changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 19f6de5..358e5d0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2407,6 +2407,16 @@ public class MesPcnEnumUtil { } return tmp; } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index a943c4a..83396d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -45,4 +45,8 @@ public class MesCustomerPart extends BaseBean implements Serializable { @Column(name = "CUSTOMER_PART_NAME") @ApiParam("客户零件描述") private String customerPartName; + + @Column(name = "CUSTOMER_CFG_CODE") + @ApiParam("客戶配置代碼") + private String customerCfgCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index a480700..07cadf3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -156,6 +156,9 @@ public class StationRequestBean implements Serializable { @ApiParam("状态机代码") private String smCode; + @ApiParam("区域代码") + private String areaCode; + @Override public String toString() { return "StationRequestBean{" + From 2d392825217537037126dfe1a4a7bcb7f3ec94bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 3 Jul 2020 17:14:08 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java index 16a9bfe..b6c5a7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -29,7 +29,7 @@ public class PaintWorkOrderSnModel extends BaseBean { private String partNo; @ApiParam("物料名称") - private String partNameRdd; + private String partName; @ApiParam("颜色代码") private String colorCode; From 04eaa0201fb1e53d2ab6a921d58e229fc713736c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Jul 2020 19:26:19 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index df5829a..5177ba9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -54,8 +54,4 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("用量") private Double qty; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品位置代码") - private String produceCtgyCode; } From b48d38ee62589a35235ddad07fd4448c44f0ca15 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 3 Jul 2020 19:43:43 +0800 Subject: [PATCH 18/19] Finish Task #2080 Cost:8h --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 211be8f..d298220 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 @@ -1367,7 +1367,8 @@ public class WmsEnumUtil { PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), ZORE_STOCK(130, "零库存"), - MATERIAL_COVERAGE(140, "物料覆盖"); + MATERIAL_COVERAGE(140, "物料覆盖"), + CHECK(150, "点检"); private int value; private String description; From 98849d3131859eeafedb5d7dc3b34fbc17ff9443 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Jul 2020 21:15:42 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E8=B0=83=E6=95=B4jitseq=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index db8ee80..b55af50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -79,7 +79,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "JIT_SEQ") @ApiParam("JIT排序号") - private Double jitSeq; + private String jitSeq; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码")