From 16f6861ecd3c401793f1cbb1b3212b78754742a6 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 14 Apr 2020 20:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AA=97=E5=8F=A3=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 43 +++++++++++++ .../i3plus/pojo/wms/bean/WmsVendorRelation.java | 2 +- .../wms/repository/WmsCustWindowRepository.java | 16 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 75 ++++++++++++++++++++++ 4 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java new file mode 100644 index 0000000..5b53055 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -0,0 +1,43 @@ +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 : jason + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_CUST_WINDOW") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="客户窗口时间",description = "客户窗口时间") +public class WmsCustWindow extends BaseBean { + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + + @Column(name = "CUST_WINDOW_TIME") + @ApiParam(value = "窗口时间") + private String custWindowTime; + + @Column(name = "DELAY_HOUR") + @ApiParam(value = "容差") + private Integer delayHour; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java index 485f57a..3b3bc84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java @@ -38,7 +38,7 @@ public class WmsVendorRelation extends BaseBean { @Column(name = "SUB_VENDOR_CODE") @ApiParam(value = "子供应商编号") - private String subVendorCode; + private String subVendorNo; @Column(name = "SUB_VENDOR_NAME") @ApiParam(value = "子供应商名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java new file mode 100644 index 0000000..986645f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCustWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description : 客户窗口时间 + * @Reference : + * @Author : jason + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Repository +public interface WmsCustWindowRepository extends BaseRepository { +} 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 17793d9..fb7dc06 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 @@ -2243,6 +2243,81 @@ public class WmsHqlPack { } /** + * 物料扩展属性 + * + * @param partExtend + * @return + */ + public static DdlPackBean packHqlWmsPartExtendByPart(WmsPartExtend partExtend) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(partExtend.getPartNo(), "partNo", packBean); + getStringBuilderPack(partExtend, packBean); + + return packBean; + } + + /** + * 替代料 条件封装 + * + * @param subPart + * @return + */ + public static DdlPackBean packHqlWmsSubPartByPart(WmsSubPart subPart) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(subPart.getPartNo(), "partNo", packBean); + getStringBuilderPack(subPart, packBean); + + return packBean; + } + + /** + * 供应商窗口时间 条件封装 + * + * @param subPart + * @return + */ + public static DdlPackBean packHqlWmsVendorWindow(WmsVendorWindow vendorWindow) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorWindow.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorWindow, packBean); + + return packBean; + } + + /** + * 供应商父子关系 条件封装 + * + * @param vendorPlanner + * @return + */ + public static DdlPackBean packHqlWmsVendorPlanner(WmsVendorPlanner vendorPlanner) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorPlanner.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorPlanner, packBean); + + return packBean; + } + + /** + * 供应商父子关系 条件封装 + * + * @param vendorRelation + * @return + */ + public static DdlPackBean packHqlWmsVendorRelation(WmsVendorRelation vendorRelation) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorRelation.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorRelation, packBean); + + return packBean; + } + + /** * 单位定义 * * @param wmsUnit