From 911f96b60d719e3fa9bbf906100f57bbf553cea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Oct 2020 17:56:41 +0800 Subject: [PATCH 01/29] =?UTF-8?q?style(softswitch):=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index dac4976..b21f150 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -54,6 +56,7 @@ public class BsSuitDataDetail extends BaseBean { @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; @Column(name = "SUIT_TYPE_NAME_RDD") @@ -81,8 +84,14 @@ public class BsSuitDataDetail extends BaseBean { @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class) private Integer processState; + public String getProcessStateTxt() { + return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() : + BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState); + } + @Column(name = "PROCESS_TIME") @ApiParam(value = "处理时间") private String processTime; From 8f060d4aa46f047cd9801b7614f0cf9a42741dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 14 Oct 2020 13:44:12 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E3=80=902856=2010=202.3.8=2020027-PCN?= =?UTF-8?q?=E7=AB=AF=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E9=87=87?= =?UTF-8?q?=E9=9B=86=E6=80=8E=E4=B9=88=E6=8A=A5=E8=AD=A6=E6=8F=90=E7=A4=BA?= =?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 | 45 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesExceptionAlertCfg.java | 49 +++++++++++++++++++ .../pojo/mes/bean/MesExceptionWindowRecord.java | 55 ++++++++++++++++++++++ .../repository/MesExceptionAlertCfgRepository.java | 17 +++++++ .../MesExceptionWindowRecordRepository.java | 17 +++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 9 +++- 6 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.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 3af6f5c..2995304 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 @@ -7771,4 +7771,49 @@ public class MesEnumUtil { } } + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_MENU_CODE { + + STATION_MONITOR("STATION_MONITOR", "工位监控"); + + private String value; + private String description; + + SRC_MENU_CODE(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 (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java new file mode 100644 index 0000000..8c348e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java @@ -0,0 +1,49 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EXCEPTION_ALERT_CFG") +@Api("MES_异常提醒配置") +public class MesExceptionAlertCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895221L; + + @Column(name = "SRC_MENU_CODE") + @ApiParam("来源模块代码") + private String srcMenuCode; + + @Column(name = "SRC_MENU_NAME") + @ApiParam("来源模块名称") + private String srcMenuName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "USER_CODE_GROUP") + @ApiParam("提醒人员集合") + private String userCodeGroup; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java new file mode 100644 index 0000000..a904459 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java @@ -0,0 +1,55 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EXCEPTION_WINDOW_RECORD") +@Api("MES_弹窗异常提醒记录") +public class MesExceptionWindowRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895345L; + + @Column(name = "SRC_MENU_CODE") + @ApiParam("来源模块代码") + private String srcMenuCode; + + @Column(name = "USER_CODE") + @ApiParam("提醒人员") + private String userCode; + + @Column(name = "MESSAGE_TYPE") + @ApiParam("消息类型") + private Integer messageType; + + @Column(name = "MESSAGE_HEAD") + @ApiParam("提示表头") + private String messageHead; + + @Column(name = "MESSAGE_CONTENT") + @ApiParam("提示内容") + private String messageContent; + + @Column(name = "STATUS") + @ApiParam("处理状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java new file mode 100644 index 0000000..8f81f87 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesExceptionAlertCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : MES_异常提醒配置 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-10-13 16:49 + * @Modify: + **/ +@Repository +public interface MesExceptionAlertCfgRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java new file mode 100644 index 0000000..81e3258 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesExceptionWindowRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : MES_弹窗异常提醒记录 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-10-13 16:49 + * @Modify: + **/ +@Repository +public interface MesExceptionWindowRecordRepository extends BaseRepository { + +} 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 fcc4640..5e5ff4c 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 @@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -3415,4 +3414,12 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) { + DdlPackBean packBean = getAllBaseData(mesExceptionAlertCfg.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getSrcMenuCode(), "srcMenuCode", packBean); + DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumEqualPack(mesExceptionAlertCfg.getIsValid(), "isValid", packBean); + return packBean; + } } From ee3f9415a7f78109de786f0289ebf01e6fab9645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 14 Oct 2020 18:40:04 +0800 Subject: [PATCH 03/29] =?UTF-8?q?fix(core):=E7=BB=84=E7=BB=87=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BB=A3=E7=A0=81=E6=97=A0=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index ff6f6bc..a472e9f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -1232,4 +1232,23 @@ public class CoreHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment); + + DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize); + + DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean); + + return ddlPackBean; + } + } \ No newline at end of file From 226c31878ae7168e0877f25977b21e069d200274 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 14 Oct 2020 22:35:42 +0800 Subject: [PATCH 04/29] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 991b3a1..30cbe36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -104,4 +104,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index e159d8e..6d2a731 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -152,6 +152,10 @@ public class MesStationBom extends BaseBean implements Serializable { private Integer length; @Transient + @ApiParam("缺陷代码") + private String defectCode; + + @Transient @ApiParam("校验内容") private String checkContent; From d2f9c3502a3e37c75c567e027fcc363d65f040b6 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 14 Oct 2020 22:57:33 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=98=9F=E5=88=97?= =?UTF-8?q?=E4=B9=B1=E8=B7=B3=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 1a8a0d8..ffc36d6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -220,6 +220,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { return this.qty == null ? 0.0d : this.qty; } + public double getFinsihQtyVal() { + return this.finsihQty == null ? 0.0d : this.finsihQty; + } + public int getStatusVal() { return this.status == null ? 0 : this.status; } From 7e24f4ed4a2871b3626e8c6357235858b92ba64e Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 14 Oct 2020 22:58:39 +0800 Subject: [PATCH 06/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=98=9F=E5=88=97?= =?UTF-8?q?=E4=B9=B1=E8=B7=B3=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 70b769e..b737470 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -119,6 +119,15 @@ public class QueueOrderModel implements Serializable { public QueueOrderModel() { } + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getFinsihQtyVal() { + return this.finsihQty == null ? 0.0d : this.finsihQty; + } + + public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { this.queueSeq = queueSeq; From 6d64c61848c552d72826c314ddd8586a93058453 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 15 Oct 2020 00:05:36 +0800 Subject: [PATCH 07/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9FIFO=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index a805f86..70f38db 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -1,8 +1,11 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,4 +45,14 @@ public class WmsStockFifoModel { @ApiParam("同批次") private boolean fifoSameBatch; + + @ApiParam("FIFO查询获取方式") + private Integer fifoSnByLood; + + @ApiParam("物料条码信息") + Map> snMap = new HashMap<>(); + + @ApiParam("所有推荐条码信息") + List wmsStockSnAllList = new ArrayList<>(); + } From df9474807c082a961deba469a238352cf51f15ea Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 15 Oct 2020 00:07:43 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=BA=93=E5=AD=98=E8=A1=A8=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=8C=E7=94=A8=E4=B9=90?= =?UTF-8?q?=E8=A7=82=E9=94=81=E6=8E=A7=E5=88=B6=E5=B9=B6=E5=8F=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 11 ++++++----- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 11 ++++++----- .../estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java | 7 +++++++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 6dafc68..e83abaa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -9,11 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -119,6 +115,11 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量") private Double scrapQty; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + @Transient @ApiParam(value = "总数量") private Double totalQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 8f33aa6..a0b7f2c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -14,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.Date; import java.util.List; @@ -229,6 +225,11 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seqNo; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java index 97dad56..4d30cc8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java @@ -21,4 +21,11 @@ public interface WmsConfigRepository extends BaseRepository { * @return 配置信息 */ WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode); + + /** + * 按照配置代码查询配置信息 + * @param configCode 配置代码 + * @return 配置信息 + */ + WmsConfig getFirstByConfigCode(String configCode); } From 8932108cd3f7dd5c8cb6c18ea3b8b7d389adccf6 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 15 Oct 2020 00:58:14 +0800 Subject: [PATCH 09/29] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B9=90=E8=A7=82=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 8 ++++---- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index e83abaa..db71644 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -115,10 +115,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量") private Double scrapQty; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; @Transient @ApiParam(value = "总数量") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index a0b7f2c..764d333 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -225,10 +225,10 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seqNo; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; @ApiParam(value = "仓库名称") @Transient From a49ddc004c022eb2bdda09553eddaf8b98e4e82b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 15 Oct 2020 11:26:13 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E6=B7=BB=E5=8A=A0lob?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index 8ddba7c..15600fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -85,6 +85,7 @@ public class MesRepairRecord extends BaseBean implements Serializable { @ApiParam("工位") private String workCellCode; + @Lob @Column(name = "MEMO") @ApiParam("备注") private String memo; From f58d97fb8352e4bbc63dcd5bd6925b0a42b92542 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 15 Oct 2020 14:35:41 +0800 Subject: [PATCH 11/29] =?UTF-8?q?=2011777=2019048-=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BB=B6=20=E7=BB=91=E5=AE=9A=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=85=B3=E9=94=AE=E4=BB=B6=E6=95=B0=E6=8D=AE=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E5=9B=9E=E6=BB=9A-20201012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index 1fdcdda..f1114df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord; import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -19,12 +20,15 @@ public class FutrueTaskModel { @ApiParam("实现类") private Object futrueTaskService; - @ApiParam("包装条码") + @ApiParam("工位请求bean") private StationRequestBean stationRequestBean; - @ApiParam("过程条码") + @ApiParam("产品条码表") private MesProduceSn produceSn; + @ApiParam("产品绑定记录表") + private MesProdBindRecord prodBindRecord; + @ApiParam("组织代码") private String organizeCode; From cfd0cb03ffd2a716f887e6b6d76a44323025ebd7 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 15 Oct 2020 14:36:24 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index db71644..6d1769b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -9,7 +9,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; import java.util.List; /** @@ -115,10 +120,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量") private Double scrapQty; -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public Integer lockVersion; + @Version + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") + @ApiParam(value = "乐观锁", defaultValue = "0") + public Integer lockVersion; @Transient @ApiParam(value = "总数量") @@ -221,6 +226,10 @@ public class WmsStockQuan extends BaseBean { return this.boxQty == null ? 0 : this.boxQty; } + public Integer getLockVersion() { + return this.lockVersion == null ? 0 : this.lockVersion; + } + public WmsStockQuan() { } From 233853e1e6d5865999337ff1cafbe6fb2223f77c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 15 Oct 2020 16:26:40 +0800 Subject: [PATCH 13/29] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=92=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 ++++--- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java | 4 ++++ 5 files changed, 25 insertions(+), 5 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 3720c98..ab52cf1 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 @@ -3416,7 +3416,8 @@ public class MesEnumUtil { REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), SPARE_RETURN_REPAIR(140, "客退备件返修"), - SEIZE_SEAT_ORDER(150, "占位工单"); + SEIZE_SEAT_ORDER(150, "占位工单"), + SAMPLE_ORDER(160, "样件工单"); private int value; private String description; @@ -3581,11 +3582,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_ORDER_STATUS { + WAIT_LANDED(5, "待下达"), NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), - CLOSE(40, "已关闭"), - ; + CLOSE(40, "已关闭"); 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 bcf75a5..6007e48 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 @@ -2075,8 +2075,7 @@ public class MesPcnEnumUtil { NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), - CLOSE(40, "已关闭"), - ; + CLOSE(40, "已关闭"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 82bfdf1..a885bce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -79,10 +79,18 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + @Column(name = "STOCK_QTY") @ApiParam("排程实时库存") private Integer stockQty; + @Column(name = "MIN_GEN_LOT") + @ApiParam("最小生成批次") + private Integer minGenLot; + @Transient @ApiParam("物料名称") private String partName; 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 5162f3d..20308b4 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 @@ -122,6 +122,14 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("特殊标识") private Integer specialFlag; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index b677ede..cd9ba33 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -55,4 +55,8 @@ public class MesRouteProcessCell extends BaseBean implements Serializable { @ApiParam("工序代码名称") private String processCodeName; + @Transient + @ApiParam("正在生产队列数量") + private Integer genningNum; + } From 75520519de2e14f95884145dc378b09470e427b9 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 15 Oct 2020 16:51:38 +0800 Subject: [PATCH 14/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) 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 f24ff0c..9570d39 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 @@ -53,6 +53,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("行号") public String item; + @Column(name = "REF_ITEM") + @ApiParam("关联行号") + public Integer refItem; + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") From ee700ab5b0d144f55548cce067450e33b3c75a01 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 15 Oct 2020 17:41:57 +0800 Subject: [PATCH 15/29] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E5=A4=9A=E7=BA=A7BOM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index d97792c..f6cee5e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -273,4 +273,13 @@ public class WmsPOMasterDetails extends BaseBean { this.totalBoxes = totalBoxes.intValue(); this.qty = qty; } + + public WmsPOMasterDetails(String orderNo, String partNo, Double qty, + Double rcQty, Integer itemStatus) { + this.orderNo = orderNo; + this.partNo = partNo; + this.qty = qty; + this.rcQty = rcQty; + this.itemStatus = itemStatus; + } } From 834e3d211d67457aa69e495c0be9ac0fae80fe37 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Thu, 15 Oct 2020 19:28:43 +0800 Subject: [PATCH 16/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E0=E7=9A=84=E4=B8=9A=E5=8A=A1=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=9F=BA=E7=A1=80=E7=B1=BB=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 8d48efd..4120d0e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -88,7 +88,7 @@ public class MesHqlPack { public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); return packBean; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 3e7316f..81613fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -106,7 +106,7 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; @@ -122,7 +122,7 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; From c3bdf4a1624ef01d4fd6779ffa1faa85ef667050 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 15 Oct 2020 20:20:11 +0800 Subject: [PATCH 17/29] =?UTF-8?q?=E8=A7=A3=E5=86=B310330=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E4=B8=8D=E5=87=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsJobParamModel.java | 7 ++++++- .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 8 ++++++++ .../i3plus/pojo/model/wms/WmsMoveMasterModel.java | 8 ++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 24 ++++++++++++++++------ .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 4 ++++ 5 files changed, 44 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index 009c019..ca619c2 100755 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -21,7 +21,12 @@ public class WmsJobParamModel implements Serializable { private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 private Integer minuteDiff;//处理周期(分钟) - private String whereHql;//业务查询条件HQL + private List fixPartList;//需要特殊处理的零件号集合 + private String fixPartAndWhere; // 特殊零件号需要加的过滤条件 + private Integer pageSize;//数据条数 + private Integer isCheckSn;//是否检查条码存在 + private Integer erpSyncFlag;//查询SHIPPING表的条件 + public int getMinuteDiffVal() { return this.minuteDiff == null ? 0 : this.minuteDiff.intValue(); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index a718377..b92fbbe 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -19,4 +19,12 @@ public class WmsMoveDetailsModel implements Serializable { private static final long serialVersionUID = -6968143574442339454L; private WmsMoveDetails details; private List moveSnList; + + public WmsMoveDetailsModel(WmsMoveDetails details, List moveSnList) { + this.details = details; + this.moveSnList = moveSnList; + } + + public WmsMoveDetailsModel() { + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java index 0e1e684..ff464ed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java @@ -18,4 +18,12 @@ public class WmsMoveMasterModel implements Serializable { private static final long serialVersionUID = -5490167040159056107L; private WmsMoveMaster moveMaster; private List moveDetails; + + public WmsMoveMasterModel(WmsMoveMaster moveMaster, List moveDetails) { + this.moveMaster = moveMaster; + this.moveDetails = moveDetails; + } + + public WmsMoveMasterModel() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index f04cc9c..7f47f40 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -10,12 +10,8 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; +import java.util.List; /** * @Description : 库存移动单主表信息 @@ -177,6 +173,22 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("总行数") private Long itemQty; + @Transient + @ApiParam("存储区") + private String zoneNo; + + @Transient + @ApiParam("仓库") + private String whNo; + + @Transient + @ApiParam("状态集合") + private List orderStatusList; + + @Transient + @ApiParam("交易类型集合") + private List transTypeCodeList; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index edcf03a..7051b98 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -81,6 +81,10 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "交易处理组件名称") private String tmName; + @Column(name = "DIRECT") + @ApiParam(value = "交易的方向：IN,OUT,MOVE") + private String direct; + @Transient @ApiParam("菜单URL") private String menuUrl; From 1e6ca2e0bb10c67cb4b09f03ea6d7691ad88d358 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 15 Oct 2020 20:22:53 +0800 Subject: [PATCH 18/29] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1=20=20=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 7e86112..72f8ca9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -43,6 +43,10 @@ public class MesEquTaskPlan extends BaseBean implements Serializable { @ApiParam("作业类型") private Integer taskType; + @Column(name = "CYCLE_TYPE") + @ApiParam("周期类型") + private Integer cycleType; + @Column(name = "TASK_CYCLE") @ApiParam("周期(天)") private Integer taskCycle; From dc38d2db6fec3d3bef10ac7574de6b05a95ce277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 15 Oct 2020 21:35:04 +0800 Subject: [PATCH 19/29] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/MgnPaintPolishingReportModel.java | 42 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 13 +++++++ 2 files changed, 55 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java new file mode 100644 index 0000000..5f7725a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnPaintPolishingReportModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料描述") + private String partDesc; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("日期") + private String modifyDate; + + @ApiParam("开始日期") + private String modifyStartDate; + + @ApiParam("结束日期") + private String modifyEndDate; + + @ApiParam("抛光数量") + private Double polishingQty; + + @ApiParam("返喷标识") + private String reverseSprayMark; + + @ApiParam("打磨件物料号") + private String polishPartNo; + + @ApiParam("打磨件物料描述") + private String polishPartDesc; + + @ApiParam("组织代码") + private String organizeCode; + +} 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 fcc4640..da7b815 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 @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; +import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -3415,4 +3416,16 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesPaintPolishing(MgnPaintPolishingReportModel paintPolishingReportModel, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(paintPolishingReportModel.getOrganizeCode()); + if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) { + DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) { + DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(), + "modifyDatetime", packBean, true); + } + return packBean; + } } From 07282396d27017936bb8283b7fafc64e57a963cf Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 15 Oct 2020 22:16:55 +0800 Subject: [PATCH 20/29] =?UTF-8?q?ASN=E5=88=B0=E8=B4=A7=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= 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 | 5 +++++ 1 file changed, 5 insertions(+) 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 50d0007..acce643 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 @@ -221,6 +221,11 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; + @Column(name = "STD_CHECK_TIME") + @ApiParam(value = "标准质检时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer stdCheckTime; + @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE") From cc2961d4b8d98292b3c07423d213f8d191a318ba Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 15 Oct 2020 23:34:26 +0800 Subject: [PATCH 21/29] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index a885bce..58d4473 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -92,6 +92,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { private Integer minGenLot; @Transient + @ApiParam("已下达箱数") + private Integer alreadyLandedNum; + + @Transient @ApiParam("物料名称") private String partName; } From 8ed135734d46f8d3b57b8435c31c23314f82af12 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 16 Oct 2020 00:16:57 +0800 Subject: [PATCH 22/29] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 6d1769b..c6e6c68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -226,10 +226,12 @@ public class WmsStockQuan extends BaseBean { return this.boxQty == null ? 0 : this.boxQty; } + public Integer getLockVersion() { return this.lockVersion == null ? 0 : this.lockVersion; } + public WmsStockQuan() { } From 1706b7a6847e8318969257b6f2d568599339fb04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 16 Oct 2020 10:58:30 +0800 Subject: [PATCH 23/29] =?UTF-8?q?=E3=80=902856=2010=202.3.8=2020027-PCN?= =?UTF-8?q?=E7=AB=AF=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E9=87=87?= =?UTF-8?q?=E9=9B=86=E6=80=8E=E4=B9=88=E6=8A=A5=E8=AD=A6=E6=8F=90=E7=A4=BA?= =?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 | 2 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 78 ++++++++++++++++++++++ 2 files changed, 79 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 3720c98..a973f4b 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 @@ -7775,7 +7775,7 @@ public class MesEnumUtil { } /** - * 产品位置 + * 功能模块 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SRC_MENU_CODE { 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 bcf75a5..2aeb65f 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 @@ -5704,6 +5704,84 @@ public class MesPcnEnumUtil { } } + /** + * 功能模块 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_MENU_CODE { + + STATION_MONITOR("STATION_MONITOR", "工位监控"); + + private String value; + private String description; + + SRC_MENU_CODE(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 (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 弹窗异常提醒记录 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXCEPTION_WINDOW_RECORD_STATUS { + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private Integer value; + private String description; + + EXCEPTION_WINDOW_RECORD_STATUS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From bd9547b825ad46461281778aa15809c4a35df5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 16 Oct 2020 11:06:58 +0800 Subject: [PATCH 24/29] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesDefectRecord.java | 4 +++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 +++++++++++ 3 files changed, 59 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 017359b..44b5203 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 @@ -7820,4 +7820,41 @@ public class MesEnumUtil { } } + /** + * 缺陷类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DEFECT_TYPE_CODE { + SCRAPPED("SCRAPPED", "报废"), + BACK_SPRAY("BACK_SPRAY", "返喷"), + POLISHING("POLISHING", " 抛光"), + DETERMIND("DETERMIND", " 待定"); + + private String code; + private String description; + + DEFECT_TYPE_CODE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 54d14d1..e7ae500 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -101,6 +101,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("质量状态") private Integer qcStatus; + @Transient + @ApiParam("缺陷类型名称") + private String defectActionTypeName; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } 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 56a6284..73aba57 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 @@ -3435,4 +3435,22 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesExceptionAlertCfg.getIsValid(), "isValid", packBean); return packBean; } + + public static DdlPackBean getMesPaintDefect(MesDefectRecord defectRecord, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + if (!StringUtils.isEmpty(defectRecord.getPartNo())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(defectRecord.getDefectActionType())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getDefectActionType(), "defectActionType", packBean); + } + if (!StringUtils.isEmpty(defectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(defectRecord.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(defectRecord.getCreateDateTimeStart(), defectRecord.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } } From 52bdc6c664c1355f84baa64372898e7fde5781b5 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 16 Oct 2020 13:14:36 +0800 Subject: [PATCH 25/29] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=20=E6=96=B0=E5=A2=9EplanCfgCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 6 +-- .../i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java | 55 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 16 +++++++ .../repository/MesEquTaskPlanCfgRepository.java | 16 +++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 28 +++++++++-- 5 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 72f8ca9..bd89ef1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -43,9 +43,9 @@ public class MesEquTaskPlan extends BaseBean implements Serializable { @ApiParam("作业类型") private Integer taskType; - @Column(name = "CYCLE_TYPE") - @ApiParam("周期类型") - private Integer cycleType; + @Column(name = "PLAN_CFG_CODE") + @ApiParam("计划配置代码") + private String planCfgCode; @Column(name = "TASK_CYCLE") @ApiParam("周期(天)") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java new file mode 100644 index 0000000..057933b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java @@ -0,0 +1,55 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :设备计划配置 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2020-10-15 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_TASK_PLAN_CFG") +@Api("设备周期作业计划配置") +public class MesEquTaskPlanCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 7734079474434307857L; + + @Column(name = "PLAN_CFG_CODE") + @ApiParam("计划配置代码") + private String planCfgCode; + + @Column(name = "BACKGROUND_COLOR") + @ApiParam("显示背景色") + private String backgroundColor; + + @Column(name = "COLOR") + @ApiParam("字体颜色") + private String color; + + @Column(name = "CYCLE") + @ApiParam("周期(天)") + private Integer taskCycle; + + @Column(name = "DISPLAY_TEXT") + @ApiParam("显示文字") + private String displayText; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 3134f85..846880d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -196,6 +196,22 @@ public class StationRequestBean implements Serializable { @ApiParam("密码") private String password; + public StationRequestBean() { + } + + public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode) { + this.organizeCode = organizeCode; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + } + + public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode, String userInfo) { + this.organizeCode = organizeCode; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.userInfo = userInfo; + } + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java new file mode 100644 index 0000000..516002d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskPlanCfgRepository extends BaseRepository { +} 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 5e5ff4c..b2a7f93 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 @@ -869,7 +869,7 @@ public class MesHqlPack { return packBean; } - public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData,String organizeCode){ + public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); if (!StringUtils.isEmpty(keyData.getObjectCode())) { DdlPreparedPack.getStringEqualPack(keyData.getObjectCode(), "objectCode", packBean); @@ -897,6 +897,7 @@ public class MesHqlPack { } return packBean; } + /** * MES 物料关键数据关系信息查询条件封装 * @@ -1659,6 +1660,24 @@ public class MesHqlPack { } /** + * 设备任务配置 查询条件封装 + * + * @param equTaskPlanCfg + * @param organizeCode + * @return + */ + public static DdlPackBean findEquTaskPlanCfg(MesEquTaskPlanCfg equTaskPlanCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(equTaskPlanCfg, organizeCode); + if (!StringUtils.isEmpty(equTaskPlanCfg.getPlanCfgCode())) { + DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getPlanCfgCode(), "planCfgCode", packBean); + } + if (!StringUtils.isEmpty(equTaskPlanCfg.getDisplayText())) { + DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getDisplayText(), "displayText", packBean); + } + return packBean; + } + + /** * MES 类型信息查询条件封装 * * @param mesTypeCfg @@ -2348,6 +2367,7 @@ public class MesHqlPack { } return packBean; } + /** * 监听任务查询条件封装 * @@ -2409,7 +2429,7 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual,List orderList, String organizeCode) { + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, List orderList, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); @@ -2441,7 +2461,7 @@ public class MesHqlPack { queueJitActual.getCustPointEndDate(), "createDatetime", packBean, true); } - if(!CollectionUtils.isEmpty(orderList)){ + if (!CollectionUtils.isEmpty(orderList)) { DdlPreparedPack.getInPackList(orderList, "jisActualNo", packBean); } DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean); @@ -3309,6 +3329,7 @@ public class MesHqlPack { /** * 客户JIT队列下达配置 + * * @param jitIssueCfg * @param organizeCode * @return @@ -3335,6 +3356,7 @@ public class MesHqlPack { /** * 条码照片关系 + * * @param snPhotoRelation * @param organizeCode * @return From d372256a680328cb3b864624f1d4fa9b12b6b28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 16 Oct 2020 13:35:09 +0800 Subject: [PATCH 26/29] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=96=B7=E6=B6=82?= =?UTF-8?q?=E4=B8=8D=E8=89=AF=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 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 44b5203..cfb7bd5 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 @@ -5310,7 +5310,8 @@ public class MesEnumUtil { BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), - BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"); + BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"), + BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"); private String code; private String description; @@ -7830,26 +7831,26 @@ public class MesEnumUtil { POLISHING("POLISHING", " 抛光"), DETERMIND("DETERMIND", " 待定"); - private String code; + private String value; private String description; - DEFECT_TYPE_CODE(String code, String description) { - this.code = code; + DEFECT_TYPE_CODE(String value, String description) { + this.value = value; this.description = description; } - public String getCode() { - return code; + public String getValue() { + return value; } public String getDescription() { return description; } - public static String valueOfDescription(String code) { + public static String valueOfDescription(String value) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { + if (values()[i].value.equals(value)) { tmp = values()[i].description; } } From 401fccd4dc6423efb7453f034e08062a623bd28c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 16 Oct 2020 16:45:01 +0800 Subject: [PATCH 27/29] =?UTF-8?q?fix(impp):DdlPreparedPack=E7=B1=BB?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=A4=A7=E4=BA=8E=E5=B0=8F=E4=BA=8E=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 0205650..e336469 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -496,6 +496,18 @@ public class DdlPreparedPack { } /** + * 封装double对象成大于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data); + } + } + + /** * 封装double对象成小于语句 * * @param columnName 列名 @@ -508,6 +520,18 @@ public class DdlPreparedPack { } /** + * 封装double对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data); + } + } + + /** * 封装double对象成小于等于语句 * * @param columnName 列名 @@ -520,6 +544,18 @@ public class DdlPreparedPack { } /** + * 封装double对象成小于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data); + } + } + + /** * 封装long或者int的整数对象成equal语句(不等于) * * @param columnName 列名 From fcc66835b89daf8a610284f85c096c08dfcde1c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 16 Oct 2020 17:57:57 +0800 Subject: [PATCH 28/29] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../pojo/mes/bean/MesBoardCustomParamCfg.java | 48 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 4 ++ .../estsh/i3plus/pojo/mes/bean/MesShiftRest.java | 8 ++++ .../cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 3 ++ .../pojo/mes/model/MgnBoardAreaYieldModel.java | 18 ++++++++ .../mes/model/MgnBoardAssembleCompRateModel.java | 21 ++++++++++ .../i3plus/pojo/mes/model/MgnBoardListModel.java | 26 ++++++++++++ .../i3plus/pojo/mes/model/MgnBoardYieldModel.java | 21 ++++++++++ .../MesBoardCustomParamCfgRepository.java | 16 ++++++++ 10 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.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 cfb7bd5..e4b2f2d 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 @@ -2436,7 +2436,8 @@ public class MesEnumUtil { NORMAL(10, "正常"), REWORK(20, "返修"), - ON_LINE(30, "上线工位"); + ON_LINE(30, "上线工位"), + QUALITY_CHECK(40, "质检工位"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java new file mode 100644 index 0000000..98a0cd9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java @@ -0,0 +1,48 @@ +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: + * @Author: jokelin + * @Date: 2020/4/20 4:49 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_CUSTOM_PARAM_CFG") +@Api("MES_看板自定义参数配置") +public class MesBoardCustomParamCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3932883827194753734L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index fe879fa..81c5005 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -61,6 +61,10 @@ public class MesShift extends BaseBean implements Serializable { @ApiParam("班次顺序") private Integer shiftSeq; + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + public int getShiftSeqVal() { return this.shiftSeq == null ? 0 : this.shiftSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index ae77fe6..11f933e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -48,4 +48,12 @@ public class MesShiftRest extends BaseBean implements Serializable { @ColumnDefault("0") @ApiParam("休息时长") private Double restTimes; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="REST_DESC") + @ApiParam("班休描述") + private String restDesc; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index 129386f..4ac3d6d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -77,4 +77,7 @@ public class BoardModel { @ApiParam("工位状态监控明细") private List boardWorkCellList; + + @ApiParam("天津麦格纳看板") + private MgnBoardAreaYieldModel mgnBoardAreaYieldModel; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java new file mode 100644 index 0000000..e40623b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardAreaYieldModel { + + @ApiParam("组装") + private MgnBoardListModel assembleBoardListModel; + + @ApiParam("涂装") + private MgnBoardListModel paintBoardListModel; + + @ApiParam("注塑") + private MgnBoardListModel injectMoldBoardListModel; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java new file mode 100644 index 0000000..e4e28cb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardAssembleCompRateModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("合格率目标值") + private String qualifiedRateTargetValue; + + @ApiParam("完成率") + private String planCompleteRate; + + @ApiParam("合格率偏差值") + private String fpyDeviationValue; + +} 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 new file mode 100644 index 0000000..fca607d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class MgnBoardListModel { + + @ApiParam("产线产量汇总") + private List centerYieldList; + + @ApiParam("月度产量汇总") + private List monthlyYieldList; + + @ApiParam("当班计划产量") + private Double shiftPlanYield; + + @ApiParam("当班实际产量") + private Double shiftActualYield; + + @ApiParam("计划完成率") + private String planCompleteRate; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java new file mode 100644 index 0000000..795cfce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardYieldModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("日期") + private String date; + + @ApiParam("计划产量") + private Double planYield; + + @ApiParam("实际产量") + private Double actualYield; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java new file mode 100644 index 0000000..a8f2e8a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardCustomParamCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesBoardCustomParamCfgRepository extends BaseRepository { +} From cd32eee8ea8112c40797400dc840deb3160a1e18 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 16 Oct 2020 19:24:43 +0800 Subject: [PATCH 29/29] =?UTF-8?q?=E6=8E=92=E7=A8=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 58d4473..ca4851d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -88,7 +88,7 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { private Integer stockQty; @Column(name = "MIN_GEN_LOT") - @ApiParam("最小生成批次") + @ApiParam("最小下达批次") private Integer minGenLot; @Transient