From f4e6c63956e679f1f60c953e143770cc9d496e1c Mon Sep 17 00:00:00 2001 From: jhh2579 <2579728558@qq.com> Date: Fri, 30 Jul 2021 17:56:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java | 87 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java | 124 +++++++++++++++++++++ 4 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index d513d0d..5d6120a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2775,7 +2775,8 @@ public class MesEnumUtil { FIRST_CHECK(10, "FIRST_CHECK", "首检"), ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), END_CHECK(30, "END_CHECK", "末检"), - RC_CHECK(40, "RC_CHECK", "发货检验"); + RC_CHECK(40, "RC_CHECK", "发货检验"), + OUTSOURCE_CHECK(50, "工序外协检"); private int value; private String code; 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 ac9830d..ca147d9 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 @@ -1030,7 +1030,8 @@ public class MesPcnEnumUtil { FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), END_CHECK(30, "末检"), - RC_CHECK(40, "发货检验"); + RC_CHECK(40, "发货检验"), + OUTSOURCE_CHECK(50, "工序外协检"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java new file mode 100644 index 0000000..81e4e4b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java @@ -0,0 +1,87 @@ +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.*; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : honghui.jiang + * @CreateDate : 2021-07-28 18:53 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "QMS_WMS_INQC") +@Api("同步质检表") +public class QmsWmsInqc extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2821213670812244228L; + @Column(name = "RUID") + @ApiParam("RUID") + private Integer ruid; + + @Column(name = "UUID") + @ApiParam("收获流水号") + private Integer uuid; + + @Column(name = "MATNR") + @ApiParam("物料编码") + private String matnr; + + @Column(name = "ZDEV") + @ApiParam("是否合格") + private String zdev; + + @Column(name = "ZPOST") + @ApiParam("交易日期") + private String zPost; + + @Column(name = "ZTIME") + @ApiParam("交易时间") + private String zTime; + + @Column(name = "ADD_TIME_YMD") + @ApiParam("添加日期") + private String addTimeYmd; + + @Column(name = "ADDTIME_HMS") + @ApiParam("添加时间") + private String addTimeHms; + + @Column(name = "FINISHTIME_YMD") + @ApiParam("处理日期") + private String finishTimeYmd; + + @Column(name = "FINISHTIME_HMS") + @ApiParam("处理时间") + private String finishTimeHms; + + @Column(name = "DELETE_FLAG") + @ApiParam("删除标记") + private Integer deleteFlag; + + @Column(name = "READ_FLAG") + @ApiParam("读取标识") + private Integer readFlag; + + @Column(name = "ERR_CODE") + @ApiParam("错误代") + private String errCode; + + @Column(name = "ERR_MSG") + @ApiParam("错误信息") + private String errMsg; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java new file mode 100644 index 0000000..0a68afe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java @@ -0,0 +1,124 @@ +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.*; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2021-07-28 18:32 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "WMS_QMS_IB") +@Api("工序外协接口表") +public class WmsQmsIb extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1543736169792837863L; + @Column(name = "RUID") + @ApiParam("RUID") + private Integer ruid; + + @Column(name = "UUID") + @ApiParam("收获流水号") + private Integer uuid; + + @Column(name = "WERKS") + @ApiParam("域") + private String werks; + + @Column(name = "LGORT") + @ApiParam("地点") + private String lgort; + + @Column(name = "WLBRT") + @ApiParam("收获库位") + private String wlbrt; + + @Column(name = "REFID") + @ApiParam("单据号") + private String refId; + + @Column(name = "ZEILE") + @ApiParam("行号") + private Integer zeile; + + @Column(name = "ACTION") + @ApiParam("业务类型") + private String action; + + @Column(name = "LIFNR") + @ApiParam("供应商编码") + private String lifnr; + + @Column(name = "MATNR") + @ApiParam("物料编码") + private String matnr; + + @Column(name = "ERFMG") + @ApiParam("收获数量") + private Integer erfmg; + + @Column(name = "ERFME") + @ApiParam("计量单位") + private String erfme; + + @Column(name = "CHKNO") + @ApiParam("检验编号") + private String chkno; + + @Column(name = "STONO") + @ApiParam("炉批号") + private String stono; + + @Column(name = "ZPOST") + @ApiParam("收获日期") + private String zpost; + + @Column(name = "ZTIME") + @ApiParam("收获时间") + private String ztime; + + @Column(name = "ADDTIME_YMD") + @ApiParam("添加日期") + private String addtimeYmd; + + @Column(name = "ADDTIME_HMS") + @ApiParam("添加时间") + private String addtimeHms; + + @Column(name = "FINISHTIME_YMD") + @ApiParam("处理日期") + private String finishtimeYmd; + + @Column(name = "FINISHTIME_HMS") + @ApiParam("处理时间") + private String finishtimeHms; + + @Column(name = "DELETE_FLAG") + @ApiParam("删除标记") + private Integer deleteFlag; + + @Column(name = "READ_FLAG") + @ApiParam("读取标识") + private Integer readFlag; + + @Column(name = "ERR_CODE") + @ApiParam("错误代") + private String errCode; + +} From 9dac40797a36e1536e4837b32d9fd8f30c4f1b85 Mon Sep 17 00:00:00 2001 From: jhh2579 <2579728558@qq.com> Date: Fri, 30 Jul 2021 18:15:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=A3=80-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.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/QmsWmsInqc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java index 81e4e4b..b041e74 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java @@ -24,7 +24,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "QMS_WMS_INQC") +@Table(name = "IF_QMS_WMS_INQC") @Api("同步质检表") public class QmsWmsInqc extends BaseBean implements Serializable { From 54279d43ffcbecd3dcdb707fd60968ccf50db04a Mon Sep 17 00:00:00 2001 From: jhh2579 <2579728558@qq.com> Date: Fri, 30 Jul 2021 18:20:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java | 87 --------------- .../cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java | 124 --------------------- 2 files changed, 211 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java deleted file mode 100644 index b041e74..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java +++ /dev/null @@ -1,87 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : honghui.jiang - * @CreateDate : 2021-07-28 18:53 - * @Modify: - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "IF_QMS_WMS_INQC") -@Api("同步质检表") -public class QmsWmsInqc extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2821213670812244228L; - @Column(name = "RUID") - @ApiParam("RUID") - private Integer ruid; - - @Column(name = "UUID") - @ApiParam("收获流水号") - private Integer uuid; - - @Column(name = "MATNR") - @ApiParam("物料编码") - private String matnr; - - @Column(name = "ZDEV") - @ApiParam("是否合格") - private String zdev; - - @Column(name = "ZPOST") - @ApiParam("交易日期") - private String zPost; - - @Column(name = "ZTIME") - @ApiParam("交易时间") - private String zTime; - - @Column(name = "ADD_TIME_YMD") - @ApiParam("添加日期") - private String addTimeYmd; - - @Column(name = "ADDTIME_HMS") - @ApiParam("添加时间") - private String addTimeHms; - - @Column(name = "FINISHTIME_YMD") - @ApiParam("处理日期") - private String finishTimeYmd; - - @Column(name = "FINISHTIME_HMS") - @ApiParam("处理时间") - private String finishTimeHms; - - @Column(name = "DELETE_FLAG") - @ApiParam("删除标记") - private Integer deleteFlag; - - @Column(name = "READ_FLAG") - @ApiParam("读取标识") - private Integer readFlag; - - @Column(name = "ERR_CODE") - @ApiParam("错误代") - private String errCode; - - @Column(name = "ERR_MSG") - @ApiParam("错误信息") - private String errMsg; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java deleted file mode 100644 index 0a68afe..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java +++ /dev/null @@ -1,124 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : - * @CreateDate : 2021-07-28 18:32 - * @Modify: - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "WMS_QMS_IB") -@Api("工序外协接口表") -public class WmsQmsIb extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1543736169792837863L; - @Column(name = "RUID") - @ApiParam("RUID") - private Integer ruid; - - @Column(name = "UUID") - @ApiParam("收获流水号") - private Integer uuid; - - @Column(name = "WERKS") - @ApiParam("域") - private String werks; - - @Column(name = "LGORT") - @ApiParam("地点") - private String lgort; - - @Column(name = "WLBRT") - @ApiParam("收获库位") - private String wlbrt; - - @Column(name = "REFID") - @ApiParam("单据号") - private String refId; - - @Column(name = "ZEILE") - @ApiParam("行号") - private Integer zeile; - - @Column(name = "ACTION") - @ApiParam("业务类型") - private String action; - - @Column(name = "LIFNR") - @ApiParam("供应商编码") - private String lifnr; - - @Column(name = "MATNR") - @ApiParam("物料编码") - private String matnr; - - @Column(name = "ERFMG") - @ApiParam("收获数量") - private Integer erfmg; - - @Column(name = "ERFME") - @ApiParam("计量单位") - private String erfme; - - @Column(name = "CHKNO") - @ApiParam("检验编号") - private String chkno; - - @Column(name = "STONO") - @ApiParam("炉批号") - private String stono; - - @Column(name = "ZPOST") - @ApiParam("收获日期") - private String zpost; - - @Column(name = "ZTIME") - @ApiParam("收获时间") - private String ztime; - - @Column(name = "ADDTIME_YMD") - @ApiParam("添加日期") - private String addtimeYmd; - - @Column(name = "ADDTIME_HMS") - @ApiParam("添加时间") - private String addtimeHms; - - @Column(name = "FINISHTIME_YMD") - @ApiParam("处理日期") - private String finishtimeYmd; - - @Column(name = "FINISHTIME_HMS") - @ApiParam("处理时间") - private String finishtimeHms; - - @Column(name = "DELETE_FLAG") - @ApiParam("删除标记") - private Integer deleteFlag; - - @Column(name = "READ_FLAG") - @ApiParam("读取标识") - private Integer readFlag; - - @Column(name = "ERR_CODE") - @ApiParam("错误代") - private String errCode; - -}