From b00bcf66b265cd2ce22b44ab80365e673095c9b7 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 21 Oct 2020 16:30:47 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 35 ++++++++++++++++++++++ 1 file changed, 35 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 26bda1b..11112c7 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 @@ -5836,4 +5836,39 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 图片展示类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IMG_DISPLAY_TYPE { + STEP(10, "按工步显示"), + WORK_CELL(20, "按工位显示"); + + private Integer value; + private String description; + + IMG_DISPLAY_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 == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 3e629e63c5f515205ed1b40be933ab2f77b9b45e Mon Sep 17 00:00:00 2001 From: songss Date: Wed, 21 Oct 2020 16:32:41 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E9=AA=8C=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 36 ++++++++++++++++++++++ 1 file changed, 36 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 26bda1b..c8795a6 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 @@ -5836,4 +5836,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 控制计划审核状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONTROL_PLAN_AUDIT_TYPE { + WAIT_AUDIT(10, "待审核"), + AUDIT_PASS(20, "审核通过"), + AUDIT_NON_PASS(30, "审核驳回"); + + private int value; + private String description; + + CONTROL_PLAN_AUDIT_TYPE(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; + } + } } From 2301e03c85a8ac9bb79de5b237b1982de765043d Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Thu, 22 Oct 2020 13:01:01 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=91=BC=E5=8F=AB?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=BC=B9=E7=AA=97=E7=9A=84=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.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/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 9571391..8705fb6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -80,10 +80,11 @@ public class AndonEnumUtil { /** - * 状态点界面编号 + * 状态点界面编号--此部分枚举后续要创建一个表存储。 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ROUTE_STATUS_INTERFACE_NO { + DEFAULT_ALARM_CALL("DEFAULT_ALARM_CALL", "默认呼叫无界面"), EQUMENT_ALARM_CALL("EQUMENT_ALARM_CALL", "设备呼叫弹框界面"), QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"), PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"), From 17d47fdc55b54f8ad4d21a1f14272a0ef5acc409 Mon Sep 17 00:00:00 2001 From: songss Date: Thu, 22 Oct 2020 14:43:40 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E7=9C=8B=E6=9D=BF=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=88=AA-?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E6=A6=82=E5=86=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesBoardImage.java | 44 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesBoardSwitchCfg.java | 44 ++++++++++++++++++++++ .../mes/model/MesBoardWorkCenterOverviewModel.java | 34 +++++++++++++++++ .../mes/repository/MesBoardImageRepository.java | 14 +++++++ .../repository/MesBoardSwitchCfgRepository.java | 14 +++++++ 5 files changed, 150 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java new file mode 100644 index 0000000..2d1b94f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @CreateDate: 2020/10/13 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_IMAGE") +@Api("MES_看板图片") +public class MesBoardImage extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3757764185082659130L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "IMAGE_URL") + @ApiParam("图片路径") + private String imageUrl; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java new file mode 100644 index 0000000..be79660 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @CreateDate: 2020/10/13 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SWITCH_CFG") +@Api("MES_看板切换配置") +public class MesBoardSwitchCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -9101785840595985385L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "SWITCH_INTERRVAL") + @ApiParam("屏切换频次") + private Integer switchInterrval; + + @Column(name = "LINE_SWITCH_INTERRVAL") + @ApiParam("产线切换频次") + private Integer lineSwitchInterrval; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java new file mode 100644 index 0000000..7a558d5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 中航-产线概况-产线概况 + * @CreateDate: 2020/10/19 + * @Author: simon.song + */ +@Data +public class MesBoardWorkCenterOverviewModel { + @ApiParam("看板代码") + private String boardCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @ApiParam("图片路径") + private String imageUrl; + + @ApiParam("工单列表") + List workOrderList; + + @ApiParam("班组列表") + List shiftGroupList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java new file mode 100644 index 0000000..ff339e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardImage; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @CreateDate: 2020/10/13 + * @Author: simon.song + */ +@Repository +public interface MesBoardImageRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.java new file mode 100644 index 0000000..a682ca2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardSwitchCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @CreateDate: 2020/10/13 + * @Author: simon.song + */ +@Repository +public interface MesBoardSwitchCfgRepository extends BaseRepository { +} From bb3039d1f2a77db9e18837581184560e7b092175 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 22 Oct 2020 15:15:43 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=9D=E8=B4=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 33 ++++++++++++ .../mes/model/MgnPackageSnTraceReportModel.java | 62 ++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.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 a3bc65a..a0e0dde 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,39 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_IS_SEALED { + + UNSEALED(1, "未封箱"), + SEALED(2, "已封箱"); + + private int value; + private String description; + + PACKAGE_IS_SEALED(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; + } + } + /** * MES_SPC关键数据 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java new file mode 100644 index 0000000..ad4b799 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnPackageSnTraceReportModel { + + @ApiParam("箱条码") + private String packageNo; + + @ApiParam("托条码") + private String packageNo2; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料编号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam("是否封箱") + private Integer isSealed; + + @ApiParam("是否封箱名称") + private String isSealedName; + + @ApiParam(value = "工厂") + public String organizeCode; + + @ApiParam(value="修改日期查询用，查询起始日期") + public String createDateTimeStart; + + @ApiParam(value = "修改日期查询用，查询结束日期") + public String createDateTimeEnd; + + public MgnPackageSnTraceReportModel() { + } + + public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName) { + this.packageNo = packageNo; + this.packageNo2 = packageNo2; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.isSealed = isSealed; + this.createDatetime = createDatetime; + this.workCenterCode = workCenterCode; + this.workCenterName = workCenterName; + } +} From 9002bdc936eafff3ec01b3ea4e2236082361b0b7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 22 Oct 2020 17:20:54 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E9=A2=84=E8=A3=85=E9=98=9F=E5=88=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 20308b4..831d8c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -200,5 +200,24 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.workType = workType; this.orderNo = orderNo; } + public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, + Integer queueType,Integer status,String createUser, + String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo, + String workCenterCode, String workCellCode) { + this.seq = seq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.boxQty = boxQty; + this.queueType = queueType; + this.status = status; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.workType = workType; + this.orderNo = orderNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + } } From 6826f04b97f6042454d08e6a51bbc6a0efc6014a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 22 Oct 2020 18:00:28 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E9=80=BB?= =?UTF-8?q?=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/MgnBoardListModel.java | 6 ++++++ .../cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index fca607d..8754eae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -23,4 +23,10 @@ public class MgnBoardListModel { @ApiParam("计划完成率") private String planCompleteRate; + @ApiParam("异常数量") + private Integer exceptQty; + + @ApiParam("正常数量") + private Integer normalQty; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java index d608e9c..0f8794f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java @@ -45,4 +45,10 @@ public class OperateObjectParamModel { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam(value = "安灯状态代码") + private String statusCode; + + @ApiParam("设备状态集合") + private List objectParamModelList; + } From ba81af744bdd6d02531fe8c8aa1f89b80d5966e1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 22 Oct 2020 20:50:07 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 18 ++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java | 6 ++++++ 4 files changed, 27 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 dc2fbac..58ebed3 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 @@ -9005,7 +9005,8 @@ public class WmsEnumUtil { FINISH(10, "已完成(绿色)"), OVER_TIME(20, "已超时（红色）"), UNRECEIVED(30, "未收货（蓝色）"), - VARIANT(40, "有差异（黄色）"); + VARIANT(40, "有差异（黄色）"), + NORMAL(50, "正常（白色）"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 4ea43ea..22badef 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -415,6 +415,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("箱数") private Double boxQty; + @Transient + @ApiParam("窗口领料开始时间") + private String windowPickStartTime; + + @Transient + @ApiParam("窗口领料结束时间") + private String windowPickEndTime; + public WmsDocMovementDetails () { } @@ -542,4 +550,14 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.boxQty = boxQty; this.srcLocateNo = srcLocateNo; } + + public WmsDocMovementDetails(String orderNo, Integer orderStatus, Double qty, Double pickQty, String modifyDatetime, String planTime) { + this.orderNo = orderNo; + this.orderStatus = orderStatus; + this.qty = qty; + this.pickQty = pickQty; + this.modifyDatetime = modifyDatetime; + this.planTime = planTime; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index d6123bd..3a7411e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -354,6 +354,7 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("目标库位代码") public String destLocateNo; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java index 40f637d..0e4d99f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 班次表 @@ -51,4 +52,9 @@ public class WmsShift extends BaseBean{ @ApiParam("结束时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endTime; + + @Transient + @ApiParam("结束时间&结束时间") + private boolean startTimeAndEndTime; + } \ No newline at end of file From c965a342366947448b0a47dd9b61be12e603395a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 22 Oct 2020 21:07:57 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index e686c57..bce0e9d 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 @@ -48,7 +48,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } - DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); @@ -2817,7 +2816,10 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result); DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result); - + if (wmsShift.isStartTimeAndEndTime() && !StringUtil.isEmpty(wmsShift.getStartTime())) { + result.setWhereAppend(result.getWhereAppend() + " and model.startTime<='" + wmsShift.getStartTime() + "'"); + result.setWhereAppend(result.getWhereAppend() + " and model.endTime>='" + wmsShift.getStartTime() + "'"); + } getStringBuilderPack(wmsShift, result); return result; @@ -3526,4 +3528,21 @@ public class WmsHqlPack { return result; } + + + /** + * 领料时长分区分页查询条件 + * + * @param wmsPickingWindowTime + * @return + */ + public static DdlPackBean packHqlWmsPickingWindowTime(WmsPickingWindowTime wmsPickingWindowTime) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPickingWindowTime.getShiftNo(), "shiftNo", result); + + getStringBuilderPack(wmsPickingWindowTime, result); + + return result; + } } From 56deedeaf3f7c3616e79f6300b948ccc28bd7bf8 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 22 Oct 2020 21:16:20 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsPickingWindowTime.java | 79 ++++++++++++++++++++++ .../repository/WmsPickingWindowTimeRepository.java | 17 +++++ 2 files changed, 96 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java new file mode 100644 index 0000000..bcbd957 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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; +import javax.persistence.Transient; + +/** + * @Description : 领料时长分区 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-10-21 19:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PICKING_WINDOW_TIME") +@Api("领料时长分区") +public class WmsPickingWindowTime extends BaseBean { + + private static final long serialVersionUID = 9214639813072592714L; + + @Column(name = "SHIFT_NO") + @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shiftNo; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String endTime; + + @Column(name = "LATEST_END_TIME") + @ApiParam("最晚领料时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String latestEndTime; + + @Transient + @ApiParam("班次开始时间") + private String shiftStartTime; + + @Transient + @ApiParam("班次结束时间") + private String shiftEndTime; + + + public WmsPickingWindowTime() { + } + + public WmsPickingWindowTime(Long id, String shiftNo, String startTime, String endTime, String latestEndTime, String shiftStartTime, String shiftEndTime) { + this.id = id; + this.shiftNo = shiftNo; + this.startTime = startTime; + this.endTime = endTime; + this.latestEndTime = latestEndTime; + this.shiftStartTime = shiftStartTime; + this.shiftEndTime = shiftEndTime; + + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java new file mode 100644 index 0000000..936dfdd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.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.WmsPickingWindowTime; +import org.springframework.stereotype.Repository; + +/** + * @Description :领料时长分区 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-10-21 19:21 + * @Modify: + **/ +@Repository +public interface WmsPickingWindowTimeRepository extends BaseRepository { +} From ed22bd6f649d3c1c3597d921117100ed20921ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 22 Oct 2020 21:28:24 +0800 Subject: [PATCH 11/14] =?UTF-8?q?feat(form):=E5=AD=98=E5=82=A8=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E8=B0=83=E7=94=A8=E9=80=82=E9=85=8Dmysql,mssql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 52 +++++++++++++++++- .../estsh/i3plus/pojo/form/bean/BfDataObject.java | 2 + .../pojo/form/bean/BfDataObjectProperty.java | 5 ++ .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 24 ++++++++ .../pojo/model/form/SqlProcedureColumnModel.java | 64 ++++++++++++++++++++++ 5 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 14ef7d8..b240568 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -17,7 +17,8 @@ public class BlockFormEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FORM_TABLE_TYPE { TABLE(1, "TABLE", "表"), - VIEW(2, "VIEW", "视图"); + VIEW(2, "VIEW", "视图"), + PROCEDURE(3, "PROCEDURE", "存储过程"); private int value; private String code; @@ -2347,4 +2348,53 @@ public class BlockFormEnumUtil { } } + /** + * 存储过程列类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROCEDURE_COL_TYPE { + IN_PARAM(1, "入参"), + INOUT_PARAM(2, "出入参"), +// ?(3, "按钮"), + OUT_PARAM(4, "出参"), + RETURN_PARAM(5, "返回值"); + + private int value; + private String description; + + private PROCEDURE_COL_TYPE (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 PROCEDURE_COL_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + } 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 5d5f78a..917912c 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -61,6 +62,7 @@ public class BfDataObject extends BaseBean { @ApiParam(value ="表状态(是否同步)") private Integer objectStatus; + @AnnoOutputColumn(refClass = BlockFormEnumUtil.FORM_TABLE_TYPE.class) @Column(name="OBJECT_TYPE") @ApiParam(value ="数据类型") private Integer objectType; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index c12f8d0..bd99d69 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -52,6 +52,11 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="数据对象列名称") private String objectColumnName; + // 暂用来区分存储过程出入参数信息 + @Column(name="OTHER_COLUMN_TYPE") + @ApiParam(value ="其他列类型") + private Integer otherColumnType; + @Column(name="OBJECT_COLUMN_TYPE") @ApiParam(value ="数据对象类型") private Integer objectColumnType; 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 29d0044..3dcf892 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 @@ -72,18 +72,34 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否新增") private Integer isObjectAdd; + public boolean isObjectAdd(){ + return isObjectAdd != null && isObjectAdd == BlockFormEnumUtil.ELEMENT_ADD_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_EDIT") @ApiParam(value = "是否编辑") private Integer isObjectEdit; + public boolean isObjectEdit(){ + return isObjectEdit != null && isObjectEdit == BlockFormEnumUtil.ELEMENT_EDIT_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_DEL") @ApiParam(value = "是否删除") private Integer isObjectDel; + public boolean isObjectDel(){ + return isObjectDel != null && isObjectDel == BlockFormEnumUtil.ELEMENT_DEL_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_DEL_WEAK") @ApiParam(value = "是否弱删除") private Integer isObjectDelWeak; + public boolean isObjectDelWeak(){ + return isObjectDelWeak != null && isObjectDelWeak == BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.ON.getValue(); + } + public Integer getIsObjectDelWeakVal(){ return isObjectDelWeak == null ? BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.OFF.getValue() : isObjectDelWeak.intValue(); } @@ -100,6 +116,10 @@ public class BfElement extends BaseBean { return isObjectValid == null ? BlockFormEnumUtil.ELEMENT_VALID_STATUS.OFF.getValue() : isObjectValid.intValue(); } + public boolean isObjectValid(){ + return isObjectValid != null && isObjectValid == BlockFormEnumUtil.ELEMENT_VALID_STATUS.ON.getValue(); + } + @Column(name = "ELEMENT_VALID_ATTR_ID") @ApiParam(value = "元素有效属性id") private Long elementValidAttrId; @@ -112,6 +132,10 @@ public class BfElement extends BaseBean { return isOrganizeIsolation == null ? BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.OFF.getValue() : isOrganizeIsolation.intValue(); } + public boolean isOrganizeIsolation(){ + return isOrganizeIsolation != null && isOrganizeIsolation == BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_EXPORT") @ApiParam(value = "是否导出") private Integer isObjectExport; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java new file mode 100644 index 0000000..ece72ff --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.model.form; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 存储过程列模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-10-21 19:00 + * @Modify: + **/ +@Data +public class SqlProcedureColumnModel { + + @ApiParam(value = "过程") + private String procedureCat; + + @ApiParam(value = "过程方案") + private String procedureSchem; + + @ApiParam(value = "过程名称") + private String procedureName; + + @ApiParam(value = "列名") + private String columnName; + + /** + * 1是入参 + * 2是出入参 + * 3是？ + * 4是出参 + * 5是返回值（函数） + */ + @ApiParam(value = "列类型") + private Integer columnType; + + @ApiParam(value = "数据类型") + private Integer dataType; + + @ApiParam(value = "数据类型名称") + private String typeName; + + @ApiParam(value = "长度") + private Integer length; + + @ApiParam(value = "精度") + private Integer scale; + + @ApiParam(value = "是否允许为空") + private Integer nullable; + + @ApiParam(value = "备注") + private String remarks; + + /** + * 0为返回值 + * 1为首位 + */ + @ApiParam(value = "顺序位置") + private Integer ordinalPosition; + + +} From 4c86b836cad481fef16bb12e838ef45471884898 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 22 Oct 2020 22:01:05 +0800 Subject: [PATCH 12/14] =?UTF-8?q?OP20b=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=20esop=E5=B1=95=E7=A4=BA=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 26 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationResultBean.java | 3 +++ 2 files changed, 29 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 11112c7..5663ffd 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 @@ -5871,4 +5871,30 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 工位线程类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PCN_THREAD_TYPE { + STEP(10, "跟随工步线程"), + PROCESS(20, "跟随工序线程"), + MODULE(30, "跟随展示组件线程"); + + private Integer value; + private String description; + + PCN_THREAD_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } 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 5edd9e4..56c5b39 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 @@ -51,6 +51,9 @@ public class StationResultBean implements Serializable { @ApiParam("图片路径") private String imageUrl; + @ApiParam("图片路径") + private List imageUrls; + @ApiParam("多个数据集") private List> stationResultBeans; From 505de36ca5c3e49ec7d133215d0ca3045bf5a765 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 23 Oct 2020 11:23:42 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9SWeb=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=99=BB=E5=BD=95=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/wms/bean/WmsPart.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 15d26d2..94e14e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -216,7 +216,7 @@ public class WmsPart extends BaseBean { isRequire = 2, dataSrc = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") private String productLines; - @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") + @Column(name = "PROPORTION", columnDefinition = "decimal(10,8)") @ApiParam(value = "待质检比例", example = "1") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; From 051417c10e50fbb4cef11d00aca5af3455b72c75 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 23 Oct 2020 13:57:11 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java index bcbd957..1e157b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java @@ -61,6 +61,16 @@ public class WmsPickingWindowTime extends BaseBean { @ApiParam("班次结束时间") private String shiftEndTime; + @Transient + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + + + public WmsPickingWindowTime() { }