From 27ceea41139d53b0831d4de89070d70ab8bb2698 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 10 Jun 2021 17:49:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?16147=2020135-=E4=B8=8D=E8=89=AF=E5=93=81?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=89=AB=E6=9D=A1=E7=A0=81=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=8E=BB=E6=8E=89=E6=8A=A5=E5=BA=9F=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E8=BF=99=E4=B8=AA=E9=80=89=E6=8B=A9=E6=A1=86--2021-06?= =?UTF-8?q?-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java index 9eeb99a..b195a30 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java @@ -29,15 +29,12 @@ public class CosmaDefectModel { @ApiParam("过程条码") private String serialNumber; - @ApiParam("缺陷代码集合") - private List defectCodeList; + @ApiParam("缺陷代码") + private String defectCode; @ApiParam("缺陷位置") private String location; @ApiParam("操作人") private String userName; - - @ApiParam("报废原因") - private String scrapCode; } From fe3416a73633d30727e78a944395c04fee3d7be6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 10 Jun 2021 18:38:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 3da2cb3..4d58a9e 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 @@ -236,7 +236,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean); - DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); @@ -484,6 +484,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); + DdlPreparedPack.getStringLikerPack(basVendor.getUserName(), "userName", result); DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); DdlPreparedPack.getNumEqualPack(basVendor.getVendorType(), "vendorType", result); From aa78fd8bd5c71d9408fb942d1c1838098a417044 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 10 Jun 2021 19:46:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesLockRecord.java | 59 ++++++++++++++++++++++ .../mes/repository/MesLockRecordRepository.java | 16 ++++++ 2 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java new file mode 100644 index 0000000..7607f1f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -0,0 +1,59 @@ +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.*; +import java.io.Serializable; + +/** + * @Description :锁定记录 + * @Reference : + * @Author : dominic + * @CreateDate : 2021-06-10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_LOCK_RECORD") +@Api("mes锁定记录表") +public class MesLockRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5132229443235106976L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位代码") + private String workCellCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "LOCK_REASON") + @ApiParam("锁定原因") + private String lockReason; + + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("工号") + private String employeeNumber; + + @Column(name = "LOCK_STATUS") + @ColumnDefault("1") + @ApiParam("锁定状态") + private Integer lockStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java new file mode 100644 index 0000000..94c05a6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.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.MesLockRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/10 19:36 + * @Modify: + **/ +@Repository +public interface MesLockRecordRepository extends BaseRepository { +} From dbdcbec03269fe0bd346764ff626e60c6f6e8abf Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 11 Jun 2021 09:22:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=96=99?= =?UTF-8?q?=E6=9E=B6=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index be65d70..b849f71 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -8,6 +8,7 @@ import java.io.Serializable; /** * 产品履历报表-产品信息 + * * @author yumingxing * @version 1.0 * @date 2020/12/18 15:16 @@ -33,6 +34,9 @@ public class ProductSnModel implements Serializable { @ApiParam("CMS标签号") private String qrCode; + @ApiParam("料架号") + private String ctNo; + @ApiParam("产线") private String workCenterName; @@ -55,10 +59,8 @@ public class ProductSnModel implements Serializable { private String qcStatusName; - - - public ProductSnModel(String packageNo,String customerPartNo, String serialNumber, String partNo, - String qrCode, String workCenterName, String processName, + public ProductSnModel(String packageNo, String customerPartNo, String serialNumber, String partNo, + String qrCode, String ctNo, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) { this.packageNo = packageNo; @@ -66,6 +68,7 @@ public class ProductSnModel implements Serializable { this.serialNumber = serialNumber; this.partNo = partNo; this.qrCode = qrCode; + this.ctNo = ctNo; this.workCenterName = workCenterName; this.processName = processName; this.workCellName = workCellName; From 35e41f94e18d576817a317453830dbb3e45d966e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 11 Jun 2021 11:15:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E8=AE=B0=E5=BD=95=E8=A1=A8=E9=94=81=E5=AE=9A=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=B5=8B=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.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/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java index 7607f1f..8d3d516 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -55,5 +55,5 @@ public class MesLockRecord extends BaseBean implements Serializable { @Column(name = "LOCK_STATUS") @ColumnDefault("1") @ApiParam("锁定状态") - private Integer lockStatus; + private Integer lockStatus = 1; }