From c38757de195514b7557ab5a2b6fcf34c65982cae Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 13 May 2020 15:43:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 113 +++++++++++---------- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 101 ++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 20 ++-- .../i3plus/pojo/wms/bean/WmsLogisticsCosts.java | 80 +++++++++++++++ .../i3plus/pojo/wms/bean/WmsModeTransport.java | 51 ++++++++++ .../i3plus/pojo/wms/bean/WmsProviderFlag.java | 53 ++++++++++ .../pojo/wms/bean/WmsShortLogisticsCosts.java | 90 ++++++++++++++++ .../repository/WmsLogisticsCostsRepository.java | 16 +++ .../wms/repository/WmsModeTransportRepository.java | 16 +++ .../wms/repository/WmsProviderFlagRepository.java | 16 +++ .../WmsShortLogisticsCostsRepository.java | 16 +++ 11 files changed, 506 insertions(+), 66 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index f8581ff..0574e44 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -16,12 +16,11 @@ public class ImppEnumUtil { * 1.集团，2.公司，3.工厂 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORGANIZE_YTPE{ + public enum ORGANIZE_YTPE { - TYPE_GROUP(1,"集团","集团"), - TYPE_COMPANY(2,"公司","公司"), - TYPE_FACTORY(3,"工厂","工厂"), - ; + TYPE_GROUP(1, "集团", "集团"), + TYPE_COMPANY(2, "公司", "公司"), + TYPE_FACTORY(3, "工厂", "工厂"); private int value; private String name; @@ -86,8 +85,8 @@ public class ImppEnumUtil { * 3.权限CODE */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TASK_METHOD_TYPE{ - CLASS_METHOD(1,"类方法","Java Class 方法"); + public enum TASK_METHOD_TYPE { + CLASS_METHOD(1, "类方法", "Java Class 方法"); // TYPE_COMPANY(2,"链接","Http URL"), // TYPE_FACTORY(3,"权限CODE","权限CODE"); @@ -148,7 +147,7 @@ public class ImppEnumUtil { } /** - * 日志级别 + * 日志级别 * 1.DEBUG：调试程序信息， * 2.INFO：程序运行信息， * 3.WARN：具有潜在危害的信息， @@ -156,13 +155,13 @@ public class ImppEnumUtil { * 5.FATAL：非常严重的错误，可能导致程序中止 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum LOG_LEVEL{ + public enum LOG_LEVEL { - DEBUG(1,"DEBUG","调试"), - INFO(2,"INFO","信息"), - WARN(3,"WARN","注意"), - ERROR(4,"ERROR","错误"), - FATAL(5,"FATAL","严重"); + DEBUG(1, "DEBUG", "调试"), + INFO(2, "INFO", "信息"), + WARN(3, "WARN", "注意"), + ERROR(4, "ERROR", "错误"), + FATAL(5, "FATAL", "严重"); private int value; private String name; @@ -238,13 +237,13 @@ public class ImppEnumUtil { * 4.SELECT：查询 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum OPERATE_TYPE{ + public enum OPERATE_TYPE { - INSERT(1,"post","新增"), //POST - DELETE(2,"put","修改"), //PUT - UPDATE(3,"delete","删除"), //DELETE - SELECT(4,"get","查询"), //GET - BUSI(5,"busi","处理"); + INSERT(1, "post", "新增"), //POST + DELETE(2, "put", "修改"), //PUT + UPDATE(3, "delete", "删除"), //DELETE + SELECT(4, "get", "查询"), //GET + BUSI(5, "busi", "处理"); private int value; private String name; @@ -317,9 +316,9 @@ public class ImppEnumUtil { * 1.PC：个人计算机 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum OPERATE_TERMINAL{ + public enum OPERATE_TERMINAL { - PC(1,"电脑端"),PDA(2,"PDA"),MOBILE(3,"手机"); + PC(1, "电脑端"), PDA(2, "PDA"), MOBILE(3, "手机"); private int value; private String description; @@ -360,8 +359,8 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_STATUS { - READ(1,"已读","fa cell-fa fa-file-text"), - UNREAD(2,"未读","fa cell-fa fa-file-o"); + READ(1, "已读", "fa cell-fa fa-file-text"), + UNREAD(2, "未读", "fa cell-fa fa-file-o"); private int value; private String name; @@ -428,10 +427,10 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_TYPE { - MAIL(1,"邮件","邮件"), - LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"), - SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); private int value; private String name; @@ -498,13 +497,13 @@ public class ImppEnumUtil { * 5.MIDDLE_TABLE：中间表 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TOOL_CONN_TYPE{ + public enum TOOL_CONN_TYPE { - SERIAL_PORT(1,"串口","串口"), - NETWORK_PORT(2,"网口","网口"), - OPC(3,"OPC","OPC"), - USB(4,"USB","USB"), - MIDDLE_TABLE(5,"中间表","中间表"); + SERIAL_PORT(1, "串口", "串口"), + NETWORK_PORT(2, "网口", "网口"), + OPC(3, "OPC", "OPC"), + USB(4, "USB", "USB"), + MIDDLE_TABLE(5, "中间表", "中间表"); private int value; private String name; private String description; @@ -568,11 +567,11 @@ public class ImppEnumUtil { * 3.BINARY_PACKET：二进制数据包 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TOOL_DATA_TYPE{ + public enum TOOL_DATA_TYPE { - STRING(1,"字符串","字符串"), - TABLE(2,"数据表","数据表"), - BINARY_PACKET(3,"二进制数据包","二进制数据包"); + STRING(1, "字符串", "字符串"), + TABLE(2, "数据表", "数据表"), + BINARY_PACKET(3, "二进制数据包", "二进制数据包"); private int value; private String name; @@ -635,9 +634,9 @@ public class ImppEnumUtil { * 1.SYSTEM：系统参数 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SYS_CONFIG_TYPE{ + public enum SYS_CONFIG_TYPE { - SYSTEM(1,"系统参数","系统参数"); + SYSTEM(1, "系统参数", "系统参数"); private int value; private String name; @@ -702,8 +701,8 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_TYPE_CONTENT { - HTML(1,"HTML","text/html;charset=UTF-8"), - TEXT(2,"TEXT","text/plain;charset=UTF-8"); + HTML(1, "HTML", "text/html;charset=UTF-8"), + TEXT(2, "TEXT", "text/plain;charset=UTF-8"); private int value; private String name; @@ -770,9 +769,9 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DYN_TABLE_CELL_TYPE { - STRING(1,"String","字符串类型"), - NUMBER(2,"Number","数字类型"), - DATE(3,"Date","时间类型"); + STRING(1, "String", "字符串类型"), + NUMBER(2, "Number", "数字类型"), + DATE(3, "Date", "时间类型"); private int value; private String name; @@ -829,6 +828,7 @@ public class ImppEnumUtil { return tmp; } } + /** * 系统值类型 * 1. String @@ -838,12 +838,12 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_VALUE_TYPE { - STRING(1,"text","文本"), - NUMBER(2,"number","数字"), - DATE(3,"date","时间"), - SWITCH(4,"switch","布尔"), - SELECT(5,"select","选择"), - FILE(6,"select","选择"); + STRING(1, "text", "文本"), + NUMBER(2, "number", "数字"), + DATE(3, "date", "时间"), + SWITCH(4, "switch", "布尔"), + SELECT(5, "select", "选择"), + FILE(6, "select", "选择"); private int value; private String name; @@ -910,7 +910,7 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_CACHE_TYPE { - REDIS(1,"Redis","Redis 缓存方式"); + REDIS(1, "Redis", "Redis 缓存方式"); private int value; private String name; @@ -1054,6 +1054,7 @@ public class ImppEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_RECEIVER_TYPE { INTERNAL(1, "内部人员"), @@ -1095,10 +1096,10 @@ public class ImppEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FILE_ATTACH_SOURCE { - MAIL(1,"邮件","邮件"), - LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"), - SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); private int value; private String name; 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 0323dbd..57e1590 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 @@ -6575,4 +6575,105 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 运输方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRANSPORT_TYPE { + LONG_HAUL(10, "长途运输"), + SHORT_DISTANCE(20, "短途运输"); + + private int value; + private String description; + + TRANSPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static TRANSPORT_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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 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 int descriptionOfValue(String desc) { + return descOf(desc); + } + } + + /** + * 物流供应商类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOGISTICS_PROVIDER_TYPE { + VENDOR(10, "承运商"); + + private int value; + private String description; + + LOGISTICS_PROVIDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static LOGISTICS_PROVIDER_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index c632d9f..a9011f4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -43,12 +43,12 @@ public class WmsCSOrderMaster extends BaseBean { */ @Column(name = "ORDER_TYPE") @ApiParam(value = "单据类型", example = "10") - @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class, refForeignKey = "value", value = "description") public Integer orderType; @Column(name = "ORDER_STATUS") @ApiParam(value = "状态 (10-创建 20-开启盘点 30-盘点中 40-盘点完成 50-已解冻 60-已关闭)", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer orderStatus; @Column(name = "ACTION_PERSENT") @@ -61,17 +61,17 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_INVENTORY") @ApiParam(value = "是否允许清点", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isInventory; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; @Column(name = "IS_PART") @ApiParam(value = "是否散件") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isPart; @Column(name = "YEAR") @@ -80,7 +80,7 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_SYNC_ERP") @ApiParam("是否同步ERP") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isSyncErp; @Transient @@ -115,11 +115,11 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "is_obvious") private Integer isObvious; - @ApiParam(value = "允许盘入的库位") - @Column(name = "ALLOW_LOCATES") - private String allowLocates; + // @ApiParam(value = "允许盘入的库位") +// @Column(name = "ALLOW_LOCATES") +// private String allowLocates; public Integer getIsInventoryVal() { - return this.isInventory == null ? 0 :this.isInventory.intValue(); + return this.isInventory == null ? 0 : this.isInventory.intValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java new file mode 100644 index 0000000..04ccb22 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java @@ -0,0 +1,80 @@ +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; +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 : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_LOGISTICS_COSTS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "物流费用管理", description = "物流费用管理") +public class WmsLogisticsCosts extends BaseBean { + + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + @Column(name = "PLACE_OF_ORIGIN") + @ApiParam(value = "发出地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String placeOfOrigin; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlag; + + @Column(name = "LOGISTICS_VENDOR_NO") + @ApiParam(value = "物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String logisticsVendorNo; + + @Column(name = "SALES_UNIT") + @ApiParam(value = "计价单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String salesUnit; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT) + @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description") + private Integer transportType; + + @Column(name = "price") + @ApiParam(value = "单价") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double price; + + @Column(name = "START_DATE") + @ApiParam(value = "生效日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String startDate; + + @Column(name = "END_DATE") + @ApiParam(value = "结束日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String endDate; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java new file mode 100644 index 0000000..3cc9ebc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java @@ -0,0 +1,51 @@ +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; +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 : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_MODE_TRANSPORT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "运输方式", description = "运输方式") +public class WmsModeTransport extends BaseBean { + + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + @Column(name = "ORGANIZE_CODE") + @ApiParam(value = "工厂代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeCode; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description") + private Integer transportType; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java new file mode 100644 index 0000000..3bded5f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java @@ -0,0 +1,53 @@ +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 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 : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_PROVIDER_FLAG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "物流供应商关系", description = "库存物流供应商关系条码信息") +public class WmsProviderFlag extends BaseBean { + + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + + @Column(name = "VENDOR_NO") + @ApiParam(value = "物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "物流供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String vendorName; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlag; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java new file mode 100644 index 0000000..1f71f81 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java @@ -0,0 +1,90 @@ +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; +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 : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_LOGISTICS_COSTS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "物流费用管理", description = "物流费用管理") +public class WmsShortLogisticsCosts extends BaseBean { + + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + @Column(name = "part_no") + @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "part_name") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partName; + + @Column(name = "PLACE_OF_ORIGIN") + @ApiParam(value = "发出地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String placeOfOrigin; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlag; + + @Column(name = "LOGISTICS_VENDOR_NO") + @ApiParam(value = "物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String logisticsVendorNo; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT) + @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description") + private Integer transportType; + + @Column(name = "SALES_UNIT") + @ApiParam(value = "计价单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String salesUnit; + + @Column(name = "price") + @ApiParam(value = "单价") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double price; + + @Column(name = "START_DATE") + @ApiParam(value = "生效日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String startDate; + + @Column(name = "END_DATE") + @ApiParam(value = "结束日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String endDate; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java new file mode 100644 index 0000000..9fa807f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.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.WmsLogisticsCosts; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流费用管理 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsLogisticsCostsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java new file mode 100644 index 0000000..17df50e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.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.WmsModeTransport; +import org.springframework.stereotype.Repository; + +/** + * @Description : 运输方式 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsModeTransportRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java new file mode 100644 index 0000000..c6446a8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.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.WmsProviderFlag; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流供应商与发往地关系 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsProviderFlagRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java new file mode 100644 index 0000000..57028b4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.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.WmsShortLogisticsCosts; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流费用管理(短途运输) + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsShortLogisticsCostsRepository extends BaseRepository { +}