From a35171a41d58b1360da1825e2d228a687c6c0402 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 29 Nov 2019 15:54:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++- .../estsh/i3plus/pojo/wms/bean/WmsPickCount.java | 53 ++++++++++++++++++++++ .../wms/repository/WmsPickCountRepository.java | 17 +++++++ 3 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.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 69259c5..0a776ba 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 @@ -644,7 +644,8 @@ public class WmsEnumUtil { VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"), - FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"); + FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), + KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"); private int value; private String code; @@ -827,7 +828,8 @@ public class WmsEnumUtil { VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"), VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), - VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"); + VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), + KT_PICK_RC("KT_PICK_RC", "坤泰拣货"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java new file mode 100644 index 0000000..69e19ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :供应商物料每月数量 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-11-27 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PICK_COUNT") +@Api("供应商物料每月数量") +public class WmsPickCount extends BaseBean { + + private static final long serialVersionUID = 4849044986767609486L; + @Column(name = "YEAR") + @ApiParam(value = "年") + private String year; + + @Column(name = "MONTH") + @ApiParam(value = "月") + private String month; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + private String vendorNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam(value = "数量") + private Double qty; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java new file mode 100644 index 0000000..a62056a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPickCount; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(拣货数量) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 13:40 + * @Modify: + **/ +@Repository +public interface WmsPickCountRepository extends BaseRepository{ + +} From 831daa4964cb085b2d165914236b44da27aeae0d Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 29 Nov 2019 15:56:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90#1241=20KT-=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF-=E5=A2=9E=E5=8A=A0=E9=81=93=E5=8F=A3?= =?UTF-8?q?=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/wms/bean/WmsPOMaster.java | 4 ++++ 1 file changed, 4 insertions(+) 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 34d1a36..12dff4c 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 @@ -159,6 +159,10 @@ public class WmsPOMaster extends BaseBean { @Transient private List orderNoList; + @Column(name = "DOCK") + @ApiParam("道口") + public String dock; + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; }