From 02cf004828cae038457e8a0b34252a78391fd9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 18 Jun 2021 14:37:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=903566=2020063-=E9=89=B4=E5=AE=9A?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5-20210618=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 33 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 4 +++ .../i3plus/pojo/mes/bean/IfPackageDetail.java | 4 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 20 +++++++++++++ .../i3plus/pojo/mes/bean/MesPackageDetail.java | 6 +++- 5 files changed, 66 insertions(+), 1 deletion(-) 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 b2a2d97..a92a66d 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 @@ -6724,4 +6724,37 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PENDING_REPORT_TYPE { + + IDENTIFICATION_TYPE(10, "鉴定类型"), + FAILURE_MODE(20, "失效模式"); + + private int value; + private String description; + + PENDING_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java index 15c072a..ddec01b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -80,4 +80,8 @@ public class IfPackage extends BaseBean implements Serializable { @Column(name = "SYNC_STATUS") @ApiParam("同步状态") private Integer syncStatus; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; } \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index cc831dc..1b18a01 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -128,4 +128,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "SYNC_FLAG") @ApiParam("同步标识(同步工具使用)") private Integer syncFlag; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index d0ed327..12566dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -117,6 +117,22 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("入库时间") private String inLocationTime; + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name = "IS_RETURN") + @ApiParam("是否回传") + private Integer isReturn; + @Transient @ApiParam("封箱状态") private String sealStatus; @@ -211,6 +227,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; + @Transient + @ApiParam("临时条码集合") + private List mesTemporarySnRecordList = new ArrayList<>(); + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index a9c9324..2275812 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -69,11 +69,15 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码4") private String packageNo4; + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + @Transient @ApiParam("批次") private String lotNo; - @Transient + @Column(name = "PRODUCT_SN") @ApiParam("产品条码") private String productSn; From e3a558913b8b93eb260d03825f91512edf29581d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 23 Jun 2021 11:41:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=903566=2020063-=E9=89=B4=E5=AE=9A?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5-20210618=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesTemporarySnRecord.java | 72 ++++++++++++++++++++++ .../repository/MesTemporarySnRecordRepository.java | 14 +++++ 2 files changed, 86 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTemporarySnRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTemporarySnRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTemporarySnRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTemporarySnRecord.java new file mode 100644 index 0000000..0272598 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTemporarySnRecord.java @@ -0,0 +1,72 @@ +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: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TEMPORARY_SN_RECORD") +@Api("MES_临时条码记录信息") +public class MesTemporarySnRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "IF_PACK") + @ApiParam("是否打包") + private Integer ifPack; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式名称") + private String patternName; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTemporarySnRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTemporarySnRecordRepository.java new file mode 100644 index 0000000..8e968f7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTemporarySnRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTemporarySnRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesTemporarySnRecordRepository extends BaseRepository { +} From 3c42131f2bd16711fd8160de4f1a0feba43d886e Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 24 Jun 2021 19:19:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?16436=2019081-PCN-=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E8=BF=94=E4=BF=AE-=E9=9A=94=E7=A6=BB-=E5=9F=BA=E4=BA=8E?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2=E9=9B=B6=E4=BB=B6=E6=97=B6?= =?UTF-8?q?-=E6=95=A3=E4=BB=B6=E6=B8=85=E5=8D=95=E5=92=8C=E7=89=A9?= =?UTF-8?q?=E6=96=99bom=EF=BC=8C=E5=92=8C=E5=A2=9E=E5=8A=A0=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 6095463..dc0a116 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -108,6 +108,9 @@ public class MesBom extends BaseBean implements Serializable { @ApiParam("报废数") private Double wasteQty = 0d; + @Transient + @ApiParam("客户零件号") + private String custPartNo; public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java index 46a5850..bdf9ab3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java @@ -85,4 +85,8 @@ public class MesQuarantineRecord extends BaseBean { @Column(name = "REPAIR_NAME") @ApiParam("维修名称") private String repairName; + + @Column(name = "IS_CANCEL_REPAIR") + @ApiParam("取消报废") + private Integer isCancelScrap; } From ed7b2fdbfea9653e56044da8d3531c0bab7bd595 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 24 Jun 2021 22:02:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java index e750735..aff63c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java @@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** 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 ab02943..53ed57b 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 @@ -1379,6 +1379,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getLeftCode(), "leftCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getCtNo(), "ctNo", result); if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { DdlPreparedPack.getNumberBiggerPackContainsZero(0.0, "qty", result); }