From 129e60a6dfba8066f32bd4fa27e66afc23654dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 11 Dec 2019 13:23:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90KT-1284=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 157 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 66 +++++++++ .../repository/WmsPullTaskDetailsRepository.java | 17 +++ .../repository/WmsPullTaskMasterRepository.java | 17 +++ 4 files changed, 257 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java new file mode 100644 index 0000000..09f05c2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -0,0 +1,157 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS_拉动计划任务明细表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-10 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PULL_TASK_DETAILS") +@Api("WMS_拉动计划任务明细表") +public class WmsPullTaskDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592736L; + + @Column(name="WROKORDER_NO") + @ApiParam("工单号") + private String woekorderNo; + + @Column(name="ITEM") + @ApiParam(value = "行号", example = "0") + private Integer item = 0; + + @Column(name="TERMINAL_NO") + @ApiParam("工位代码") + private String terminalNo; + + @Column(name="LOCATE_NO") + @ApiParam("库位代码") + private String locateNo; + + @Column(name="LOCATE_CAPACITY") + @ApiParam("库位容量") + private String locateCapacity; + + @Column(name="PART_NO") + @ApiParam("零件编号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("零件名称") + private String partNameRdd; + + @Column(name="PLAN_PACK_COUNT") + @ApiParam(value = "计划容器数", example = "0") + private Integer planPackCount = 0; + + @Column(name="FIRST_BATCH_QTY") + @ApiParam(value = "首批批量", example = "0") + private Integer firstBatchQty = 0; + + @Column(name="FIRST_PACK_COUNT") + @ApiParam(value = "首批容器数", example = "0") + private Integer firstPackCount = 0; + + @Column(name="REQUEST_QTY") + @ApiParam(value = "补货批量", example = "0") + private Integer requestQty = 0; + + @Column(name="REQUEST_PACK_COUNT") + @ApiParam(value = "补货容器数", example = "0") + private Integer requestPackCount = 0; + + @Column(name="REQUEST_LOT_NO") + @ApiParam(value = "补货批次", example = "0") + private Integer requestLotNo = 0; + + @Column(name="REQUEST_TOTAL_COUNT") + @ApiParam(value = "补货累加次数", example = "0") + private Integer requestTotalCount = 0; + + @Column(name="LAST_REQUEST_TIME") + @ApiParam("上一次补货时间") + private String lastRequestTtime; + + @Column(name="BOOT_QTY") + @ApiParam(value = "尾箱批量", example = "0") + private Integer bootQty = 0; + + @Column(name="BOOT_PACK_COUNT") + @ApiParam(value = "尾箱容器数", example = "0") + private Integer bootPackCount = 0; + + @Column(name="BOOT_LOT_NO") + @ApiParam(value = "尾箱批次", example = "0") + private Integer bootLotNo = 0; + + @Column(name="ORDER_STATUS") + @ApiParam(value = "单据状态", example = "0") + private Integer orderStatus = 0; + + public Integer getOrderStatus() { + return orderStatus == null ? 0 : this.orderStatus.intValue(); + } + + public Integer getBootLotNo() { + return bootLotNo == null ? 0 : this.bootLotNo.intValue(); + } + + public Integer getBootPackCount() { + return bootPackCount == null ? 0 : this.bootPackCount.intValue(); + } + + public Integer getBootQty() { + return bootQty == null ? 0 : this.bootQty.intValue(); + } + + public Integer getRequestTotalCount() { + return requestTotalCount == null ? 0 : this.requestTotalCount.intValue(); + } + + public Integer getRequestLotNo() { + return requestLotNo == null ? 0 : this.requestLotNo.intValue(); + } + + public Integer getRequestPackCount() { + return requestPackCount == null ? 0 : this.requestPackCount.intValue(); + } + + public Integer getRequestQty() { + return requestQty == null ? 0 : this.requestQty.intValue(); + } + + public Integer getFirstPackCount() { + return firstPackCount == null ? 0 : this.firstPackCount.intValue(); + } + + public Integer getFirstBatchQty() { + return firstBatchQty == null ? 0 : this.firstBatchQty.intValue(); + } + + public Integer getPlanPackCount() { + return planPackCount == null ? 0 : this.planPackCount.intValue(); + } + + public Integer getItem() { + return item == null ? 0 : this.item.intValue(); + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java new file mode 100644 index 0000000..03a57f9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS_拉动计划任务主表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-09 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PULL_TASK_MASTER") +@Api("WMS_拉动计划任务主表") +public class WmsPullTaskMaster extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592736L; + + @Column(name="WROKORDER_NO") + @ApiParam("工单号") + private String woekorderNo; + + @Column(name="PDLINE_NO") + @ApiParam("产线代码") + private String pdlineNo; + + @Column(name="PLAN_PRODUCT_TIME") + @ApiParam("生产日期") + private String planProductTime; + + @Column(name="SHIFT_NO") + @ApiParam("班次代码") + private String shitNo; + + @Column(name="START_PRODUCT_TIME") + @ApiParam("开始生产时间") + private String startProductTime; + + @Column(name="END_PRODUCT_TIME") + @ApiParam("结束生产时间") + private String endProductTime; + + @Column(name="ORDER_STATUS") + @ApiParam(value = "单据状态", example = "0") + private Integer orderStatus = 0; + + public Integer getOrderStatus() { + return orderStatus == null ? 0 : this.orderStatus.intValue(); + } + + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java new file mode 100644 index 0000000..9983761 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description :wms拉动计划明细表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-12-11 14:49 + * @Modify: + **/ +@Repository +public interface WmsPullTaskDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java new file mode 100644 index 0000000..563dbb0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description :wms拉动计划主表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-12-11 14:49 + * @Modify: + **/ +@Repository +public interface WmsPullTaskMasterRepository extends BaseRepository { +} From 79377f2da60dcb8b88318ba7db5f649d77a552b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 11 Dec 2019 13:39:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index cb0905e..49e34bf 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.lac.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -75,6 +77,7 @@ public class LacSuitTaskParam extends BaseBean { @Column(name="PARAM_TYPE") @ApiParam(value ="参数类型") + @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_TYPE.class) private Integer paramType; @Column(name="PARAM_VALUE_TYPE") From fc663ee2838cdb8770f2f64d9ad4f01a3ee7b9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 11 Dec 2019 14:58:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BABUG#6189?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 24 ++++++- .../i3plus/pojo/model/wms/WmsAgImportModel.java | 44 ++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 23 +++--- .../pojo/wms/bean/WmsActionGroupDetails.java | 84 ++++++++++++---------- .../i3plus/pojo/wms/bean/WmsActionModule.java | 24 ++++--- .../i3plus/pojo/wms/bean/WmsActionModuleParam.java | 20 ++++-- .../estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 17 +++-- .../i3plus/pojo/wms/bean/WmsActionStepCall.java | 20 ++++-- .../pojo/wms/bean/WmsActionStepCallParam.java | 15 ++-- .../i3plus/pojo/wms/bean/WmsActionStepType.java | 18 +++-- 10 files changed, 200 insertions(+), 89 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 385c27e..d72a035 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 @@ -51,6 +51,26 @@ public class WmsEnumUtil { } return null; } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descriptionOfValue(String desc) { + int tmp = DISABLE.value; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -1883,7 +1903,7 @@ public class WmsEnumUtil { * 成功标志枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RC_OK_VALUE { + public enum AM_OK_VALUE { IS_TRUE(10, true, "成功"), IS_FALSE(20, false, "失败"); @@ -1892,7 +1912,7 @@ public class WmsEnumUtil { private boolean codeValue; private String description; - RC_OK_VALUE(int value, boolean codeValue, String description) { + AM_OK_VALUE(int value, boolean codeValue, String description) { this.value = value; this.codeValue = codeValue; this.description = description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java new file mode 100644 index 0000000..4d3f2fd --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 作业流程导入Model + * @Reference + * @Author dragon + * @CreateDate 2019/12/10 11:26 + * @Modify + */ +@Data +@Api("作业流程导入Model") +public class WmsAgImportModel implements Serializable { + private static final long serialVersionUID = 5322363872992177667L; + @ApiParam("流程集合") + public List agList; + @ApiParam("流程明细集合") + List agdList; + @ApiParam("步骤调用参数集合") + List ascpList; + @ApiParam("作业步骤集合") + List asList; + @ApiParam("作业步骤调用集合") + List ascList; + @ApiParam("作业组件集合") + List amList; + @ApiParam("作业组件参数集合") + List ampList; + @ApiParam("作业步骤参数类型集合") + List astList; + @ApiParam("工厂代码") + public String organizeCode; + @ApiParam("是否覆盖") + public Integer isConvert; + @ApiParam("用户名") + public String userName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 336e497..9d502de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -29,45 +30,49 @@ import javax.persistence.*; public class WmsActionGroup extends BaseBean { private static final long serialVersionUID = -4169996695337717755L; - @Column(name = "AG_NAME_E") + @Column(name = "AG_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam("英文流程名称") private String agNameE; - @Column(name = "AG_DESC_E") + @Column(name = "AG_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam("英文流程描述") private String agDescE; - @Column(name = "AG_NAME_C") + @Column(name = "AG_NAME_C", nullable = false) @ApiParam("中文流程名称") + @AnnoOutputColumn private String agNameC; - @Column(name = "AG_DESC_C") + @Column(name = "AG_DESC_C", nullable = false) @ApiParam("中文流程描述") + @AnnoOutputColumn private String agDescC; - @Column(name = "INIT_AM_ID") + @Column(name = "INIT_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "初始化组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; - @Column(name = "DETAILS_AM_ID") + @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "明细处理组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; - @Column(name = "END_AM_ID") + @Column(name = "END_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "结束组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; // 1=true, 2 = false - @Column(name = "AUTO_INIT") + @Column(name = "AUTO_INIT", nullable = false) @ApiParam(value = "任务自动初始化", example = "0") + @AnnoOutputColumn private Integer autoInit; // 1=true, 2 = false - @Column(name = "IS_COMMIT_REF_MOVE", columnDefinition = "int default 2", nullable = false) + @Column(name = "IS_COMMIT_REF_MOVE", nullable = false) @ApiParam(value = "是否连带提交创建状态移动单", example = "2") + @AnnoOutputColumn private Integer isCommitRefMove; @Lob diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index fc0f62b..5878561 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -32,98 +33,107 @@ import javax.persistence.Transient; public class WmsActionGroupDetails extends BaseBean { private static final long serialVersionUID = 544189352378073377L; - @Column(name = "AG_ID") + @Column(name = "AG_ID", nullable = false) @ApiParam(value = "作业流程ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long agId; - @Column(name = "SEQ") + @Column(name = "SEQ", nullable = false) @ApiParam(value = "序号", example = "0") + @AnnoOutputColumn private Integer seq; - @Column(name = "OK_SEQ") + @Column(name = "OK_SEQ", nullable = false) @ApiParam(value = "成功跳转步骤", example = "0") + @AnnoOutputColumn private Integer okSeq; - @Column(name = "NG_SEQ") + @Column(name = "NG_SEQ",nullable = false) @ApiParam(value = "失败跳转步骤", example = "0") + @AnnoOutputColumn private Integer ngSeq; - @Column(name = "VALUE_TYPE") + @Column(name = "VALUE_TYPE", nullable = false) @ApiParam(value = "动作类型", example = "10") + @AnnoOutputColumn private Integer valueType; - @Column(name = "TO_UPPER") + @Column(name = "TO_UPPER", nullable = false) @ApiParam(value = "是否转为大写", example = "2") + @AnnoOutputColumn private Integer toUpper; - @Column(name = "LEN_CHECK") + @Column(name = "LEN_CHECK", columnDefinition = "int default 0") @ApiParam(value = "长度检查", example = "0") private Integer lenCheck; - @Column(name = "REGULAR_CHECK") + @Column(name = "REGULAR_CHECK", columnDefinition = "varchar(1000) default ''") @ApiParam(value = "正则校验") private String regularCheck; - @Column(name = "REGULAR_CHECK_FAIL_MSG") + @Column(name = "REGULAR_CHECK_FAIL_MSG", columnDefinition = "varchar(1000) default ''") @ApiParam(value = "正则校验失败提示") private String regularCheckFailMsg; - @Column(name = "AS_ID") - @ApiParam(value = "作业步骤", example = "0") + @Column(name = "AS_ID", nullable = false) + @ApiParam(value = "作业步骤") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long asId; - @Column(name = "AT_ID") - @ApiParam(value = "步骤类型编号", example = "0") + @Column(name = "AT_ID", nullable = false) + @ApiParam(value = "步骤类型编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long atId; - @Transient - @ApiParam(value = "作业步骤名称") - private String asName; - - @Transient - @ApiParam(value = "步骤类型名称") - private String atName; - - @Transient - @ApiParam(value = "流程名称") - private String agName; - - @Column(name = "GOTO_BTN_CODE") + @Column(name = "GOTO_BTN_CODE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "跳转按钮代码") private String goToBtnCode; - @Column(name = "GOTO_BTN_NAME") + @Column(name = "GOTO_BTN_NAME", columnDefinition = "varchar(225) default ''") @ApiParam(value = "跳转按钮名称") private String goToBtnName; - @Column(name = "PRE_SHOW") - @ApiParam(value = "是否预显示", example = "1") + @Column(name = "PRE_SHOW", columnDefinition = "int default 0") + @ApiParam(value = "是否预显示") private Integer preShow; - @Column(name = "SHOW_AM_ID") - @ApiParam(value = "回显组件方法ID", example = "1") + @Column(name = "SHOW_AM_ID", columnDefinition = "bigint(20) default 0") + @ApiParam(value = "回显组件方法ID") @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; - @Column(name = "IS_COMMIT_ABLE") - @ApiParam(value = "是否可提交", example = "2") + @Column(name = "IS_COMMIT_ABLE", nullable = false) + @ApiParam(value = "是否可提交") + @AnnoOutputColumn private Integer isCommitAble; - @Column(name = "IS_AUTO_OPEN_WINDOW") - @ApiParam(value = "是否自动开窗", example = "2") + @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false) + @ApiParam(value = "是否自动开窗") private Integer isAutoOpenWindow; - @Column(name = "SEARCH_KEY") + @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''") @ApiParam(value = "搜索KEY") private String searchKey; - @Column(name = "GROUP_KEY") + @Column(name = "GROUP_KEY", columnDefinition = "varchar(225) default ''") @ApiParam(value = "分组KEY") private String groupKey; + @Transient + @ApiParam(value = "作业步骤名称") + private String asName; + + @Transient + @ApiParam(value = "步骤类型名称") + private String atName; + + @Transient + @ApiParam(value = "流程名称") + private String agName; + public int getSeqVal() { return this.seq == null ? 0 : this.seq; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index a41ef59..d43b2d8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -29,31 +30,36 @@ import javax.persistence.Table; public class WmsActionModule extends BaseBean { private static final long serialVersionUID = 9117362998863937579L; - @Column(name = "AM_NAME") + @Column(name = "AM_NAME",nullable = false) @ApiParam("组件名称") + @AnnoOutputColumn public String amName; - @Column(name = "AM_DESC") + @Column(name = "AM_DESC", nullable = false) @ApiParam("组件描述") + @AnnoOutputColumn public String amDesc; - @Column(name = "CALL_CLASS") + @Column(name = "CALL_CLASS",nullable = false) @ApiParam("实现类") + @AnnoOutputColumn public String callClass; - @Column(name = "AM_TYPE") - @ApiParam(value = "组件类型", example = "0") + @Column(name = "AM_TYPE", nullable = false) + @ApiParam(value = "组件类型") + @AnnoOutputColumn public Integer amType; - @Column(name = "OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "作业类型") public String opTypeCode; - @Column(name = "IS_SHOW_INFO") - @ApiParam(value = "是否实现回显", example = "0") + @Column(name = "IS_SHOW_INFO", nullable = false) + @ApiParam(value = "是否实现回显") + @AnnoOutputColumn public Integer isShowInfo; - @ApiParam(value = "作业类型名称", example = "0") + @ApiParam(value = "作业类型名称") public String opTypeName; public WmsActionModule() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index a87c559..1923bb0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -31,29 +32,34 @@ import javax.persistence.Table; public class WmsActionModuleParam extends BaseBean { private static final long serialVersionUID = 8099621042858629818L; - @Column(name = "AM_ID") - @ApiParam(value = "组件ID", example = "0") + @Column(name = "AM_ID", nullable = false) + @ApiParam(value = "组件ID") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long amId; - @Column(name = "METHOD_NAME") + @Column(name = "METHOD_NAME", columnDefinition = "varchar(255) default ''") @ApiParam("组件执行方法名称") + @AnnoOutputColumn public String methodName; - @Column(name = "PARAM_CODE") + @Column(name = "PARAM_CODE", nullable = false) @ApiParam("参数编码") + @AnnoOutputColumn public String paramCode; - @Column(name = "PARAM_NAME") + @Column(name = "PARAM_NAME", nullable = false) @ApiParam("参数名称") + @AnnoOutputColumn public String paramName; - @Column(name = "PARAM_VALUE_LIST") + @Column(name = "PARAM_VALUE_LIST", columnDefinition = "varchar(225) default ''") @ApiParam("参数可选值列表") public String paramValueList; - @Column(name = "PARAM_TYPE") + @Column(name = "PARAM_TYPE",nullable = false) @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0") + @AnnoOutputColumn public Integer paramType; public int getParamTypeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index 265272b..8144c65 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -31,29 +32,33 @@ import javax.persistence.Table; public class WmsActionStep extends BaseBean { private static final long serialVersionUID = 6460096995982059959L; - @Column(name = "AS_NAME_E") + @Column(name = "AS_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型名称") private String asNameE; - @Column(name = "AS_DESC_E") + @Column(name = "AS_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型描述") private String asDescE; - @Column(name = "AS_NAME_C") + @Column(name = "AS_NAME_C", nullable = false) @ApiParam(value = "中文类型名称") + @AnnoOutputColumn private String asNameC; - @Column(name = "AS_DESC_C") + @Column(name = "AS_DESC_C", nullable = false) @ApiParam(value = "中文类型描述") + @AnnoOutputColumn private String asDescC; - @Column(name = "AT_NAME_C_RDD") + @Column(name = "AT_NAME_C_RDD", nullable = false) @ApiParam(value = "步骤类型名称") + @AnnoOutputColumn private String atNameCRdd; - @Column(name = "AT_ID") + @Column(name = "AT_ID", nullable = false) @ApiParam(value = "步骤类型编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long atId; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 4b8388f..c354a66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -33,18 +34,21 @@ import javax.persistence.*; public class WmsActionStepCall extends BaseBean { private static final long serialVersionUID = -6013283534745803464L; - @Column(name = "AS_ID") + @Column(name = "AS_ID",nullable = false) @ApiParam(value = "作业步骤ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long asId; - @Column(name = "SEQ") + @Column(name = "SEQ",nullable = false) @ApiParam(value = "序号", example = "0") + @AnnoOutputColumn public Integer seq; - @Column(name = "AM_ID") + @Column(name = "AM_ID", nullable = false) @ApiParam(value = "处理组件ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long amId; @Transient @@ -55,12 +59,14 @@ public class WmsActionStepCall extends BaseBean { @ApiParam(value = "组件描述") public String amDesc; - @Column(name = "AM_TYPE") - @ApiParam(value = "组件类型", example = "0") + @Column(name = "AM_TYPE",nullable = false) + @ApiParam(value = "组件类型") + @AnnoOutputColumn public Integer amType; - @Column(name = "OK_VALUE") - @ApiParam(value = "成功标志", example = "10") + @Column(name = "OK_VALUE", nullable = false) + @ApiParam(value = "成功标志") + @AnnoOutputColumn public Integer okValue; public int getAmTypeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index ee0b539..41ceb88 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -32,25 +33,29 @@ import javax.persistence.Transient; public class WmsActionStepCallParam extends BaseBean { private static final long serialVersionUID = -2813779192436803301L; - @Column(name = "AGD_ID") + @Column(name = "AGD_ID", nullable = false) @ApiParam(value = "流程明细编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long agdId; - @Column(name = "SEQ") + @Column(name = "SEQ",nullable = false) @ApiParam(value = "序号") + @AnnoOutputColumn private Integer seq; - @Column(name = "AM_ID") + @Column(name = "AM_ID", nullable = false) @ApiParam(value = "处理组件编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long amId; - @Column(name = "PARAM_CODE") + @Column(name = "PARAM_CODE",nullable = false) @ApiParam(value = "参数编码") + @AnnoOutputColumn private String paramCode; - @Column(name = "PARAM_VALUE") + @Column(name = "PARAM_VALUE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "参数值") private String paramValue; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java index 926e108..4f8536b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -21,31 +22,34 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_ACTION_TYPE") +@Table(name = "WMS_ACTION_TYPE") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="作业步骤类型信息",description = "作业步骤类型信息") +@Api(value = "作业步骤类型信息", description = "作业步骤类型信息") public class WmsActionStepType extends BaseBean { private static final long serialVersionUID = -8019644718382990603L; - @Column(name = "AT_NAME_E") + @Column(name = "AT_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型名称") private String atNameE; - @Column(name = "AT_DESC_E") + @Column(name = "AT_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型描述") private String atDescE; - @Column(name = "AT_NAME_C") + @Column(name = "AT_NAME_C", nullable = false) @ApiParam(value = "中文类型名称") + @AnnoOutputColumn private String atNameC; - @Column(name = "AT_DESC_C") + @Column(name = "AT_DESC_C", nullable = false) @ApiParam(value = "中文类型描述") + @AnnoOutputColumn private String atDescC; - @Column(name = "FUN_CALL_NAME") + @Column(name = "FUN_CALL_NAME", nullable = false) @ApiParam(value = "方法调用名称") + @AnnoOutputColumn private String funCallName; } From 0acf17ddd7e1ff8a8e3b4fd080bc783b70e74e2c Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 11 Dec 2019 19:02:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=901211=EF=BC=9A=E6=8A=A5=E8=A1=A81?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 51 +++++++++++++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../cn/estsh/i3plus/pojo/base/util/StringUtil.java | 79 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 +- .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 8 +++ .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 5 ++ .../i3plus/pojo/mes/model/QcCheckDataModel.java | 6 +- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 16 +++-- 8 files changed, 159 insertions(+), 13 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 3a774f8..9c9e922 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 @@ -12,6 +12,53 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * redis过期时间 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXPIRE_TIME { + + NEVER(-1, "不过期"), + ONE_HOUR(3600, "一小时"), + ONE_MIN(60, "一分钟"); + + private int value; + private String description; + + EXPIRE_TIME(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRUE_OR_FALSE { TRUE(1, "是"), @@ -341,7 +388,7 @@ public class MesEnumUtil { public enum IF_CONNECT_TYPE { DB("10", "DB"), - WEBSERVICE("20", "webservice "), + WEBSERVICE("20", "webservice"), RESTFUL("30", "restful"); private String value; @@ -779,7 +826,7 @@ public class MesEnumUtil { SCRATCH(10, "划痕"), FRACTURE(20, "破碎"), - SCRAP_TYPE3(30, "缺失"); + SCRAP_TYPE(30, "缺失"); private int value; private String description; 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 bef1e71..cf5ea6e 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 @@ -707,7 +707,8 @@ public class MesPcnEnumUtil { public enum MES_REPAIR_STATUS { REPAIRED(10, "已维修"), - NO_REPAIR(20, "待维修"); + NO_REPAIR(20, "待维修"), + NO_CONFIRM(30, "待确认"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java index 0d764b8..d1cc236 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java @@ -1,5 +1,10 @@ package cn.estsh.i3plus.pojo.base.util; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + public class StringUtil { public static boolean isEmpty(Object obj){ @@ -10,4 +15,78 @@ public class StringUtil { return false; } + + + + /** + * 获取对象所有属性名 + * @param clazz + * @return + */ + public static String[] getFields(Class clazz) { + Field[] fields = clazz.getDeclaredFields(); + String[] fieldNames = new String[fields.length]; + for(int i=0;i getFieldList(Class clazz) { + Field[] fields = clazz.getDeclaredFields(); + Field[] superFields = clazz.getSuperclass().getDeclaredFields(); + List fieldNames = new ArrayList<>(); + for(int i = 0;i < fields.length; i++){ + fieldNames.add(fields[i].getName()); + } + for(int i = 0;i < superFields.length; i++){ + fieldNames.add(superFields[i].getName()); + } +// fieldNames.add("id"); +// fieldNames.add("organizeCode"); +// fieldNames.add("isValid"); +// fieldNames.add("isDeleted"); +// fieldNames.add("createUser"); +// fieldNames.add("createDatetime"); +// fieldNames.add("modifyUser"); +// fieldNames.add("modifyDatetime"); + return fieldNames; + } + + /** + * 根据属性名和对象获取属性对应的值 + * @param fieldName + * @param o + * @return + */ + public static Object getFieldValueByName(String fieldName, Object o) { + try { + String firstLetter = fieldName.substring(0, 1).toUpperCase(); + String getter = "get" + firstLetter + fieldName.substring(1); + Method method = o.getClass().getMethod(getter, new Class[] {}); + Object value = method.invoke(o, new Object[] {}); + return value; + } catch (Exception e) { + return null; + } + } + + /** + * 拼接对象所有属性名 + * @return + */ + public static String getFieldNames(String[] fieldNames) { + StringBuffer stringBuffer = new StringBuffer(); + for (String fieldName : fieldNames) { + stringBuffer.append(fieldName).append(","); + } + int stringBufferLength = stringBuffer.length(); + stringBuffer.delete(stringBufferLength - 1, stringBufferLength); + return stringBuffer.toString(); + } } 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 824d9a8..c543454 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 @@ -131,11 +131,11 @@ public class MesProduceSn extends BaseBean { @Transient @ApiParam("下线开始时间") - private String outWorkCenterStartTime; + private String outWorkCenterTimeStart; @Transient @ApiParam("下线结束时间") - private String outWorkCenterEndTime; + private String outWorkCenterTimeEnd; 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/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 3da8adb..79037ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -128,6 +128,14 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("返回信息") private String resultMsg; + @Transient + @ApiParam("下线开始时间") + private String outWorkCenterTimeStart; + + @Transient + @ApiParam("下线结束时间") + private String outWorkCenterTimeEnd; + 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/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 3555f12..504c480 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.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 :生产数据 @@ -100,4 +101,8 @@ public class MesProductData extends BaseBean { @ApiParam("数据组号") private String groupNo; + @Transient + @ApiParam("字段总数") + private Integer fieldNum; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java index d958a07..885043f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java @@ -80,13 +80,13 @@ public class QcCheckDataModel { private String workCellName; @ApiParam("物料名称") - private String partNoName; + private String partName; public QcCheckDataModel() { } - public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partNoName) { + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partName) { this.id = id; this.organizeCode = organizeCode; this.createUser = createUser; @@ -111,6 +111,6 @@ public class QcCheckDataModel { this.shiftGroupName = shiftGroupName; this.squadLeader = squadLeader; this.workCellName = workCellName; - this.partNoName = partNoName; + this.partName = partName; } } 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 b3c14e1..c96c3ce 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 @@ -414,7 +414,7 @@ public class MesHqlPack { /** * MES 开线管控 * - * @param mesWcCheck + * @param wcCheck * @return */ public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) { @@ -1838,11 +1838,11 @@ public class MesHqlPack { if (mesProduceSn.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } - if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) { - DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean); + if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { + DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } - if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) { - DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean); + if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) { + DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean); // DdlPreparedPack.timeBuilder( // mesProduceSn.getOutWorkCenterStartTime(), // mesProduceSn.getOutWorkCenterEndTime(), @@ -2021,6 +2021,12 @@ public class MesHqlPack { if (mesProduceSnTravel.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean); } + if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) { + DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean); + } + if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { + DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); + } DdlPreparedPack.timeBuilder( mesProduceSnTravel.getCreateDateTimeStart(), mesProduceSnTravel.getCreateDateTimeEnd(), From ccfba0fe56d2b025417ec08ab5917213948504bc Mon Sep 17 00:00:00 2001 From: zcg Date: Thu, 12 Dec 2019 08:59:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?mes=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 d389317..53d5477 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 @@ -1377,7 +1377,9 @@ public class MesEnumUtil { MES_REPAIR(320,"质量数据处理措施"), MES_EQU_TASK_PLAN(330,"设备作业周期计划"), MES_PART_OJBECT(340,"物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"); + MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"), + MES_DATASOURCE(360,"DB地址清单"), + MES_EQU_TASK_NOTIFY_CFG(370,"设备通知配置"); private int value; private String description;