From ebd3f852553044687b2539c2625f4ba266cd9e1e Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 22 Apr 2021 17:30:25 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E6=89=AD=E7=9F=A9?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index ba16832..b47da7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -129,6 +129,10 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; + @Transient + @ApiParam("数据范围") + private String torqueValRange; + public double getKeyDataCountVal() { return this.keyDataCount == null ? 0 : this.keyDataCount; From 05f805f227898628130bba5ae048982721683b3f Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Thu, 22 Apr 2021 18:28:03 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java index 14a5354..a96437f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java @@ -63,6 +63,11 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable { @ApiParam(value = "是否物理删除", example = "0") private Integer isPhysicalDelete; + //枚举：CommonEnumUtil.DATA_SOURCE_TYPE + @Column(name = "IS_PHYSICAL_DELETE") + @ApiParam(value = "数据源类型") + private Integer dataSourceType; + @Column(name = "LAST_EXECUTION_TIME") @ApiParam("末次迁移时间") private String lastExecutionTime; From 28d512021e15da4c7e0be8734f35124154ed7b30 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 22 Apr 2021 19:24:52 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E7=B1=BB=E5=9E=8B=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/MesDataMigrationCfg.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/MesDataMigrationCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java index a96437f..9caec9d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java @@ -64,7 +64,7 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable { private Integer isPhysicalDelete; //枚举：CommonEnumUtil.DATA_SOURCE_TYPE - @Column(name = "IS_PHYSICAL_DELETE") + @Column(name = "DATASOURCE_TYPE") @ApiParam(value = "数据源类型") private Integer dataSourceType; From e18b726369740484d3b0119c6ec6516d26930516 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 23 Apr 2021 00:23:36 +0800 Subject: [PATCH 04/16] =?UTF-8?q?MesPackageTravelRepository=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20Repository=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java index 3bef25a..323ee9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java @@ -3,11 +3,13 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesPackageTravel; +import org.springframework.stereotype.Repository; /** * @Author: Wynne.Lu * @CreateDate: 2019/10/19 2:57 下午 * @Description: **/ +@Repository public interface MesPackageTravelRepository extends BaseRepository { } From 92e0acee583207dda92013d5e302fea08c85ae68 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 23 Apr 2021 11:00:00 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 1cc212f..7a56fa4 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 @@ -4,17 +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 javax.persistence.*; + 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; /** @@ -30,7 +27,12 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "IF_PACKAGE_DETAIL") +@Table(name = "IF_PACKAGE_DETAIL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PART_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "IF_CODE"}) +}) @Api("包装明细表") public class IfPackageDetail extends BaseBean implements Serializable { From a9881bc01f0b5d17aaa85406dce6c3328bb3c384 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 23 Apr 2021 11:46:08 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=B0=E5=9B=BD?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 4 ---- modules/i3plus-pojo-model/pom.xml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..c49b26f 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -31,10 +31,6 @@ fastjson - com.alibaba - fastjson - - com.thoughtworks.xstream xstream diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..24d1c96 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -29,10 +29,6 @@ i3plus-pojo-report - - i3plus.pojo - i3plus-pojo-form - i3plus.pojo From 5193012b6934b13aaeb168f08807a21d4ad5d4a5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 25 Apr 2021 13:34:12 +0800 Subject: [PATCH 07/16] =?UTF-8?q?15527=2019081-=E8=BF=BD=E6=BA=AF=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E6=8A=A5=E8=A1=A8-Operator=20Data=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7Time=20Bu?= =?UTF-8?q?ilt=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index 22d2230..4ece2f1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -73,4 +73,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @Transient @ApiParam("物料名称") private String partName; + + @Transient + @ApiParam("收货日期") + private String receiptDate; } 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 75a7485..6cb1b26 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 @@ -2695,6 +2695,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); } + DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getNumEqualPack(mesProduceSn.getPrintStatus(), "printStatus", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); From 91d7b0157de4dd183580200d02b3be599dd3d393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BF=8A=E7=94=9F?= <337942886@qq.com> Date: Sun, 25 Apr 2021 16:34:30 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=2015241=C2=A019081=20=E2=80=94=E2=80=94=E5=8C=97?= =?UTF-8?q?=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E8=B4=A7=E8=BF=9B=E5=BA=A6=E6=8A=A5=E8=A1=A8=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=9C=80=E6=8E=92=E5=BA=8F=EF=BC=8C2021-04-17=20=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E8=AE=A1=E5=88=92=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?= =?UTF-8?q?=2015474=2019081-=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=BF=83=EF=BC=8C?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=B0=E8=B4=A7=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=AC=A1=E6=95=B0=E6=9F=A5=E8=AF=A2=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=88=B0=E8=B4=A7=E6=97=B6=E9=97=B4=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E5=8F=B7--20210422=2015471=2019081-=E9=A2=86=E6=96=99=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8A=A5=E8=A1=A8=E5=8F=8A=E6=98=8E=E7=BB=86=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=8B=A3=E8=B4=A7=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4?= =?UTF-8?q?-20210425?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 367b62e..323b3f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -259,6 +259,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam("计划交货时间") private String planPlanDateTime; + @Transient + @ApiParam(value = "收货日期时间") + public String receiveDateTime; + @@ -305,12 +309,13 @@ public class WmsPOMaster extends BaseBean { } public WmsPOMaster(String orderNo, String reason, String planDate, String planTime, - String receiveTime, String vendorNo, String vendorName, String organizeCode) { + String receiveTime,String receiveDate, String vendorNo, String vendorName, String organizeCode) { this.orderNo = orderNo; this.reason = reason; this.planDate = planDate; this.planTime = planTime; this.receiveTime = receiveTime; + this.receiveDate= receiveDate; this.vendorNo = vendorNo; this.vendorName = vendorName; this.organizeCode = organizeCode; From 5bf550499283b76241464af8f80fc93587f2673e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 25 Apr 2021 18:20:50 +0800 Subject: [PATCH 09/16] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-screen/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index c49b26f..cf274d9 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 24d1c96..e74b3a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 071fe58..7f46931 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index e57347e..48cbd48 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 21a3d716f4d65e48c5c192e0acc95c8422616620 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 25 Apr 2021 18:26:34 +0800 Subject: [PATCH 10/16] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-screen/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index cf274d9..c49b26f 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index e74b3a6..24d1c96 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 7f46931..071fe58 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 48cbd48..e57347e 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index ddb0c5a..591800b 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From a30e97336cadf226d3f1973fd1343a02ba517474 Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Sun, 25 Apr 2021 22:39:45 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E5=8E=82=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java index 3406e85..4e3afa7 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java @@ -4,15 +4,11 @@ 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.Table; +import javax.persistence.*; /** * @Description : @@ -43,4 +39,12 @@ public class SwebVendorRel extends BaseBean { @ApiParam("供应商代码") @Column(name = "VENDOR_NO") private String vendorNo; + + @ApiParam("物料代码") + @Column(name = "PART_NO") + private String partNo; + + @ApiParam("物料名称") + @Column(name = "PART_NAME_ADD") + private String partNameAdd; } From a92b87f6a098b92b6fac044d82c685168ccb9bf3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 26 Apr 2021 09:54:08 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E3=80=903391=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8-?= =?UTF-8?q?=E5=90=8E=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 13/16] =?UTF-8?q?=E3=80=9015573=2020027-PCN=E7=AB=AF=20-?= =?UTF-8?q?=20=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C-=20WMS=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E5=B0=86=E6=95=B0=E6=8D=AE=E4=BC=A0=E8=BE=93=E5=88=B0?= =?UTF-8?q?=E4=BA=86=E4=B8=AD=E9=97=B4=E6=8E=A5=E5=8F=A3=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E4=BD=86MES=E8=BF=98=E6=9C=AA=E7=94=9F=E6=88=90=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=20-20210429?= =?UTF-8?q?=E3=80=91=20=E3=80=9015546=2020027-=E7=AE=A1=E7=90=86=E7=AB=AF-?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=BF=83-=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8-?= =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=92=8C=E7=8F=AD=E9=95=BF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=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 14/16] =?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 15/16] =?UTF-8?q?=E3=80=903391=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E6=A3=80=E4=B8=8D=E8=89=AF=E6=B8=85?= =?UTF-8?q?=E5=8D=95=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 16/16] =?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("生产报工表")