From 6204ff8538ab800706114c98d054b1649dfc7f63 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 24 Apr 2019 14:37:24 +0800 Subject: [PATCH 1/7] =?UTF-8?q?#3961+MASTER=5FORDER=5FNO=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0Code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index dd4ba2e..389d72a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -139,17 +139,19 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "处理中"), - RECEIPT_FINISH(30, "已完成"), - CLOSED(40, "已关闭"), - CANCELLED(50, "已取消"); + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "处理中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), + CLOSED(40, "CLOSED", "已关闭"), + CANCELLED(50, "CANCELLED", "已取消"); private int value; + private String code; private String description; - MASTER_ORDER_STATUS(int value, String description) { + MASTER_ORDER_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -161,6 +163,10 @@ public class WmsEnumUtil { return description; } + public String getCode() { + return code; + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From ee33834f9a4b629ea39f7a711fcede3fe0984eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 24 Apr 2019 15:27:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 12cca86..4f2c0c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1028,7 +1028,7 @@ public class WmsHqlPack { } /** - * 针对质检查询库存移动条码条件封装 + * 针对质检查询库存移动条码条件封装(特殊处理) * @param sn * @return */ From c119c061302cb63668b9cea29d1f28f623cf0a74 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 24 Apr 2019 17:47:52 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=20=E4=BD=BF=E7=94=A8Redis=201.0=20=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/dynamic/DynamicEntity.java | 2 +- .../cn/estsh/i3plus/pojo/form/bean/BfCascade.java | 2 +- .../estsh/i3plus/pojo/form/bean/BfDataObject.java | 5 ++++ .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 34 +++++++++++++++++++--- .../estsh/i3plus/pojo/form/bean/BfElementGrid.java | 12 -------- .../estsh/i3plus/pojo/model/form/ElementModel.java | 5 +++- 6 files changed, 41 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 5665951..c603b99 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -182,7 +182,7 @@ public class DynamicEntity extends BaseBean implements Serializable { public boolean isDefaultField(String fieldName){ if (!ATTR_PREFIX.equals(fieldName)) { if("propertyList".equals(fieldName) || "dynProperty".equals(fieldName) || "childList".equals(fieldName) - || "LOGGER".equals(fieldName)){ + || "LOGGER".equals(fieldName) || "ATTR_PREFIX".equals(fieldName)){ return true; } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java index 7317e1b..44bd93e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java @@ -53,5 +53,5 @@ public class BfCascade extends BaseBean { @Transient @ApiParam(value = "元素详细") @AnnoOutputColumn(hidden = true) - private List detailList; + private List childList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index 6648ee4..7208908 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -68,4 +68,9 @@ public class BfDataObject extends BaseBean { @AnnoOutputColumn(hidden = true) private List propertyList; + @Transient + @ApiParam(value = "元素对象虚拟属性") + @AnnoOutputColumn(hidden = true) + List virtualList; + } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 507a3a2..7f8fbae 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -45,6 +45,16 @@ public class BfElement extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long dataObjectId; + //外键关联数据对象主键 + @Column(name = "ELEMENT_PROPERTY_PRIMARY_KEY") + @ApiParam(value = "元素主键Key ", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementPropertyPrimaryKey; + + @Column(name="ELEMENT_PROPERTY_PRIMARY_KEY_NAME_RDD") + @ApiParam(value ="元素主键Key名称") + private String elementPropertyPrimaryKeyNameRdd; + @Column(name="ELEMENT_TYPE") @ApiParam(value ="元素类型") private Integer elementType; @@ -57,14 +67,30 @@ public class BfElement extends BaseBean { @ApiParam(value ="元素编码") private String elementCode; - @Column(name="ELEMENT_ATTR_ID") + @Column(name = "IS_OBJECT_ADD") + @ApiParam(value = "是否新增") + private Integer isObjectAdd; + + @Column(name = "IS_OBJECT_EDIT") + @ApiParam(value = "是否编辑") + private Integer isObjectEdit; + + @Column(name = "IS_OBJECT_DEL") + @ApiParam(value = "是否删除") + private Integer isObjectDel; + + @Column(name="ELEMENT_SORT_ATTR_ID") @ApiParam(value ="默认排序属性") @JsonSerialize(using = ToStringSerializer.class) - private Long elementAttrId; + private Long elementSortAttrId; + + @Column(name="ELEMENT_SORT_ATTR_CODE_RDD") + @ApiParam(value ="默认排序属性名称") + private String elementSortAttrCodeRdd; - @Column(name="ELEMENT_SORT_TYPE") + @Column(name="ELEMENT_SORT_ATTR_TYPE") @ApiParam(value ="默认排序规则") - private Integer elementSortType; + private Integer elementSortAttrType; @Column(name="ELEMENT_CSS_STYLE") @ApiParam(value ="元素样式") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java index d0eb771..86a7c19 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java @@ -44,18 +44,6 @@ public class BfElementGrid extends BaseBean { @ApiParam(value = "是否单选") private Integer isLineMultiple; - @Column(name = "IS_OBJECT_ADD") - @ApiParam(value = "是否新增") - private Integer isObjectAdd; - - @Column(name = "IS_OBJECT_EDIT") - @ApiParam(value = "是否编辑") - private Integer isObjectEdit; - - @Column(name = "IS_OBJECT_DEL") - @ApiParam(value = "是否删除") - private Integer isObjectDel; - @Column(name = "IS_OBJECT_FIND") @ApiParam(value = "是否查询") private Integer isObjectFind; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java index 0e41729..82e59d5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java @@ -39,8 +39,11 @@ public class ElementModel{ @ApiParam(value = "元素基础虚拟属性信息") private List virtualList; + @ApiParam(value = "级联信息集合") + private List cascadeList; + @ApiParam(value = "动态对象Class") - private Class dynClass; + private transient Class dynClass; @ApiParam(value = "数据对象信息") private BfDataObject dataObject; From 0744d38714c4ad2547b0505e73de9657552d9576 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 24 Apr 2019 17:51:47 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=89=8D=E5=90=8E=E7=AB=AF=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E6=8E=89=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E6=8A=8A=E5=85=B3=E8=81=94=E5=8D=95=E5=8F=B7=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=8F=AF=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 -- 2 files changed, 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index d8a367b..198fd32 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -72,10 +72,6 @@ public class WmsQCMaster extends BaseBean { @ApiParam("关联单号") public String refSrc; - @Column(name = "IB_NO") - @ApiParam("入库单号") - public String ibNo; - @Transient @ApiParam(value = "客户简称") private String custName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 4f2c0c6..5af3c38 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1066,8 +1066,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); //关联单据号 HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); - //入库单号 - HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result); getStringBuilderPack(wmsQCMaster, result); From 461aa2fc1bf58f4f5437cd760316d61179f82d70 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Wed, 24 Apr 2019 18:54:53 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=93=E5=8D=B0=EF=BC=8C=E9=9D=9E=E6=A0=87=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=EF=BC=8Cexcelutil=E7=A9=BA=E8=A1=8C=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 7b145f4..4dc38bb 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -103,6 +103,11 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam(value = "包装编号") private String packageNo; + @ColumnDefault("0") + @Column(name = "WEIGHT") + @ApiParam(value = "重量") + private Double weight; + @Transient @ApiParam(value = "是否可编辑（前端使用）") private boolean isSet = false; From a62ead1c25397cacc9b5cb2a1166c363741291f2 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 24 Apr 2019 20:44:42 +0800 Subject: [PATCH 6/7] =?UTF-8?q?Mes=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 +++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 5 ++ .../cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java | 2 +- .../i3plus/pojo/mes/bean/MesProdCfgDetail.java | 5 ++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 76 +++++++++++++++++++ .../mes/engine/script/EngineScriptPersistence.java | 66 ++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 87 +++++++++++++++++++++- 7 files changed, 273 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java 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 19e3575..1c24500 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 @@ -457,4 +457,41 @@ public class MesEnumUtil { return tmp; } } + + /** + * MesPartCategory实体对应的categoryType值 条码表条码质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_CATEGORY_TYPE{ + + CATEGORY_ONE("Category1","类型1"), + CATEGORY_TWO("Category2","类型2"), + CATEGORY_THREE("Category3","类型3"); + + private String value; + private String description; + + PART_CATEGORY_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.equals(values()[i].value) ) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index f2efe75..6ae5e60 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :物料信息 @@ -71,4 +72,8 @@ public class MesPart extends BaseBean { @Column(name="PRODUCE_CATEGORY") @ApiParam("产品类型") private String produceCategory; + + @Transient + @ApiParam("分类名称") + private String categoryName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java index 9d3d071..8709d07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java @@ -34,7 +34,7 @@ public class MesProdCfg extends BaseBean { @Column(name="PROD_CFG_NAME") @ApiParam("产品配置名称") - private String prodCfgTypeName; + private String prodCfgName; @Column(name="PROD_CFG_Type_CODE") @ApiParam("产品配置类型代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index 5ed96a8..b0e12ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :产品配置明细 @@ -40,6 +41,10 @@ public class MesProdCfgDetail extends BaseBean { @ApiParam("是否虚零件") private Integer isVirtual; + @Transient + @ApiParam("零件名称") + private String partName; + public int getIsVirtualVal() { return this.isVirtual == null ? 0 : this.isVirtual; } 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 11fe2b1..cd971f2 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +13,9 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Arrays; +import java.util.List; /** * @Description: @@ -35,6 +40,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("物料号") private String partNo; + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + @Column(name="PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; @@ -111,6 +120,73 @@ public class MesWorkOrder extends BaseBean { @ApiParam("备注") private String memo; + /********************** 冗余字段 *********************************/ + @Transient + @ApiParam(value="工作中心名称") + public String workCenterName; + + @Transient + @ApiParam(value="工作单元名称") + public String workCellName; + + @Transient + @ApiParam(value="客户产线名称") + public String custProdLineName; + + @Transient + @ApiParam(value="班次名称") + public String shiftName; + + @Transient + @ApiParam(value="产品配置名称") + public String prodCfgName; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + + @Transient + @ApiParam("工单类型枚举") + private List workOrderTypeDropData; + + public List getWorkOrderTypeDropData() { + return Arrays.asList(MesEnumUtil.WORK_ORDER_TYPE.values()); + } + + @Transient + @ApiParam("工单状态枚举") + private List workOrderStatusDropData; + + public List getWorkOrderStatusDropData() { + return Arrays.asList(MesEnumUtil.WORK_ORDER_STATUS.values()); + } + + @Transient + @ApiParam("工单来源枚举") + private List workOrderSourceDropData; + + public List getWorkOrderSourceDropData() { + return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values()); + } + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java new file mode 100644 index 0000000..90ea6c9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.engine.script; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.script.CompiledScript; + +/** + * 脚本持久化实体类 + * + * @author Rock.Yu + * @since 2019-03-18 14:22 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SCRIPT_PERSISTENCE") +@Api("系统动态脚本") +public class EngineScriptPersistence extends BaseBean { + // 脚本调用的唯一编号，例如：WMS_PDA_0001 + @Column(name = "SCRIPT_NO", length = 50) + private String scriptNo; + // 脚本的中文名称 + @Column(name = "SCRIPT_NAME", length = 50) + private String scriptName; + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 + @Column(name = "SCRIPT_TYPE") + private int scriptType; + // 脚本编写的语言 + // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + @Column(name = "LANGUAGE_TYPE") + private int languageType; + // 脚本的具体内容 + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + private String scriptContent; + // 脚本的描述，包含脚本的用法，参数说明等 + @Column(name = "SCRIPT_REMARK", length = 2000) + private String scriptRemark; + // 编译后的脚本内容，通过预编译加快脚本的运行速度 + @Transient + private CompiledScript compiledScript; + + public EngineScriptPersistence() {} + + // 构造方法，便于批量创建数据 + public EngineScriptPersistence(long id, String scriptNo, String scriptName, int scriptType, int languageType, + String scriptContent, String scriptRemark) { + this.id = id; + this.scriptNo = scriptNo; + this.scriptName = scriptName; + this.scriptType = scriptType; + this.languageType = languageType; + this.scriptContent = scriptContent; + this.scriptRemark = scriptRemark; + } +} 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 a05974a..53395a7 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 @@ -4,7 +4,9 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesPart; import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; import org.apache.commons.lang3.StringUtils; /** @@ -34,9 +36,9 @@ public class MesHqlPack { * @param mesPlanOrder * @return */ - public static DdlPackBean getPlanOrderCondition(MesPlanOrder mesPlanOrder) { + public static DdlPackBean getPlanOrderCondition(MesPlanOrder mesPlanOrder, String organizeCode) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCustCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); @@ -49,7 +51,6 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "")) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatusVal(), "status", packBean); } @@ -57,6 +58,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean); } + // 时间段查询 DdlPreparedPack.timeBuilder( mesPlanOrder.getStartTimeStart(), mesPlanOrder.getStartTimeEnd(), @@ -69,11 +71,88 @@ public class MesHqlPack { mesPlanOrder.getCreateDateTimeStart(), mesPlanOrder.getCreateDateTimeEnd(), "createDateTime", packBean, true); + // 排序 - DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPlanOrder.getOrderByParam()} , packBean); DdlPreparedPack.getOrderDefault(mesPlanOrder); + DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPlanOrder.getOrderByParam()} , packBean); return packBean; } + /** + * 物料信息查询条件封装 + * @param mesPart + * @return + */ + public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + + if (StringUtils.isNotEmpty(mesPart.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); + } + DdlPreparedPack.getOrderDefault(mesPart); + DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPart.getOrderByParam()} , packBean); + return packBean; + } + + /** + * 物料信息查询条件封装 + * @param mesPart + * @return + */ + public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesWorkOrder.getOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "")) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCellCode(), "workCellCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "")) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getProdCfgCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + } + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + DdlPreparedPack.getOrderDefault(mesWorkOrder); + DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean); + return packBean; + } } From 588a517ae19ee773f300b96a1297d6140cbf568b Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 25 Apr 2019 08:56:42 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsTaskInfoModel.java | 34 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 ++-- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java new file mode 100644 index 0000000..1359294 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 任务单模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsTaskInfoModel implements Serializable { + @ApiParam("任务单号") + public String orderNo; + + @ApiParam("关联单号") + public String refSrc; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + @ApiParam(value = "任务状态", example = "1") + public Integer taskStatus; + + @ApiParam("作业类型名称") + public String opTypeName; + + @ApiParam(value = "关联单据类型") + private String refType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 5af3c38..90234b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1514,12 +1514,12 @@ public class WmsHqlPack { * 给定字段动态in sql * * @param columnName - * @param values + * @param orderNo * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List values) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , String orderNo) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getInPackList(values, columnName, packBean); + DdlPreparedPack.getInPack(orderNo, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);