From a92b87f6a098b92b6fac044d82c685168ccb9bf3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 26 Apr 2021 09:54:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=903391=20=E6=B7=BB=E5=8A=A0=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8-=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java index 422ff94..eac7880 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -99,6 +101,10 @@ public class WmsQCSNErrorList extends BaseBean { @ApiParam(value = "供应商编码") private String vendorNo; + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + @Column(name = "ERROR_CODE") @ApiParam("不良代码") private String errorCode; @@ -116,4 +122,9 @@ public class WmsQCSNErrorList extends BaseBean { @ColumnDefault("0") @ApiParam(value = "质检比例", example = "0") public String qcScale; + + @Column(name = "REF_SRC") + @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refSrc; } From dd000b33a313792b360b7b11374c3b2390511691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 27 Apr 2021 16:16:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=9015573=2020027-PCN=E7=AB=AF=20-=20?= =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C-=20WMS=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E5=B0=86=E6=95=B0=E6=8D=AE=E4=BC=A0=E8=BE=93=E5=88=B0=E4=BA=86?= =?UTF-8?q?=E4=B8=AD=E9=97=B4=E6=8E=A5=E5=8F=A3=E8=A1=A8=EF=BC=8C=E4=BD=86?= =?UTF-8?q?MES=E8=BF=98=E6=9C=AA=E7=94=9F=E6=88=90=E6=9D=A5=E6=96=99?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=20-20210429=E3=80=91=20?= =?UTF-8?q?=E3=80=9015546=2020027-=E7=AE=A1=E7=90=86=E7=AB=AF-=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=BF=83-=E9=A6=96=E6=A3=80=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8-=E7=8F=AD?= =?UTF-8?q?=E7=BB=84=E5=92=8C=E7=8F=AD=E9=95=BF=E6=98=BE=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF-20210421=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/MesQcOrder.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 514a5bc..0593668 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -163,4 +163,12 @@ public class MesQcOrder extends BaseBean implements Serializable { @Transient @ApiParam("质检单集合") private List orderNoList; + + @Transient + @ApiParam("控制计划编号") + private String controlPlanId; + + @Transient + @ApiParam("班组") + private String shiftGroupName; } From f20e000957a3a9891ee8467686e5e11a4e1a1f39 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 27 Apr 2021 17:51:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?15608=2019081-=E8=BF=94=E5=B7=A5=E8=BF=94?= =?UTF-8?q?=E4=BF=AE-=E6=8A=A5=E5=BA=9F=E5=8D=95=E6=8D=AE=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfDismantleRecord.java | 21 +++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQuarantineRecord.java | 12 ++++++++++++ 2 files changed, 33 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 defd057..ce62778 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 @@ -111,4 +111,25 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; + } 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 25aa552..46a5850 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 @@ -73,4 +73,16 @@ public class MesQuarantineRecord extends BaseBean { @Column(name = "SCRAP_No") @ApiParam("报废单号") private String scrapNo; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; } From c6e80ad9a70231b5a8f9ba89b617f87d073ed730 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 27 Apr 2021 17:57:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=903391=20=E6=B7=BB=E5=8A=A0=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=B4=A8=E6=A3=80=E4=B8=8D=E8=89=AF=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=A1=A8-=E5=90=8E=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 27 ++++++++++++++++++++++ 1 file changed, 27 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 21f9178..89eba5c 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 @@ -130,6 +130,33 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工序") + private String workCellCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; @Transient @ApiParam(value = "完成状态") From cd351e443ff26aa10a3e5876817274c4f604b497 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 28 Apr 2021 09:58:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?15627=2019048-=E5=96=B7=E6=B6=82=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=9C=A8=E4=B8=8D=E5=90=8C=E5=B7=A5=E4=BD=8D=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=8A=A5=E5=B7=A5-20210430=20->=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=94=AF=E4=B8=80=E7=B4=A2=E5=BC=95?= =?UTF-8?q?:=E5=B7=A5=E5=8E=82=E4=BB=A3=E7=A0=81+=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E7=BC=96=E5=8F=B7+=E5=8E=9F=E6=9D=90=E6=96=99=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 797fa82..03cd270 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -5,17 +5,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; 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.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -31,7 +27,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "IF_PRODUCT_OFF_LINE") +@Table(name = "IF_PRODUCT_OFF_LINE", uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "ITEM_PART_NO"}) +}) @NoArgsConstructor @AllArgsConstructor @Api("生产报工表")