From b376450d4b1c5ef37439b7f1de7fbabcef5dc933 Mon Sep 17 00:00:00 2001 From: songss Date: Thu, 24 Sep 2020 14:55:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E5=BC=82=E5=B8=B8=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDbCheckRecord.java | 2 +- .../pojo/mes/model/MesDbCheckRecordModel.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java index fd18f12..5a8223f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -57,7 +57,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable { @Column(name = "PRODUCT_DATA_ID") @ApiParam("生产记录表主键ID") - private String productDataId; + private Long productDataId; //是否停线：1=是，2=否 @Column(name = "IS_STOP_LINE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java new file mode 100644 index 0000000..2b5b50c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @CreateDate: 2020/9/24 + * @Author: simon.song + */ +@Data +public class MesDbCheckRecordModel { + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partDesc; + + @ApiParam("异常取值字段") + private String errorFiledCode; + + @ApiParam("异常描述") + private String errorDesc; + + public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String errorFiledCode, String errorDesc) { + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partDesc = partDesc; + this.errorFiledCode = errorFiledCode; + this.errorDesc = errorDesc; + } +} 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 46b468c..3e7316f 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 @@ -353,7 +353,7 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean); } if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) { - DdlPreparedPack.getStringLikerPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); } if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) { DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean); From b8e34a34b5c49f370c6d87b1270c3a4056923a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 24 Sep 2020 14:59:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=9011561=2019081-=E5=AE=89=E7=81=AFpu?= =?UTF-8?q?shPLC=E6=8E=A7=E5=88=B6=E4=B8=89=E8=89=B2=E7=81=AF-=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E6=9C=AA=E6=8E=A7=E5=88=B6=E5=85=B7=E4=BD=93=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D-20200924=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonPlcColorCfg.java | 54 ++++++++++++++++++++++ .../repository/IAndonPlcColorCfgRepository.java | 17 +++++++ 2 files changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java new file mode 100644 index 0000000..5893a1d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.andon.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 : 系统参数配置 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-07 09:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="ANDON_PLC_COLOR_CFG") +@Api(value="PLC三色灯控制") +public class AndonPlcColorCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3284234821448131212L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name="RED_PLC_CODE") + @ApiParam(value ="红灯PLC代码") + private String redPlcCode; + + @Column(name="YELLOW_PLC_CODE") + @ApiParam(value ="黄灯PLC代码") + private String yellowPlcCode; + + @Column(name="GREEN_PLC_CODE") + @ApiParam(value ="绿灯PLC代码") + private String greenPlcCode; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java new file mode 100644 index 0000000..1de89d8 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; +import cn.estsh.i3plus.pojo.andon.bean.AndonPlcColorCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonPlcColorCfgRepository extends BaseRepository { +} From 373e5026c5b8ca5913e2c3dffd2c2fc66d96596d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 24 Sep 2020 15:21:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=902794=2009=20ext=2019081-=E8=BF=94?= =?UTF-8?q?=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8F=98=E6=9B=B4-20200813=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index b7bcc1c..f26050e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -155,4 +155,8 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("拉动数量") private Double pullQty; + + @Transient + @ApiParam("BOM用量") + private Double bomQty = 0d; } From 0f1f437a9e9b73d6645d90c70611f96f34fa03b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 24 Sep 2020 16:25:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=902794=2009=20ext=2019081-=E8=BF=94?= =?UTF-8?q?=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8F=98=E6=9B=B4-20200813=E3=80=91?= 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 | 4 ++++ 1 file changed, 4 insertions(+) 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 d717a56..8ddba7c 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 @@ -100,4 +100,8 @@ public class MesRepairRecord extends BaseBean implements Serializable { @Transient @ApiParam("缺陷集合") private List mesDefectList; + + @Transient + @ApiParam("质量状态") + private Integer qcStatus; } From 4bd47e64c31121d8da4de788dddfee3760a08fc8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 24 Sep 2020 20:03:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84-=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=90=8D=E7=A7=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 9dfdc8c..27e1ab2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -173,4 +173,8 @@ public class WmsInterfaceDataMapper extends BaseBean { @ColumnDefault("10") @AnnoOutputColumn(refClass = WmsEnumUtil.SOFT_DATA_FORM.class, refForeignKey = "value", value = "description", required = false) public Integer softDataType; + + @ApiParam("接口名称") + @Column(name = "INTERFACE_NAME") + public String interfaceName; } 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 3e5609b..6c0f1d4 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 @@ -2543,6 +2543,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getDestBeanName(), "destBeanName", result); DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getBusiRoute(), "busiRoute", result); DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getGroupName(), "groupName", result); + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getInterfaceName(), "interfaceName", result); getStringBuilderPack(wmsInterfaceDataMapper, result);