From f7e750e3cb5d452fa78b2903330033a09af74bf3 Mon Sep 17 00:00:00 2001 From: Administrator <962239776@qq.com> Date: Fri, 2 Nov 2018 19:17:39 +0800 Subject: [PATCH 01/17] =?UTF-8?q?wms=E9=80=9A=E7=94=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8E=E5=AD=97=E6=AE=B5=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsField.java | 125 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsObject.java | 81 +++++++++++++ .../pojo/wms/repository/WmsObjectRepository.java | 16 +++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 37 ++++++ 5 files changed, 260 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 97b1a55..784e830 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -57,7 +57,7 @@ public abstract class BaseBean implements Serializable { public Integer isValid; //EnumUtil.isValid; @Column(name="create_user") - @ApiParam(value = "创建日期") + @ApiParam(value = "创建用户") public String createUser; @Column(name="create_date") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java new file mode 100644 index 0000000..9ec77db --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java @@ -0,0 +1,125 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 元数据字段表 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-02 10:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "WMS_FIELD") +@Api("元数据字段表") +public class WmsField extends BaseBean{ + + @Column(name = "OBJECT_CODE") + @ApiParam("对象编码") + private String objectCode; + + @Column(name = "FIELD_NUM") + @ApiParam(value = "表单分组序号",example = "-1") + private Integer fieldNum; + + @Column(name = "ORDER_NUM") + @ApiParam(value = "排序索引",example = "-1") + private Integer orderNum; + + @Column(name = "FIELD_SET") + @ApiParam("表单分组") + private String fieldSet; + + @Column(name = "TABLE_NAME") + @ApiParam("字段表名") + private String tableName; + + @Column(name = "FIELD_EN") + @ApiParam("英文名") + private String fieldEn; + + @Column(name = "FIELD_CN") + @ApiParam("中文名") + private String fieldCn; + + @Column(name = "TYPE") + @ApiParam("控件类型") + private String type; + + @Column(name = "EXP") + @ApiParam("控件表达式") + private String exp; + + @Column(name = "IS_QUERY") + @ApiParam(value = "是否可查询", example = "2") + private Integer isQuery; + + @Column(name = "IS_SHOW") + @ApiParam(value = "是否可显", example = "1") + private Integer isShow; + + @Column(name = "IS_DISABLE") + @ApiParam(value = "是否禁用", example = "2") + private Integer isDisable; + + @Column(name = "IS_ORDER") + @ApiParam(value = "是否可排序", example = "1") + private Integer isOrder; + + @Column(name = "IS_EDIT") + @ApiParam(value = "是否可编辑字段", example = "1") + private Integer isEdit; + + @Column(name = "IS_REQURIED") + @ApiParam(value = "是否必填", example = "1") + private Integer isRequried; + + @Column(name = "IS_MULTIPLE") + @ApiParam(value = "是否多选项", example = "2") + private Integer isMultiple; + + @Column(name = "PLACEHOLDER") + @ApiParam("输入提示") + private String placeholder; + + @Column(name = "VALIDATOR") + @ApiParam(value = "是否可编辑字段", example = "2") + private Integer validator; + + @Column(name = "DEFAULTER") + @ApiParam("默认值") + private String defaulter; + + @Column(name = "ADD_STATUS") + @ApiParam("状态") + private Integer addStatus; + + @Column(name = "DATA_TYPE") + @ApiParam("数据类型") + private Integer dataType; + + @Column(name = "DATA_TYPE_NAME") + @ApiParam("数据类型名称") + private String dataTypeName; + + @Column(name = "DATA_SIZE") + @ApiParam("整数位长度") + private Integer dataSize; + + @Column(name = "DATA_DECIMAL") + @ApiParam("小数位长度") + private Integer dataDecimal; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java new file mode 100644 index 0000000..d4c7576 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java @@ -0,0 +1,81 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-02 10:37 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "WMS_OBJECT") +@Api("元数据信息表") +public class WmsObject extends BaseBean { + + @Column(name = "CODE") + @ApiParam("对象编码") + private String code; + + @Column(name = "NAME") + @ApiParam("对象名称") + private String name; + + @Column(name = "VIEW_NAME") + @ApiParam("查询数据视图") + private String viewName; + + @Column(name = "TABLE_NAME") + @ApiParam("保存数据主表") + private String tableName; + + @Column(name = "PK_NAME") + @ApiParam("主键") + private String pkName; + + @Column(name = "DATA_SOURCE") + @ApiParam("数据源") + private String dataSource; + + @Column(name = "IS_SINGLE") + @ApiParam(value = "是否单选", example = "1") + private Integer isSingle; + + @Column(name = "IS_CELL_EDIT") + @ApiParam(value = "是否可行内编辑", example = "2") + private Integer isCellEdit; + + @Column(name = "IS_SHOW_NUM") + @ApiParam(value = "是否显示行号", example = "1") + private Integer isShowNum; + + @Column(name = "IS_FIRST_LOAD") + @ApiParam(value = "是否初始加载", example = "1") + private Integer isFirstLoad; + + @Column(name = "FILTER") + @ApiParam("初始数据过滤条件") + private String filter; + + @Column(name = "DEFAULT_ORDER") + @ApiParam("默认排序字段(desc)") + private String defaultOrder; + + @Column(name = "BIZ_INTERCEPT") + @ApiParam("自定义业务拦截") + private String bizIntercept; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java new file mode 100644 index 0000000..2d4fcc7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.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.WmsObject; +import org.springframework.stereotype.Service; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-02 11:23 + * @Modify: + **/ +@Service +public interface WmsObjectRepository 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 3bc083a..de79ca9 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 @@ -1,8 +1,11 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; +import cn.estsh.i3plus.pojo.wms.bean.WmsField; +import cn.estsh.i3plus.pojo.wms.bean.WmsObject; /** * @Description : 仓库管理对象封装 @@ -40,4 +43,38 @@ public class WmsHqlPack { return null; } + + /** + * 元数据信息 分页查询 + * @param wmsObject + * @return + */ + public static String packHqlWmsObject(WmsObject wmsObject){ + StringBuffer result = new StringBuffer(); + + // 编码 + HqlPack.getStringLikerPack(wmsObject.getCode(),"code",result); + // 名称 + HqlPack.getStringEqualPack(wmsObject.getName(),"name",result); + // 数据主表 + HqlPack.getStringEqualPack(wmsObject.getTableName(),"tableName",result); + // 自定义业务拦截 + HqlPack.getStringEqualPack(wmsObject.getBizIntercept(),"bizIntercept",result); + + return result.toString(); + } + + /** + * 元数据字段分页查询 + * @param wmsField + * @return + */ + public static String packHqlWmsField(WmsField wmsField){ + StringBuffer result = new StringBuffer(); + // 编码 + HqlPack.getStringLikerPack(wmsField.getObjectCode(),"objectCode",result); + HqlPack.getStringLikerPack(wmsField.getTableName(),"tableName",result); + return result.toString(); + } + } From d7bf68d5cad443dff620639af9b77161a8ce224e Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 2 Nov 2018 19:18:20 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 10 +++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 10 +++++----- .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 3 --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 ++++++++++++++++++++++ 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 8519f11..1342814 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -37,11 +37,11 @@ public class WmsTrans extends BaseBean{ private String sn; @Column(name="PART_ID") - @ApiParam(value ="零件id") + @ApiParam(value ="零件id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long partId; - @Column(name="PART_No") + @Column(name="PART_NO") @ApiParam(value ="零件编号") private String partNo; @@ -50,7 +50,7 @@ public class WmsTrans extends BaseBean{ private String partNameRdd; @Column(name="TRANS_STATUS") - @ApiParam(value ="交易状态") + @ApiParam(value ="交易状态",example = "1") private Integer transStatus; @Column(name="QTY") @@ -70,7 +70,7 @@ public class WmsTrans extends BaseBean{ private String unit; @Column(name="LOC_ID") - @ApiParam(value ="库位id") + @ApiParam(value ="库位id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long locId; @@ -79,7 +79,7 @@ public class WmsTrans extends BaseBean{ private String locCode; @Column(name="GROUP_ID") - @ApiParam(value ="分组id") + @ApiParam(value ="分组id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long groupId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index b27dfb8..2581c03 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -37,11 +37,11 @@ public class WmsTransRcd extends BaseBean{ private String sn; @Column(name="PART_ID") - @ApiParam(value ="零件id") + @ApiParam(value ="零件id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long partId; - @Column(name="PART_No") + @Column(name="PART_NO") @ApiParam(value ="零件编号") private String partNo; @@ -50,7 +50,7 @@ public class WmsTransRcd extends BaseBean{ private String partNameRdd; @Column(name="TRANS_STATUS") - @ApiParam(value ="交易状态") + @ApiParam(value ="交易状态",example = "1") private Integer transStatus; @Column(name="QTY") @@ -70,7 +70,7 @@ public class WmsTransRcd extends BaseBean{ private String unit; @Column(name="LOC_ID") - @ApiParam(value ="库位id") + @ApiParam(value ="库位id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long locId; @@ -79,7 +79,7 @@ public class WmsTransRcd extends BaseBean{ private String locCode; @Column(name="GROUP_ID") - @ApiParam(value ="分组id") + @ApiParam(value ="分组id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long groupId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 91f6cda..b14a8ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,7 +28,6 @@ public class WmsTransType extends BaseBean{ @Column(name="TRANS_CODE") @ApiParam(value ="交易代码") - @JsonSerialize(using = ToStringSerializer.class) private String transCode; @Column(name="TRANS_NAME") 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 092edb1..5a34e96 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; +import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; /** @@ -42,6 +43,11 @@ public class WmsHqlPack { return null; } + /** + * 交易类型信息 分页查询 + * @param wmsTransType + * @return + */ public static String packHqlWmsTransType(WmsTransType wmsTransType) { StringBuffer result = new StringBuffer(); @@ -51,4 +57,20 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 库存交易记录信息 分页查询 + * @param wmsTrans + * @return + */ + public static String packHqlWmsTrans(WmsTrans wmsTrans) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsTrans.getTransCode(),"transCode",result); + HqlPack.getNumEqualPack(wmsTrans.getSn(),"sn",result); + HqlPack.timeBuilder(wmsTrans.getCreateDatetime(),null,"createDatetime",result,true); + + return result.toString(); + } } From db09851a594c60d7890cf5632a6f017e3adc85e3 Mon Sep 17 00:00:00 2001 From: Administrator <962239776@qq.com> Date: Fri, 2 Nov 2018 19:21:25 +0800 Subject: [PATCH 03/17] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 3b75ad7..b952e70 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 @@ -1,8 +1,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; -import cn.estsh.i3plus.pojo.wms.bean.WareHouse; +import cn.estsh.i3plus.pojo.wms.bean.*; /** * @Description : 仓库管理对象封装 From 80b41620b1cf940a9fd9ae67305a76bd64684b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 2 Nov 2018 19:22:27 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E5=85=83=E6=95=B0=E6=8D=AE=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=AE=9E=E4=BD=93=E5=8F=8A=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsButton.java | 68 ++++++++++++++++++++++ .../pojo/wms/repository/WmsButtonRepository.java | 14 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 +++++ 3 files changed, 96 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsButton.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsButton.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsButton.java new file mode 100644 index 0000000..22a3e99 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsButton.java @@ -0,0 +1,68 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :元数据按钮信息表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-02 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_BUTTON") +@DynamicInsert +@DynamicUpdate +@Api(value="元数据按钮信息表",description = "元数据按钮信息表") +public class WmsButton extends BaseBean { + + @Column(name = "CODE") + @ApiParam(value = "元数据编码") + private String code; + + @Column(name = "NAME") + @ApiParam(value = "按钮名称") + private String name; + + @Column(name = "ICON") + @ApiParam(value = "图标") + private String icon; + + @Column(name = "UI") + @ApiParam(value = "按钮UI路径") + private String ui; + + @Column(name = "BS") + @ApiParam(value = "按钮BS路径") + private String bs; + + @Column(name = "URL") + @ApiParam(value = "服务端URL") + private String url; + + @Column(name = "ORDER_NUM") + @ApiParam(value = "排序号",example = "1") + private Integer orderNum; + + @Column(name = "GROUP_NUM") + @ApiParam(value = "分组号",example = "1") + private Integer groupNum; + + @Column(name = "IS_BASE") + @ApiParam(value = "是否基础功能",example = "2") + private Integer isBase; + + @Column(name = "IS_HIDE") + @ApiParam(value = "是否删除",example = "2") + private Integer isHide; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java new file mode 100644 index 0000000..a8afed4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsButton; + +/** + * @Description :对象持久层仓用方法控制(元数据按钮按钮信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-02 10:22 + * @Modify: + **/ +public interface WmsButtonRepository 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 863f641..2892e26 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; +import cn.estsh.i3plus.pojo.wms.bean.WmsButton; /** * @Description : 仓库管理对象封装 @@ -27,4 +28,17 @@ public class WmsHqlPack { return result.toString(); } + + public static String packHqlWmsButton(WmsButton wmsButton) { + StringBuffer result = new StringBuffer(); + + // 功能名称（name） + HqlPack.getStringLikerPack(wmsButton.getName(),"name", result); + // 前端实现（ui） + HqlPack.getStringLikerPack(wmsButton.getUi(),"ui", result); + // URI权限规则（bs） + HqlPack.getStringLikerPack(wmsButton.getBs(),"bs", result); + + return result.toString(); + } } From f24b0516e2a26a00b453c6d99f787037c38e39f7 Mon Sep 17 00:00:00 2001 From: Administrator <962239776@qq.com> Date: Fri, 2 Nov 2018 19:22:34 +0800 Subject: [PATCH 05/17] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java --- .../i3plus/pojo/wms/repository/WmsFieldRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java new file mode 100644 index 0000000..e550040 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.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.WmsField; +import org.springframework.stereotype.Service; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-02 11:24 + * @Modify: + **/ +@Service +public interface WmsFieldRepository extends BaseRepository { +} From 3c646ff8237565008b6f60bdaf8983240277dae5 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Fri, 2 Nov 2018 20:42:42 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E5=BB=BA=E7=AB=8B=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=A1=A8=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsStockQuant.java | 132 +++++++++++++++++++++ .../wms/repository/WmsStockQuantRepository.java | 15 +++ 2 files changed, 147 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuantRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java new file mode 100644 index 0000000..8d4de62 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java @@ -0,0 +1,132 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 : jessica.chen + * @CreateDate : 2018-11-02 11:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_STOCK_QUANT") +@DynamicInsert +@DynamicUpdate +@Api(value="库存表",description = "库存表") +public class WmsStockQuant extends BaseBean{ + + @Column(name="CUST_ID") + @ApiParam(value ="客户编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long custId; + + @Column(name="CUST_CODE") + @ApiParam(value ="客户代码") + private String custCode; + + @Column(name="SUPP_ID") + @ApiParam(value ="供应商编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long suppId; + + @Column(name="SUPP_CODE") + @ApiParam(value ="供应商代码") + private String suppCode; + + @Column(name="PART_ID") + @ApiParam(value ="零件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long partId; + + @Column(name="PART_NO") + @ApiParam(value ="零件编号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam(value ="零件名称") + private String partNameRdd; + + @Column(name="UNIT") + @ApiParam(value ="采购单位") + private String unit; + + @Column(name="QIT") + @ApiParam(value ="库存数") + private Double qit; + + @Column(name="ERP_WAREHOUSE") + @ApiParam(value ="收货库存地") + private String erpWareHouse; + + @Column(name="WH_ID") + @ApiParam(value ="仓库编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long whId; + + @Column(name="WH_CODE") + @ApiParam(value ="仓库代码") + private String whCode; + + @Column(name="LOC_ID") + @ApiParam(value ="库位编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long locId; + + @Column(name="LOC_CODE") + @ApiParam(value ="库位代码") + private String locCode; + + public Long getCustId() { + if(custId != null) { + return custId.longValue(); + }else{ + return custId; + } + } + + public Long getSuppId() { + if(suppId != null) { + return suppId.longValue(); + }else{ + return suppId; + } + } + + public Long getPartId() { + if(partId != null) { + return partId.longValue(); + }else{ + return partId; + } + } + + public Long getWhId() { + if(whId != null) { + return whId.longValue(); + }else{ + return whId; + } + } + + public Long getLocId() { + if(locId != null) { + return locId.longValue(); + }else{ + return locId; + } + } + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuantRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuantRepository.java new file mode 100644 index 0000000..f11c7dd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuantRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockQuant; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd; + +/** + * @Description : 库存表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-02 17:08 + * @Modify: + **/ +public interface WmsStockQuantRepository extends BaseRepository { +} From 4672bff2f89e598379c05367e73a9e5186487f0f Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 2 Nov 2018 21:11:28 +0800 Subject: [PATCH 07/17] =?UTF-8?q?Base=20Bean=20Bug=20=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=9E=84=E9=80=A0?= =?UTF-8?q?=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java | 2 +- .../estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- .../java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java | 9 +++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 97b1a55..4ba5c32 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -108,4 +108,8 @@ public abstract class BaseBean implements Serializable { } return result; } + + public String getOrderByParam() { + return this.orderByParam == null ? "" : this.orderByParam; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 86021d7..96c9529 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -80,7 +80,7 @@ public interface BaseRepository extends JpaReposito * 通过 in 批量删除 * @param ids 熟悉值数组 */ - public void deleteByIds(long[] ids); + public void deleteByIds(Long[] ids); /** * 通过多单属性进行单个值更新 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 843eb68..f577f5d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -144,7 +144,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public void deleteByIds(long[] ids) { + public void deleteByIds(Long[] ids) { if(ids != null && ids.length > 0){ String hql = "delete from " + persistentClass.getName() + " model where model.id in(:ids) "; Query query = entityManager.createQuery(hql); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java index f318f18..a6a47b5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java @@ -64,4 +64,13 @@ public class RefRoleMenu extends BaseBean { @ApiParam(value ="角色名称" , access ="角色名称") private String redRoleName; + public RefRoleMenu() { + } + + public RefRoleMenu(Long menuId, String redMenuName, Long roleId, String redRoleName) { + this.menuId = menuId; + this.redMenuName = redMenuName; + this.roleId = roleId; + this.redRoleName = redRoleName; + } } From 2c6ec19b545d19281ffce8b45e68c062a9704e6e Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 2 Nov 2018 21:22:31 +0800 Subject: [PATCH 08/17] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java 消息管理 全部完成 文件管理 全部完成 任务表达式 全部完成 HqlPack 日期非空校验 调整 --- .../cn/estsh/i3plus/pojo/base/tool/HqlPack.java | 2 +- .../estsh/i3plus/pojo/platform/bean/SysFile.java | 15 ++++++++--- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 31 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index 85f6eed..0378bca 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -60,7 +60,7 @@ public class HqlPack { * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 * @param isShowTime 是否包含时分秒 */ - public static void timeBuilder( String date, String columnName, StringBuffer result, Boolean showTaday,boolean isShowTime) { + public static void timeBuilder( String date, String columnName, StringBuffer result, Boolean showTaday,boolean isShowTime) { if(date != null && date.trim().length() > 0){ date = getSafeParam(date); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index 5b4ba72..2bcdba9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -37,7 +37,16 @@ public class SysFile extends BaseBean { @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userId; - + + public Long getUserId() { + if(userId != null) { + return userId.longValue(); + }else{ + return userId; + } + } + + @Column(name="FILE_PATH") @ApiParam(value ="文件路径") private String filePath; @@ -47,8 +56,8 @@ public class SysFile extends BaseBean { private String fileOriginalName; @Column(name="FILE_TYPE_ID") - @ApiParam(value ="文件类型ID(字典)") - private String fileTypeId; + @ApiParam(value ="文件类型ID") + private Long fileTypeId; @Column(name="FILE_TYPE_NAME") @ApiParam(value ="文件类型名称") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 87b7b0e..7061e87 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -230,4 +230,35 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 文件资源复杂查询 + * @param sysFile + * @return + */ + public static String packHqlSysFile(SysFile sysFile) { + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(sysFile.getName(),"name",result); + HqlPack.getNumEqualPack(sysFile.getFileTypeId(),"fileTypeId",result); + HqlPack.getStringLikerPack(sysFile.getCreateUser(),"createUser",result); + HqlPack.timeBuilder(sysFile.getCreateDatetime(),"createDatetime",result,false,false); + + return result.toString(); + } + + /** + * 任务表达式复杂查询 + * @param taskTimeExpression + * @return + */ + public static String packHqlSysFile(TaskTimeExpression taskTimeExpression) { + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(taskTimeExpression.getName(),"name",result); + + return result.toString(); + } } \ No newline at end of file From 02c9b473e4e1475869bc82f754fcddcf402d0902 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Sat, 3 Nov 2018 06:22:25 +0800 Subject: [PATCH 09/17] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java 定时任务 全部完成 --- .../estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 5 +---- .../cn/estsh/i3plus/pojo/platform/bean/TaskTime.java | 3 +-- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 7 deletions(-) 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 c3af395..33cc49f 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 @@ -79,9 +79,8 @@ public class ImppEnumUtil { } } - /** - * 组织类型 + * 定时任务方法类型 * 1.Java Class 方法 * 2.Http URL * 3.权限CODE @@ -222,7 +221,6 @@ public class ImppEnumUtil { } } - /** * 操作日志类型 * 1.INSERT：添加， @@ -634,7 +632,6 @@ public class ImppEnumUtil { } } - /** * 系统参数类型 * 1.SYSTEM：系统参数 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java index f138fb0..d7b26d7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java @@ -47,7 +47,6 @@ public class TaskTime extends BaseBean { } } - @Column(name="RED_TIME_NAME") @ApiParam(value ="时间表达式名称") private String redTimeName; @@ -90,7 +89,7 @@ public class TaskTime extends BaseBean { @Column(name="TASK_STATUS") @ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1") - private Integer taskStatus = 1; + private Integer taskStatus; @Column(name="LAST_RUN_DATE_TIME") @ApiParam(value ="最后运行时间" , access ="最后运行时间") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 7061e87..826cf07 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -253,7 +253,7 @@ public class CoreHqlPack { * @param taskTimeExpression * @return */ - public static String packHqlSysFile(TaskTimeExpression taskTimeExpression) { + public static String packHqlTaskTimeExpression(TaskTimeExpression taskTimeExpression) { StringBuffer result = new StringBuffer(); // hql拼接 @@ -261,4 +261,20 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 定时任务复杂查询 + * @param taskTime + * @return + */ + public static String packHqlTaskTime(TaskTime taskTime){ + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(taskTime.getName(),"name",result); + HqlPack.getNumEqualPack(taskTime.getTaskStatus(),"taskStatus",result); + HqlPack.getNumEqualPack(taskTime.getTimeId(),"timeId",result); + + return result.toString(); + } } \ No newline at end of file From a0315d85ac79f5b34e788b2a267695367bce06a3 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sat, 3 Nov 2018 08:01:31 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=20POJO=20=E6=B3=A8=E8=A7=A3=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4=20=E6=B7=BB=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=A4=8D=E6=9D=82=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 17 +++++++++------ .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 2 +- .../estsh/i3plus/pojo/platform/bean/SysRole.java | 6 +++++- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 6 +++++- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 24 ++++++++++++++++++++++ 5 files changed, 46 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index df8ba4f..54b1d81 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -227,10 +227,13 @@ public class CommonEnumUtil { /** * 用户状态 * 1正常 - * 2冻结使用 + * 2冻结 * 3账号异常 * 4离职 * 5服务到期 + * 6锁定 + * 7启用 + * 8禁止 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_STATUS { @@ -240,7 +243,8 @@ public class CommonEnumUtil { RESIGNATION(4, "离职", "离职_RESIGNATION"), EXPIRE(5, "服务到期", "服务到期_EXPIRE"), LOCKING(6, "锁定", "fa cell-fa fa-lock"), - ENABLE(7, "启用", "fa fa-success cell-fa fa-check"); + ENABLE(7, "启用", "fa fa-success cell-fa fa-check"), + DISABLE(8, "禁止", "fa fa-disabled cell-fa fa-times-circle"); private int value; private String code; @@ -390,11 +394,12 @@ public class CommonEnumUtil { /** * 是否有效 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum IS_VAILD { VAILD(1, "有效"), INVAILD(2, "无效"); - private int value = 0; - private String description = null; + private int value; + private String description; public int getValue() { return value; @@ -426,8 +431,8 @@ public class CommonEnumUtil { public enum ASC_OR_DESC { ASC(1, "正序"), DESC(2, "倒序"); - private int value = 0; - private String description = null; + private int value; + private String description; public int getValue() { return value; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 3dc903b..b46bcec 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -24,9 +24,9 @@ import java.util.List; **/ @Data @Entity -@Table(name="SYS_MENU") @DynamicInsert @DynamicUpdate +@Table(name="SYS_MENU") @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 46e7909..db5a166 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,9 +20,11 @@ import javax.persistence.Table; * @CreateDate : 2018-10-11 11:02 * @Modify: **/ +@Data @Entity +@DynamicInsert +@DynamicUpdate @Table(name="SYS_ROLE") -@Data @Api(value="用户角色表",description = "用户权限角色。") public class SysRole extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index c2a3bb7..556e791 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -19,9 +21,11 @@ import java.util.List; * @CreateDate : 2018-10-11 11:02 * @Modify: **/ +@Data @Entity +@DynamicInsert +@DynamicUpdate @Table(name="sys_user") -@Data @Api(value="用户登陆表",description = "用户登陆系统账户。") public class SysUser extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 87b7b0e..22f54cf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -230,4 +230,28 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 用戶复杂查询 + * @param user + * @return + */ + public static String packHqlSysUser(SysUser user){ + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(user.getName(),"name",result); + HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); + HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); + HqlPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result); + HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + HqlPack.getNumLikerPack(user.getUserStatusId(),"userStatusId",result); + HqlPack.getNumLikerPack(user.getDepartmentId(),"departmentId",result); + HqlPack.getNumEqualPack(user.getPositionId(),"positionId",result); + HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result); + HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result); + + return result.toString(); + } + } \ No newline at end of file From c1ba26cbb4dca3d0d7123d31f7e8c8b20af31d01 Mon Sep 17 00:00:00 2001 From: Silliter Date: Sun, 4 Nov 2018 11:20:24 +0800 Subject: [PATCH 11/17] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/StockArea.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java new file mode 100644 index 0000000..293ef0f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java @@ -0,0 +1,36 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 工厂仓库 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-09-04 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="WH_STOCK_AREA") +@Api("仓库区域") +public class StockArea extends BaseBean { + + @Column(name="code") + @ApiParam("仓库代码") + public String AreaCode; + + @Column(name="name") + @ApiParam("仓库名称") + public String AreaName; +} From faa4fb075ea31995815408ec44abe3766070d2da Mon Sep 17 00:00:00 2001 From: Silliter Date: Sun, 4 Nov 2018 11:24:07 +0800 Subject: [PATCH 12/17] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/StockArea.java | 12 ++++---- .../estsh/i3plus/pojo/wms/bean/StockLocation.java | 36 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java index 293ef0f..6a8d1d1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java @@ -26,11 +26,11 @@ import javax.persistence.Table; @Api("仓库区域") public class StockArea extends BaseBean { - @Column(name="code") - @ApiParam("仓库代码") - public String AreaCode; + @Column(name="AREA_CODE") + @ApiParam("仓库区域代码") + public String areaCode; - @Column(name="name") - @ApiParam("仓库名称") - public String AreaName; + @Column(name="AREA_NAME") + @ApiParam("仓库区域名称") + public String areaName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java new file mode 100644 index 0000000..51020d9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java @@ -0,0 +1,36 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 库位 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-09-04 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="WH_STOCK_LOC") +@Api("仓库库位") +public class StockLocation extends BaseBean { + + @Column(name="LOC_CODE") + @ApiParam("仓库库位代码") + public String locCode; + + @Column(name="LOC_NAME") + @ApiParam("仓库库位名称") + public String locName; +} From 09ea0aa25986c7385eda23696c103c4feda14785 Mon Sep 17 00:00:00 2001 From: Silliter Date: Sun, 4 Nov 2018 11:35:18 +0800 Subject: [PATCH 13/17] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/StockArea.java | 24 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/StockLocation.java | 23 +++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java index 6a8d1d1..0f59530 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,4 +35,26 @@ public class StockArea extends BaseBean { @Column(name="AREA_NAME") @ApiParam("仓库区域名称") public String areaName; + + @Column(name="WH_ID") + @ApiParam(value = "仓库编号", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + public Long whId; + + @Column(name="WH_CODE_RDD") + @ApiParam("仓库代码") + public String whCodeRdd; + + @Column(name="WH_NAME_RDD") + @ApiParam("仓库名称") + public String whNameRdd; + + public Long getWhId() { + if(whId != null) { + return whId.longValue(); + }else{ + return whId; + } + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java index 51020d9..c44b785 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,4 +35,25 @@ public class StockLocation extends BaseBean { @Column(name="LOC_NAME") @ApiParam("仓库库位名称") public String locName; + + @Column(name="AREA_ID") + @ApiParam(value = "库区编号", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + public Long areaId; + + @Column(name="AREA_CODE_RDD") + @ApiParam("库区代码") + public String areaCodeRdd; + + @Column(name="AREA_NAME_RDD") + @ApiParam("库区名称") + public String areaNameRdd; + + public Long getAreaId() { + if(areaId != null) { + return areaId.longValue(); + }else{ + return areaId; + } + } } From df8ad87dc49666f249506b5a20b0b8661e48b823 Mon Sep 17 00:00:00 2001 From: Silliter Date: Sun, 4 Nov 2018 18:03:39 +0800 Subject: [PATCH 14/17] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 68 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsObject.java | 7 +++ 2 files changed, 75 insertions(+) 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 c618c45..8518b7a 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 @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; +import com.fasterxml.jackson.annotation.JsonFormat; + /** * @Description : * @Reference : @@ -8,4 +10,70 @@ package cn.estsh.i3plus.pojo.base.enumutil; * @Modify: **/ public class WmsEnumUtil { + /** + * 消息队列，队列名称 + * 1: success_queue + * 2: fail_queue + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_NAME{ + + SUCCESS_QUEUE(1,"success_queue","成功消息队列"), + FAIL_QUEUE(1,"fail_queue","成功消息队列"); + + private int value; + private String name; + private String description; + + QUEUE_NAME() { + } + + QUEUE_NAME(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(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 codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java index d4c7576..8714540 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : @@ -78,4 +79,10 @@ public class WmsObject extends BaseBean { @ApiParam("自定义业务拦截") private String bizIntercept; + @ApiParam("元数据字段列表") + private transient List fiedList; + + @ApiParam("自定义按钮列表") + private transient List btnList; + } From 05c02ffd08e3716fa45e4918563ccce9c0eb2c82 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Sun, 4 Nov 2018 18:59:48 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E5=BC=80=E5=8F=91job=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 7 ++++ .../estsh/i3plus/pojo/wms/bean/WmsTransCode.java | 44 ++++++++++++++++++++++ .../wms/repository/WmsTransCodeRepository.java | 21 +++++++++++ .../pojo/wms/repository/WmsTransRcdRepository.java | 2 + .../pojo/wms/repository/WmsTransRepository.java | 9 +++++ .../wms/repository/WmsTransTypeRepository.java | 1 + .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +- 7 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransCodeRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 1342814..047ec43 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -78,6 +78,13 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="库位代码") private String locCode; + @ApiParam(value ="目标库位id") + @JsonSerialize(using = ToStringSerializer.class) + private transient Long targetLocId; + + @ApiParam(value ="目标库位代码") + private transient String targetLocCode; + @Column(name="GROUP_ID") @ApiParam(value ="分组id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java new file mode 100644 index 0000000..6a6a479 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java @@ -0,0 +1,44 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 交易代码方法表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-04 12:19 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_TRANS_CODE") +@DynamicInsert +@DynamicUpdate +@Api(value="交易代码方法表",description = "交易代码方法表") +public class WmsTransCode extends BaseBean{ + + @Column(name="TRANS_CODE") + @ApiParam(value ="交易代码") + private String transCode; + + @Column(name="CLASS_PATH") + @ApiParam(value ="类路径") + private String classPath; + + @Column(name="ATTRIBUTE") + @ApiParam(value ="属性") + private String attribute; + + @Column(name="METHOD_NAME") + @ApiParam(value ="方法名") + private String methodName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransCodeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransCodeRepository.java new file mode 100644 index 0000000..a66b8f3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransCodeRepository.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransCode; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +/** + * @Description : 交易代码方法表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-04 14:47 + * @Modify: + **/ +@Repository +public interface WmsTransCodeRepository extends BaseRepository { + @Query("from WmsTransCode wtc where wtc.transCode =:code and wtc.isValid = 1") + WmsTransCode findWmsTransCodeByCode(@Param("code") String code); +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java index 42395be..64f0741 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd; +import org.springframework.stereotype.Repository; /** * @Description : 仓库交易归档表 @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd; * @CreateDate : 2018-11-02 9:50 * @Modify: **/ +@Repository public interface WmsTransRcdRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java index d9f9ce3..9cd3455 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java @@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; /** * @Description : 仓库交易记录表 @@ -10,5 +14,10 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; * @CreateDate : 2018-11-02 9:49 * @Modify: **/ +@Repository public interface WmsTransRepository extends BaseRepository { + + @Modifying + @Query("delete from WmsTrans w where w.groupId =:groupId and w.isValid = 1") + void deleteByGroupId(@Param("groupId") Long groupId); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java index 0c453f1..1fb46d9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java @@ -11,5 +11,6 @@ import org.springframework.stereotype.Repository; * @CreateDate : 2018-11-02 9:49 * @Modify: **/ +@Repository public interface WmsTransTypeRepository 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 c41b762..8009e30 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 @@ -100,8 +100,8 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringEqualPack(wmsTransType.getTransCode(),"transCode",result); - HqlPack.getStringEqualPack(wmsTransType.getTransName(),"transName",result); + HqlPack.getStringLikerPack(wmsTransType.getTransCode(),"transCode",result); + HqlPack.getStringLikerPack(wmsTransType.getTransName(),"transName",result); return result.toString(); } From 770fe0fa17f64f90ffdc3d2f6d8d2cf3fe8d9d6b Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Mon, 5 Nov 2018 10:14:20 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=BD=92=E6=A1=A3=E8=A1=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E5=BA=93=E5=AD=98=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java | 10 +++++----- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java index 8d4de62..bd18537 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java @@ -29,7 +29,7 @@ import javax.persistence.Table; public class WmsStockQuant extends BaseBean{ @Column(name="CUST_ID") - @ApiParam(value ="客户编号") + @ApiParam(value ="客户编号",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long custId; @@ -38,7 +38,7 @@ public class WmsStockQuant extends BaseBean{ private String custCode; @Column(name="SUPP_ID") - @ApiParam(value ="供应商编号") + @ApiParam(value ="供应商编号",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long suppId; @@ -47,7 +47,7 @@ public class WmsStockQuant extends BaseBean{ private String suppCode; @Column(name="PART_ID") - @ApiParam(value ="零件id") + @ApiParam(value ="零件id", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long partId; @@ -72,7 +72,7 @@ public class WmsStockQuant extends BaseBean{ private String erpWareHouse; @Column(name="WH_ID") - @ApiParam(value ="仓库编号") + @ApiParam(value ="仓库编号",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long whId; @@ -81,7 +81,7 @@ public class WmsStockQuant extends BaseBean{ private String whCode; @Column(name="LOC_ID") - @ApiParam(value ="库位编号") + @ApiParam(value ="库位编号",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long locId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 2581c03..8cb4e15 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -83,6 +83,10 @@ public class WmsTransRcd extends BaseBean{ @JsonSerialize(using = ToStringSerializer.class) private Long groupId; + @ApiParam(value ="库存数") + private transient Double qit; + + public Long getLocId() { if(locId != null) { return locId.longValue(); From 9712f75d424a7cd38816d837699d653a198e54b6 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Mon, 5 Nov 2018 10:16:35 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=BD=92=E6=A1=A3=E8=A1=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E5=BA=93=E5=AD=98=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/StockAreaRepository.java | 15 +++++++++++++++ .../pojo/wms/repository/StockLocationRepository.java | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockAreaRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockLocationRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockAreaRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockAreaRepository.java new file mode 100644 index 0000000..21c260d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockAreaRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.StockArea; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; + +/** + * @Description : 库区表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-04 12:02 + * @Modify: + **/ +public interface StockAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockLocationRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockLocationRepository.java new file mode 100644 index 0000000..32832f1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockLocationRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.StockArea; +import cn.estsh.i3plus.pojo.wms.bean.StockLocation; + +/** + * @Description : 库位表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-04 14:33 + * @Modify: + **/ +public interface StockLocationRepository extends BaseRepository { +}