From 29a5d01620bf42645852f482772730d2c1446fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 6 Nov 2020 18:27:30 +0800 Subject: [PATCH 1/3] BUG#2938 --- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 36 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 12 ++++---- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 0e24a09..2b75be8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -1,6 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -85,6 +89,38 @@ public class WmsQCDetails extends BaseBean { public transient Integer lockVersion; @Transient + @ApiParam(value = "单据状态") + public Integer orderStatus; + + @Transient @ApiParam(value = "供应商编号") public String vendorNo; + + @Transient + @ApiParam(value = "供应商名称") + public String vendorDesc; + + public WmsQCDetails() { + } + + public WmsQCDetails(String partNo, String partNameRdd, String item, + Double qty, String unit, String orderNo, + Integer itemStatus, String remark, Double factQty, + Double passQty, Double rejectQty, + Integer orderStatus, String vendorNo,String vendorDesc) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.item = item; + this.qty = qty; + this.unit = unit; + this.orderNo = orderNo; + this.itemStatus = itemStatus; + this.remark = remark; + this.factQty = factQty; + this.passQty = passQty; + this.rejectQty = rejectQty; + this.orderStatus = orderStatus; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 8fe824f..60fb5e9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -103,8 +103,8 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "供应商全称") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", - searchColumnName = "vendorNo,VendorDesc", listColumnName = "vendorNo,VendorDesc", explicitColumnName = "vendorNo") - private String VendorDesc; + searchColumnName = "vendorNo,vendorDesc", listColumnName = "vendorNo,vendorDesc", explicitColumnName = "vendorNo") + private String vendorDesc; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") @@ -146,10 +146,10 @@ public class WmsQCMaster extends BaseBean { this.partNo = partNo; } - public WmsQCMaster(String orderNo, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + public WmsQCMaster(String orderNo, String vendorNo, String vendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { this.orderNo = orderNo; this.vendorNo = vendorNo; - this.VendorDesc = VendorDesc; + this.vendorDesc = vendorDesc; this.refType = refType; this.refSrc = refSrc; this.partNo = partNo; @@ -157,11 +157,11 @@ public class WmsQCMaster extends BaseBean { this.createDatetime = createDatetime; } - public WmsQCMaster(String orderNo, Double qty, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + public WmsQCMaster(String orderNo, Double qty, String vendorNo, String vendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { this.orderNo = orderNo; this.qty = qty; this.vendorNo = vendorNo; - this.VendorDesc = VendorDesc; + this.vendorDesc = vendorDesc; this.refType = refType; this.refSrc = refSrc; this.partNo = partNo; From 77d8aa4bdd58c6267e1d1aadccb057201893af18 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Fri, 6 Nov 2020 21:47:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8B=89=E5=8A=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 74 ++++++++++++++++++++++ .../wms/dbinterface/WmsInterfaceDataRecord.java | 69 ++++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 1d94a09..8557749 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -7321,6 +7321,80 @@ public class WmsEnumUtil { } /** + * 报文校验类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INTERFACE_DATA_VERIFY_STATUS { + INITIAL(10, "INITIAL", "初始化"), + COMPLETED(30, "COMPLETED", "校验完成"), + ERROR(40, "ERROR", "校验出错"); + + private int value; + private String code; + private String description; + + INTERFACE_DATA_VERIFY_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static INTERFACE_DATA_VERIFY_STATUS codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** * 运费单审批状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java new file mode 100644 index 0000000..7f5f46c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.wms.dbinterface; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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; + +/** + * WMS - SAP 中间数据库接口映射关系 + * + * @author Rock.Yu + * @since 2019-06-09 20:08 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_INTERFACE_DATA_RECORD") +@Api("接口数据收发记录") +public class WmsInterfaceDataRecord extends BaseBean { + private static final long serialVersionUID = 4139055040492108499L; + + @ApiParam("来源表名") + @Column(name = "SRC_TABLE_NAME", length = 50) + public String srcTableName; + + @ApiParam("目标实体对象的名字，多个字段用半角逗号分隔") + @Column(name = "DEST_BEAN_NAME", length = 500) + public String destBeanName; + + @ApiParam("软适配编号") + @Column(name = "SOFT_ADAPATOR_CODE") + public String softAdaptorCode; + + @ApiParam("接口名称") + @Column(name = "INTERFACE_NAME") + public String interfaceName; + + @ApiParam("报文唯一编号") + @Column(name = "SID") + public Long sid; + + @ApiParam("MOVE_TO_ERP表的ID") + @Column(name = "MOVE_TO_ERP_ID") + public Long moveToErpID; + + @ApiParam("报文校验状态") + @Column(name = "VERIFY_STATUS") + @ColumnDefault("10") + @AnnoOutputColumn(refClass = WmsEnumUtil.INTERFACE_DATA_VERIFY_STATUS.class, refForeignKey = "value", value = "description", required = false) + public int verifyStatus; + + @ApiParam("备注信息") + @Column(name = "REMARK") + public String remark; +} From 274191aee2108686aaa4d2e59663ae77522e594e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 7 Nov 2020 00:23:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=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/WmsDocMovementDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 21d4aae..1ef109a 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 @@ -491,7 +491,7 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planTime, Long itemCount) { + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planDate, String planTime, Long itemCount) { this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; this.srcLocateNo = srcLocateNo; @@ -499,6 +499,7 @@ public class WmsDocMovementDetails extends BaseBean { this.createUser = createUser; this.itemStatus = itemStatus; this.orderNo = orderNo; + this.planDate = planDate; this.planTime = planTime; this.itemCount = itemCount; }