From dc9fbb29195ff140152aef0fd7e89a9aec016ea7 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 29 Mar 2019 18:21:24 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E5=99=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/form/bean/BfMethodDetailProperty.java | 2 +- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 44 ++++++++++++++-------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index 1dbf45d..d73b51f 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BR_METHOD_DETAIL_PROPERTY") +@Table(name="BF_METHOD_DETAIL_PROPERTY") @Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") public class BfMethodDetailProperty extends BaseBean { diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 21c8c2a..6fdcbef 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -1,10 +1,7 @@ package cn.estsh.i3plus.pojo.form.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.form.bean.BfLayout; -import cn.estsh.i3plus.pojo.form.bean.BfLayoutRow; -import cn.estsh.i3plus.pojo.form.bean.BfMenu; -import cn.estsh.i3plus.pojo.form.bean.BfMethod; +import cn.estsh.i3plus.pojo.form.bean.*; import org.apache.commons.lang3.StringUtils; /** @@ -63,32 +60,31 @@ public final class FormHqlPack { /** * 根据表单布局查询表单布局行 - * @param bfLayout 表单布局 + * @param bfLayoutRow 表单布局 * @return hql */ - public static String packHqlBfLayoutRowByBfLayout(BfLayout bfLayout) { + public static String packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) { StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(bfLayout.getId(), "layoutId", result); - HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result); + HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result); + HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result); - result.append(bfLayout.orderBy()); + result.append(bfLayoutRow.orderBy()); return result.toString(); } /** * 根据表单布局行查询表单布局列 - * @param bfLayoutRow 表单布局行 + * @param bfLayoutColumn 表单布局行 * @return hql */ - public static String packHqlBfLayoutColumnByBfLayoutRow(BfLayoutRow bfLayoutRow) { + public static String packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) { StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result); - HqlPack.getNumEqualPack(bfLayoutRow.getId(), "layoutRowId", result); - HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result); + HqlPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result); + HqlPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result); - result.append(bfLayoutRow.orderBy()); + result.append(bfLayoutColumn.orderBy()); return result.toString(); } @@ -103,6 +99,7 @@ public final class FormHqlPack { HqlPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result); HqlPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result); HqlPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result); + result.append(bfMenu.orderBy()); return result.toString(); } @@ -118,6 +115,23 @@ public final class FormHqlPack { HqlPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result); HqlPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result); HqlPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result); + result.append(bfMethod.orderBy()); + + return result.toString(); + } + + /** + * 表单拦截器复杂查询 + * @param bfIntercept 查询条件 + * @return hql + */ + public static String packHqlBfIntercept(BfIntercept bfIntercept) { + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", result); + HqlPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", result); + HqlPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", result); + result.append(bfIntercept.orderBy()); return result.toString(); } From 04ed151d45f1e6ac784a5161f57414886e7a671c Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 29 Mar 2019 18:50:09 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E5=85=83=E7=B4=A0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90(=E6=9C=AA=E6=B5=8B?= =?UTF-8?q?=E8=AF=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 140 +++++++++++++++++++-- .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 4 + .../estsh/i3plus/pojo/form/bean/BfElementGrid.java | 6 +- .../i3plus/pojo/form/bean/BfElementProperty.java | 8 ++ .../pojo/form/bean/BfElementPropertyVirtual.java | 9 +- .../estsh/i3plus/pojo/form/bean/BfElementTree.java | 22 +++- .../estsh/i3plus/pojo/model/form/ElementModel.java | 40 ++++++ 7 files changed, 207 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 1d698a4..672767d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -501,6 +501,87 @@ public class BlockFormEnumUtil { } /** + * 元素类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_TYPE { + GRID(1, "TABLE", "表格"), + TREE(2, "TREE", "树"); + + private int value; + private String code; + private String description; + + private ELEMENT_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + 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 ELEMENT_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 元素删除信息 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -889,32 +970,57 @@ public class BlockFormEnumUtil { } /** - * 属性类型信息 + * 属性类型信息(属性转换器) + * + *
Form 核心转换器 + *
数据库字段类型转换Java 属性类型 + *
Java 属性 转换为控件类型 + * */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROPERTY_TYPE { - STRING(10, "String", "字符串", "java.lang.String", String.class), - CHAR(11, "Character", "单字符", "java.lang.Character", Character.class), - INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class), - LONG(21, "Long", "长整型", "java.lang.Long", Long.class), - DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class), - FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class), - BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class), - BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class), - DATE(60, "Date", "日期", "java.sql.Timestamp", Date.class); - + STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT), + CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT), + INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER), + LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER), + DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER), + FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER), + BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO), + BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT), + DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME); + + /** + * 属性类型值 + */ private int value; + /** + * 属性类型代码 + */ private String code; + /** + * 属性类型描述 + */ private String description; + /** + * 属性类型ClassPath + */ private String classPath; + /** + * 属性类型 Class + */ private Class clzFullName; + /** + * 属性类型 对应的 控件类型 + */ + private PROPERTY_CONTROL_TYPE controlType; - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName) { + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType) { this.value = value; this.code = code; this.description = description; this.classPath = classPath; this.clzFullName = clzFullName; + this.controlType = controlType; } public int getValue() { @@ -949,6 +1055,16 @@ public class BlockFormEnumUtil { return tmp; } + public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) { + PROPERTY_CONTROL_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].controlType; + } + } + return tmp; + } + public static int codeOfValue(String code) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index cfc903f..7bfc237 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -52,6 +52,10 @@ public class BfElement extends BaseBean { @ApiParam(value ="元素名称") private String elementName; + @Column(name="ELEMENT_CODE") + @ApiParam(value ="元素编码") + private String elementCode; + @Column(name="ELEMENT_ATTR_ID") @ApiParam(value ="默认排序属性") private String elementAttrId; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java index c80b7d9..69d0ca8 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java @@ -52,12 +52,8 @@ public class BfElementGrid extends BaseBean { @ApiParam(value = "是否删除") private Integer isObjectDel; - @Column(name = "ELEMENT_TYPE") - @ApiParam(value = "是否查询") - private Integer elementType; - @Column(name = "IS_OBJECT_FIND") - @ApiParam(value = "元素类型") + @ApiParam(value = "是否查询") private Integer isObjectFind; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 94dfe6d..1b33377 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -47,6 +47,14 @@ public class BfElementProperty extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long dataObjectPropertyId; + @Column(name="PROPERTY_TYPE") + @ApiParam(value ="属性类型") + private Integer propertyType; + + @Column(name="PROPERTY_TYPE_NAME_RDD") + @ApiParam(value ="属性类型名称") + private String propertyTypeNameRdd; + @Column(name="PROPERTY_NAME") @ApiParam(value ="元素描述") private String propertyName; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index 00e71ce..cd877fa 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -60,6 +60,11 @@ public class BfElementPropertyVirtual extends BaseBean { @Transient @ApiParam(value = "虚拟属性列表") - @AnnoOutputColumn(hidden = true) - private List detailList; + private List propertyList; + + @Transient + @ApiParam(value = "虚拟属性ID列表") + @JsonSerialize(using = ToStringSerializer.class) + private List propertyIdList; + } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java index bb7beda..8883376 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : @@ -38,15 +39,18 @@ public class BfElementTree extends BaseBean { @Column(name = "TREE_PARENT_ID") @ApiParam(value = "父级属性ID") - private Integer treeParentId; + @JsonSerialize(using = ToStringSerializer.class) + private Long treeParentId; @Column(name = "TREE_ATTR_NAME_ID") @ApiParam(value = "显示属性ID") - private Integer treeAttrNameId; + @JsonSerialize(using = ToStringSerializer.class) + private Long treeAttrNameId; @Column(name = "TREE_ATTR_VALUE_ID") @ApiParam(value = "取值属性ID") - private Integer treeAttrValueId; + @JsonSerialize(using = ToStringSerializer.class) + private Long treeAttrValueId; @Column(name="TREE_DEFAULT_DIRECTION") @ApiParam(value ="树默认方向") @@ -55,4 +59,16 @@ public class BfElementTree extends BaseBean { @Column(name = "TREE_IS_DIRECTION") @ApiParam(value = "树是否开启切换方向") private Integer treeIsDirection; + + @Transient + @ApiParam(value = "父级属性") + private String treeParentIdStr; + + @Transient + @ApiParam(value = "显示属性") + private String treeAttrNameIdStr; + + @Transient + @ApiParam(value = "取值属性") + private String treeAttrValueIdStr; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java new file mode 100644 index 0000000..b87214e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.form.bean.*; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 元素Model + * @Reference : 元素整体封装 + * @Author : Adair Peng + * @CreateDate : 2019-03-21 13:14 + * @Modify: + **/ +@Data +public class ElementModel{ + + @ApiParam(value = "元素基础信息") + private BfElement element; + + @ApiParam(value = "元素Tree信息") + private BfElementTree elementTree; + + @ApiParam(value = "元素Grid信息") + private BfElementGrid elementGrid; + + @ApiParam(value = "元素基础属性信息") + private List propertyList; + + @ApiParam(value = "元素基础虚拟属性信息") + private List virtualList; + + @ApiParam(value = "数据对象信息") + private BfDataObject dataObject; + + @ApiParam(value = "元素类型") + private Integer elementType; + +} From 0e9315cd895e1c53f91d2232cb76a626da7ca8eb Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 29 Mar 2019 21:40:29 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BA=8B=E5=8A=A1=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 24b41f8..20b4193 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 作业任务表信息 @@ -72,4 +73,8 @@ public class WmsTaskInfo extends BaseBean { @Transient public String opTypeName; + @ApiParam("作业任务明细") + @Transient + public List taskDetailsList; + } From 9b8ebb562858df115d0fff8f625fe6b02f97c2e7 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Mon, 1 Apr 2019 10:22:38 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index afe6d77..eeeff68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -141,10 +141,16 @@ public class WmsDocMovementDetails extends BaseBean { public String destAreaNo; @Transient + @ApiParam("实际批次") + private String actualLot; + + @Transient @ApiParam("推荐批次") private String recommondLot; @Transient @ApiParam("推荐库位") private String recommondLocateNo; + + public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index fd7244e..234adad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -171,4 +171,6 @@ public class WmsStockSn extends BaseBean { public WmsStockSn(String partNo){ this.partNo = partNo; } + + public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } } From 1b97e377f2f00e7dac070247eac4d6ddbf8acbcd Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 1 Apr 2019 10:25:16 +0800 Subject: [PATCH 05/25] =?UTF-8?q?pojo=E5=BC=95=E5=85=A5jar=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d9f2e52..642c9a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -38,6 +38,10 @@ i3plus.pojo i3plus-pojo-wms + + i3plus.pojo + i3plus-pojo-form + From acc8e97825fb15fb0d005bb367d9eea739cbe04d Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 1 Apr 2019 14:39:28 +0800 Subject: [PATCH 06/25] sweb bean init 9 files --- .../pojo/sweb/bean/SwebOrderDeliveryLog.java | 46 ++++++ .../estsh/i3plus/pojo/sweb/bean/SwebPackage.java | 46 ++++++ .../pojo/sweb/bean/SwebProcurementPlanOrder.java | 46 ++++++ .../sweb/bean/SwebProcurementPlanOrderdetails.java | 54 +++++++ .../pojo/sweb/bean/SwebPurchaseChangeLog.java | 46 ++++++ .../i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 98 ++++++++++++ .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 169 +++++++++++++++++++++ .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 104 +++++++++++++ .../estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java | 42 +++++ 9 files changed, 651 insertions(+) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java new file mode 100644 index 0000000..dfa3f3e --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 11:21 + * @Modify: + **/ +@Data +@Table(name = "SWEB_ORDER_DELIVERY_LOG") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("订单发货通知记录表") +public class SwebOrderDeliveryLog extends BaseBean { + + @Column(name = "ORDER_ITEM_NO") + @ApiParam("单据明细编号") + public String orderItemNo; + + @Column(name = "CAR_NO") + @ApiParam(value = "发运车号") + public String carNo; + + @Column(name = "CONTACT") + @ApiParam("联系人") + public String contact; + + @Column(name = "CONTACT_TEL") + @ApiParam(value = "联系人电话") + public String contactTel; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java new file mode 100644 index 0000000..a420d5e --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 11:21 + * @Modify: + **/ +@Data +@Table(name = "SWEB_PACKAGE") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("物理包装") +public class SwebPackage extends BaseBean { + + @Column(name="PACKAGE_NO") + @ApiParam("包装编号") + public String packageNo; + + @Column(name="PACKAGE_TYPE_ID") + @ApiParam(value = "包装类型", example = "1") + public Integer packTypeId; + + @Column(name="PARENT_PACKAGE_NO") + @ApiParam("上级包装编号") + public String parentPackageNo; + + @Column(name="PACKAGE_QTY") + @ApiParam(value = "包装件数", example = "1") + public Integer packageQty; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java new file mode 100644 index 0000000..7990af5 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 11:21 + * @Modify: + **/ +@Data +@Table(name = "SWEB_PROCUREMENT_PLAN_ORDER") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("开口合同主表") +public class SwebProcurementPlanOrder extends BaseBean { + + @ApiParam("合同号") + @Column(name = "ORDER_NO") + private String orderNo; + + @ApiParam(value = "订单类型", example = "1") + @Column(name = "ORDER_TYPE") + private Integer orderType; + + @ApiParam(value = "订单状态", example = "10") + @Column(name = "ORDER_STATUS") + private Integer orderStatus; + + @ApiParam("供应商代码") + @Column(name = "VENDOR_CODE") + private String vendorCode; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java new file mode 100644 index 0000000..5106375 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 11:21 + * @Modify: + **/ +@Data +@Table(name = "SWEB_PROCUREMENT_PLAN_ORDER_DETAILS") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("开口合同明细表") +public class SwebProcurementPlanOrderdetails extends BaseBean { + + @ApiParam("单据号") + @Column(name = "ORDER_NO") + private String orderNo; + + @ApiParam(value = "零件号") + @Column(name = "PART_NO") + private String partNo; + + @ApiParam(value = "零件名称") + @Column(name = "PART_NAME") + private String partName; + + @ApiParam(value = "单位") + @Column(name = "UNIT") + private String unit; + + @ApiParam("标准包装") + @Column(name = "SNP_QTY") + private Double snpQty; + + @ApiParam(value = "行项目状态", example = "1") + @Column(name = "ITEM_STATUS") + private Integer itemStatus; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java new file mode 100644 index 0000000..800016a --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 11:21 + * @Modify: + **/ +@Data +@Table(name = "SWEB_PURCHASE_CHANGE_LOG") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("订单修改日志记录表") +public class SwebPurchaseChangeLog extends BaseBean { + + @Column(name = "ORDER_ITEM_NO") + @ApiParam("单据明细编号") + public String orderItemNo; + + @ApiParam(value = "订单当前状态") + @Column(name = "ITEM_STATUS") + private Integer itemStatus; + + @Column(name = "QTY") + @ApiParam("零件数量") + public Double qty; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java new file mode 100644 index 0000000..0eb0740 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 11:21 + * @Modify: + **/ +@Data +@Table(name = "SWEB_PURCHASE_ORDER") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("采购订单表-主表") +public class SwebPurchaseOrder extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam("单据号") + public String orderNo; + + @ApiParam("供应商编号") + @Column(name = "VENDOR_CODE") + private String vendorCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; + + @ApiParam("计划员代码") + @Column(name = "PLANNER_CODE") + private String plannerCode; + + @ApiParam(value = "订单类型", example = "1") + @Column(name = "ORDER_TYPE") + public Integer orderType; + + @ApiParam(value = "订单状态", example = "1") + @Column(name = "ORDER_STATUS") + public Integer orderStatus; + + @Column(name = "PARENT_PACKAGE_NO") + @ApiParam("上级包装编号") + public String parentPackageNo; + + @Column(name = "DOCK") + @ApiParam("道口") + public String dock; + + @Column(name = "ERP_WAREHOUSE") + @ApiParam(value = "库存地") + public String erpWarehouse; + + @Column(name = "PO_STATUS") + @ApiParam(value = "PO状态", example = "1") + public Integer poStatus; + + @Column(name = "SHIP_TIME") + @ApiParam(value = "发运时间") + public String shipTime; + + @Column(name = "PUBLISH_TIME") + @ApiParam(value = "发布时间") + public String publishTime; + + @Column(name = "DELIVERY_TIME") + @ApiParam(value = "交货时间") + public String deliveryTime; + + @Column(name = "REC_TIME") + @ApiParam(value = "交货时间") + public String recTime; + + @Column(name = "IS_SYN") + @ApiParam(value = "是否收货", example = "2") + public Integer isSyn; + + @Column(name = "ORDER_TIME") + @ApiParam(value = "订单时间") + public String orderTime; + + @Column(name = "REF_ORDER_NO") + @ApiParam(value = "关联单号") + public String refOrderNo; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java new file mode 100644 index 0000000..4935cf0 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -0,0 +1,169 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +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 : jack.lv + * @CreateDate : 2019-04-01 11:21 + * @Modify: + **/ +@Data +@Table(name = "SWEB_PURCHASE_ORDER_DETAILS") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("采购订单表-明细表") +public class SwebPurchaseOrderDetails extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam("单据号") + public String orderNo; + + @Column(name = "PART_VERSION") + @ApiParam("零件版本") + private Integer partVersion; + + @Column(name = "PART_NO") + @ApiParam(value = "零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam("零件类型") + @Column(name = "PART_TYPE") + private Integer partType; + + @ApiParam(value = "单位") + @Column(name = "UNIT") + private String unit; + + @ApiParam(value = "行项目状态", example = "1") + @Column(name = "ITEM_STATUS") + private Integer itemStatus; + + @Column(name = "BOX_QTY") + @ColumnDefault("0") + @ApiParam(value = "箱数", example = "0") + private Integer boxQty; + + @Column(name = "SNP_QTY") + @ColumnDefault("0") + @ApiParam(value = "默认包装规格", example = "0") + private Double snpQty; + + @Column(name = "PRINT_QTY") + @ColumnDefault("0") + @ApiParam(value = "打印数", example = "0") + private Double printQty; + + @Column(name = "REC_QTY") + @ColumnDefault("0") + @ApiParam(value = "收货数量", example = "0") + private Double recQty; + + @Column(name = "REC_BOX_QTY") + @ColumnDefault("0") + @ApiParam(value = "已收箱数", example = "0") + private Double recBoxQty; + + @Column(name = "UPLOAD_QTY") + @ColumnDefault("0") + @ApiParam(value = "上传数量", example = "0") + private Double uploadQty; + + @Column(name = "ERP_WAREHOUSE") + @ApiParam("库存地") + private String erpWarehouse; + + @Column(name = "REF_QTY") + @ColumnDefault("0") + @ApiParam(value = "订单数量", example = "0") + private Double refQty; + + @Column(name = "ORDER_QTY") + @ColumnDefault("0") + @ApiParam(value = "需求数", example = "0") + private Double orderQty; + + @Column(name = "SHIP_QTY") + @ColumnDefault("0") + @ApiParam(value = "发运数量", example = "0") + private Double shipQty; + + @Column(name = "PRINT_TIME") + @ApiParam(value = "打印时间") + private String printTime; + + @Column(name = "PRINT_USER_CODE") + @ApiParam("打印用户code") + private String printUserCode; + + @Column(name = "IS_STEEL") + @ApiParam("是否为钢卷料") + private Integer IS_STEEL; + + @Column(name = "REC_TIME") + @ApiParam(value = "预计到货日期") + public String recTime; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + + @ApiParam("是否同步") + @Column(name = "IS_SYN") + private String isSyn; + + @Column(name = "INSTOCK_QTY") + @ColumnDefault("0") + @ApiParam(value = "入库数量", example = "0") + private Double instockQty; + + @Column(name = "INSTOCK_BOX_QTY") + @ColumnDefault("0") + @ApiParam(value = "入库箱数", example = "0") + private Double instockBoxQty; + + @Column(name = "NC_QTY") + @ColumnDefault("0") + @ApiParam(value = "不良数", example = "0") + private Double ncQty; + + @Column(name = "NC_BOX_QTY") + @ColumnDefault("0") + @ApiParam(value = "不良箱数", example = "0") + private Double ncBoxQty; + + @Column(name = "ITEM_NO") + @ColumnDefault("0") + @ApiParam(value = "行号", example = "0") + private Integer itemNo; + + @Column(name = "COMFIRM_TIME") + @ApiParam(value = "确认时间") + public String comfirmTime; + + @Column(name = "DELIVERY_TIME") + @ApiParam(value = "交货时间") + public String deliveryTime; + + @Column(name = "REF_NO") + @ApiParam(value = "合同号") + public String refNo; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java new file mode 100644 index 0000000..0eb6e4c --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -0,0 +1,104 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +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 : jack.lv + * @CreateDate : 2019-04-01 11:21 + * @Modify: + **/ +@Data +@Table(name = "SWEB_PURCHASE_ORDER_SN") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("采购订单表-条码明细表") +public class SwebPurchaseOrderSn extends BaseBean { + + @Column(name = "ORDER_ITEM_NO") + @ApiParam("单据明细编号") + public String orderItemNo; + + @Column(name = "PART_NO") + @ApiParam(value = "零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam("零件类型") + @Column(name = "PART_TYPE") + private Integer partType; + + @ApiParam(value = "单位") + @Column(name = "UNIT") + private String unit; + + @Column(name = "BOX_QTY") + @ColumnDefault("0") + @ApiParam(value = "箱数", example = "0") + private Integer boxQty; + + @Column(name = "SERIAL_NO") + @ApiParam(value = "序列号") + private String serialNo; + + @Column(name = "BAR_CODE") + @ApiParam(value = "箱条码") + private String barCode; + + @Column(name = "ERP_WAREHOUSE") + @ApiParam("库存地") + private String erpWarehouse; + + @Column(name = "PRODUCTION_TIME") + @ApiParam(value = "产生时间") + private String productionTime; + + @Column(name = "PRINT_TIME") + @ApiParam(value = "打印时间") + private String printTime; + + @Column(name = "PRINTS") + @ApiParam("打印次数") + private Integer prints; + + @Column(name = "CHECK_CODE") + @ApiParam(value = "检验编号") + public String CHECK_CODE; + + @Column(name = "STOVE_NO") + @ApiParam(value = "炉批号") + public String stoveNo; + + @Column(name = "BATCH_NO") + @ApiParam(value = "批次号") + public String batchNo; + + @ApiParam("是否同步") + @Column(name = "IS_SYN") + private String isSyn; + + @Column(name = "REC_TIME") + @ApiParam(value = "收货时间") + public String recTime; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + public String packageNo; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java new file mode 100644 index 0000000..ba03cc8 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 11:21 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_REL") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("供应商关系表") +public class SwebVendorRel extends BaseBean { + + @ApiParam("计划员代码") + @Column(name = "PLANNER_CODE") + private String plannerCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; + + @ApiParam("供应商代码") + @Column(name = "VENDOR_CODE") + private String vendorCode; +} From da3490acbfd9d65136c56ae8e17210066f37f0f0 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 1 Apr 2019 15:09:23 +0800 Subject: [PATCH 07/25] sweb repository init 9 files --- ...rdetails.java => SwebProcurementPlanOrderDetails.java} | 2 +- .../sweb/repository/SwebOrderDeliveryLogRepository.java | 14 ++++++++++++++ .../pojo/sweb/repository/SwebPackageRepository.java | 14 ++++++++++++++ .../SwebProcurementPlanOrderDetailsRepository.java | 14 ++++++++++++++ .../repository/SwebProcurementPlanOrderRepository.java | 15 +++++++++++++++ .../sweb/repository/SwebPurchaseChangeLogRepository.java | 14 ++++++++++++++ .../repository/SwebPurchaseOrderDetailsRepository.java | 14 ++++++++++++++ .../pojo/sweb/repository/SwebPurchaseOrderRepository.java | 14 ++++++++++++++ .../sweb/repository/SwebPurchaseOrderSnRepository.java | 14 ++++++++++++++ .../pojo/sweb/repository/SwebVendorRelRepository.java | 14 ++++++++++++++ 10 files changed, 128 insertions(+), 1 deletion(-) rename modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/{SwebProcurementPlanOrderdetails.java => SwebProcurementPlanOrderDetails.java} (95%) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java similarity index 95% rename from modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java rename to modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java index 5106375..144cf36 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("开口合同明细表") -public class SwebProcurementPlanOrderdetails extends BaseBean { +public class SwebProcurementPlanOrderDetails extends BaseBean { @ApiParam("单据号") @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java new file mode 100644 index 0000000..5d8568c --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebOrderDeliveryLog; + +/** + * @Description :订单发货通知记录表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebOrderDeliveryLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java new file mode 100644 index 0000000..caff5af --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPackage; + +/** + * @Description :物理包装 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebPackageRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java new file mode 100644 index 0000000..3f52f37 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebProcurementPlanOrderDetails; + +/** + * @Description :开口合同明细表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebProcurementPlanOrderDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java new file mode 100644 index 0000000..5795ba0 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPackage; +import cn.estsh.i3plus.pojo.sweb.bean.SwebProcurementPlanOrder; + +/** + * @Description :开口合同主表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebProcurementPlanOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java new file mode 100644 index 0000000..8efe954 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseChangeLog; + +/** + * @Description :订单修改日志记录表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebPurchaseChangeLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java new file mode 100644 index 0000000..dfd6da4 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrderDetails; + +/** + * @Description :采购订单表-明细表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebPurchaseOrderDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java new file mode 100644 index 0000000..6ef21fb --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder; + +/** + * @Description :采购订单表-主表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebPurchaseOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java new file mode 100644 index 0000000..00477a6 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrderSn; + +/** + * @Description :采购订单表-条码明细表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebPurchaseOrderSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java new file mode 100644 index 0000000..f3ed325 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorRel; + +/** + * @Description :供应商关系表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebVendorRelRepository extends BaseRepository { +} From 9beafd1bc6ba985f5115e45f59e835ac1d93ec54 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 1 Apr 2019 18:02:06 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=20=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=20=E5=BE=AE=E6=9C=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E5=B9=B3=E5=8F=B0=E8=A7=92=E8=89=B2=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=B9=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/bean/BfRefMethodRole.java | 21 ++++++++-------- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 29 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java index d41e560..929fe5c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java @@ -9,7 +9,6 @@ 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; @@ -26,26 +25,26 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_REF_METHOD_ROLE") -@Api(value="功能角色关系",description = "功能角色关系") +@Table(name = "BF_REF_METHOD_ROLE") +@Api(value = "功能角色关系", description = "功能角色关系") public class BfRefMethodRole extends BaseBean { - @Column(name="METHOD_ID") - @ApiParam(value ="表单功能id") + @Column(name = "METHOD_ID") + @ApiParam(value = "表单功能id") @JsonSerialize(using = ToStringSerializer.class) private Long methodId; - @Column(name="METHOD_NAME_RDD") - @ApiParam(value ="表单功能名称") + @Column(name = "METHOD_NAME_RDD") + @ApiParam(value = "表单功能名称") private String methodNameRdd; - @Column(name="ROLE_ID") - @ApiParam(value ="角色id") + @Column(name = "ROLE_ID") + @ApiParam(value = "角色id") @JsonSerialize(using = ToStringSerializer.class) private Long roleId; - @Column(name="ROLE_NAME_RDD") - @ApiParam(value ="角色名称") + @Column(name = "ROLE_NAME_RDD") + @ApiParam(value = "角色名称") private String roleNameRdd; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 6fdcbef..428758e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -45,6 +45,35 @@ public final class FormHqlPack { } /** + * In 参数封装 + * @param columnName 列名 + * @param params 参数 + * @param isDeleted 数据状态 + * @return hql + */ + public static String packHqlIdsAndIsDeleted(String columnName, String[] params, Integer isDeleted) { + StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params)); + + HqlPack.getNumEqualPack(isDeleted, "isDeleted", result); + return result.toString(); + } + + + /** + * In 参数封装 + * @param columnName 列名 + * @param params 参数 + * @param isDeleted 数据状态 + * @return hql + */ + public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) { + StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params)); + + HqlPack.getNumEqualPack(isDeleted, "isDeleted", result); + return result.toString(); + } + + /** * 表单布局复杂查询 * @param bfLayout 表单布局 * @return hql From 1e797d0dac5fdd7759d3af8fa442c88392a8b613 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 1 Apr 2019 18:27:13 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E7=BA=A7=E8=81=94=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90(=E6=9C=AA=E6=B5=8B?= =?UTF-8?q?=E8=AF=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java | 8 ++++++-- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java index 315d8e3..c5e200c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java @@ -33,13 +33,17 @@ public class BfCascadeDetail extends BaseBean { @Column(name = "CASCADE_ID") @ApiParam(value = "级联ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long cascade_id; + private Long cascadeId; @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long elementId; + @Column(name = "DETAIL_LABEL_TEXT") + @ApiParam(value = "提示信息") + private String detailLabelText; + @Column(name="ELEMENT_NAME") @ApiParam(value ="元素名称") private String elementName; @@ -51,7 +55,7 @@ public class BfCascadeDetail extends BaseBean { @Column(name = "PARENT_ID") @ApiParam(value = "父级ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long parent_id; + private Long parentId; @Column(name = "ELEMENT_PROPERTY_VALUE_ID") @ApiParam(value = "对象属性-元素属性ID", example = "-1") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java index 69d0ca8..a979a2c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java @@ -46,7 +46,7 @@ public class BfElementGrid extends BaseBean { @Column(name = "IS_OBJECT_EDIT") @ApiParam(value = "是否编辑") - private Integer isObject_edit; + private Integer isObjectEdit; @Column(name = "IS_OBJECT_DEL") @ApiParam(value = "是否删除") From 98d4f691f120ae868a3d435f84fa145a293ec765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 1 Apr 2019 18:38:38 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 --------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 09e3519..089b84c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -177,4 +177,6 @@ public class WmsStockSn extends BaseBean { } public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } + + public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();} } 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 e74178b..98e919a 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 @@ -1036,15 +1036,6 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result); //单号 HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); - //业务类型 - HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); - //关联单据类型 - HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); - //关联单据号 - HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); - //入库单号 - HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result); - getStringBuilderPack(wmsQCMaster, result); return result.toString(); From c5331008dc73295df9766fd0d660ca86d3ead51d Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 1 Apr 2019 19:03:22 +0800 Subject: [PATCH 11/25] wsebhqlpack update --- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java new file mode 100644 index 0000000..0468770 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.sweb.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.base.tool.SqlPack; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder; +import org.apache.commons.lang3.StringUtils; + +/** + * @Description : hql 封装 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 17:59 + * @Modify: + **/ +public class SwebHqlPack { + + /** + * 通用封装isValid、isDeleted等参数 + * @param bean + * @param hqlStr + * @return + */ + private static String buildHql(BaseBean bean, StringBuffer hqlStr){ + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + return hqlStr.toString(); + } + + public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); + return buildHql(purchaseOrder,result); + } +} From ecdd1d45debcc95a6ea123c396a420e37e927b7a Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Mon, 1 Apr 2019 19:20:54 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=95=A3=E4=BB=B6?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 10 +++++++ 2 files changed, 44 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 bf6d6ea..afc39d4 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 @@ -1987,4 +1987,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 单据是否散件 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_PART { + IS_ADJUST(1, "散件"), ADJUST(2, "非散件"); + + private int value; + private String description; + + IS_PART(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index eeeff68..2639206 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -145,6 +145,10 @@ public class WmsDocMovementDetails extends BaseBean { private String actualLot; @Transient + @ApiParam("实际数量") + private Double actualQty; + + @Transient @ApiParam("推荐批次") private String recommondLot; @@ -152,5 +156,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("推荐库位") private String recommondLocateNo; + @Transient + @ApiParam("前端表格编辑使用") + private Boolean isSet = false; + public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } + + public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); } } From 3902dcca43f2df8a4b8c7295025b714d999a1c43 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Mon, 1 Apr 2019 20:08:23 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E7=9B=98=E7=82=B9PDA=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index f1c8cf5..b6684c8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -109,14 +109,14 @@ public class WmsCSOrderDetails extends BaseBean { public WmsCSOrderDetails(){} - public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName){ + public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String partName,String whNo,String zoneNo,String locateNo){ this.qty = qty; this.partNo = partNo; this.orderNo = orderNo; + this.partNameRdd = partName; this.whNo = whNo; this.zoneNo = zoneNo; this.locateNo = locateNo; - this.partNameRdd = partName; } public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName,String sn){ 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 e74178b..4649aa7 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 @@ -1515,7 +1515,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); HqlPack.getInPackString(data,columnName,result); - HqlPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result); + HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result); getStringBuilderPack(bean, result); return result.toString(); } From 6944deef5475be129259928374bde34e43b45b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 2 Apr 2019 09:03:27 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 1a0230a..036230c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 移库单条码表 @@ -66,4 +67,8 @@ public class WmsDocMovementSn extends BaseBean { @Column(name="SN") @ApiParam("条码") public String sn; + + @Transient + @ApiParam("前端表格编辑使用") + private Boolean isSet = false; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index e181f09..2a8209b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -122,6 +122,13 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "供应商批次") public String dateCode; + @Transient + @ApiParam("前端表格编辑使用") + public Boolean isSet = false; + + @Transient + @ApiParam("供应商批次字段是否可编辑") + public Boolean isDateCodeEdit = true; public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; } } 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 75ab922..51f5e00 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 @@ -163,7 +163,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result); - HqlPack.getNumEqualPack(wmsPOMaster.getIsPart(),"isPart", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart", result); HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); From 1f11a6f28074c40dfbbf0fbc0e05720fb0fe67d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 2 Apr 2019 11:31:38 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 089b84c..15a11c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -170,6 +170,10 @@ public class WmsStockSn extends BaseBean { @Transient public Double inputNCQty; + @ApiParam(value = "前端散件表格是否编辑") + @Transient + public Boolean isSet = false; + public WmsStockSn(){} public WmsStockSn(String partNo){ 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 51f5e00..7f4799e 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 @@ -1033,7 +1033,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "", WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result); - HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart",result); //单号 HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsQCMaster, result); From fb095c6bfb8c61258c2b0f25284c0f40a4337bd3 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 2 Apr 2019 13:20:45 +0800 Subject: [PATCH 16/25] =?UTF-8?q?Sweb=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4bean+hql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/sweb/bean/SwebPackage.java | 2 ++ .../sweb/bean/SwebProcurementPlanOrderDetails.java | 2 ++ .../pojo/sweb/bean/SwebPurchaseChangeLog.java | 2 ++ .../modelbean/SwebPurchaseForPubListModel.java | 14 ++++++++ .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 37 +++++++++++++++++++--- 5 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java index a420d5e..7eadec2 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -40,6 +41,7 @@ public class SwebPackage extends BaseBean { @ApiParam("上级包装编号") public String parentPackageNo; + @ColumnDefault("0") @Column(name="PACKAGE_QTY") @ApiParam(value = "包装件数", example = "1") public Integer packageQty; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java index 144cf36..6143e86 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -44,6 +45,7 @@ public class SwebProcurementPlanOrderDetails extends BaseBean { @Column(name = "UNIT") private String unit; + @ColumnDefault("0") @ApiParam("标准包装") @Column(name = "SNP_QTY") private Double snpQty; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java index 800016a..8ab6d57 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -38,6 +39,7 @@ public class SwebPurchaseChangeLog extends BaseBean { @Column(name = "QTY") @ApiParam("零件数量") + @ColumnDefault("0") public Double qty; @Column(name = "REMARK") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java new file mode 100644 index 0000000..4dca685 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-02 13:13 + * @Modify: + **/ +@Data +public class SwebPurchaseForPubListModel { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 0468770..48f0d78 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; -import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder; +import cn.estsh.i3plus.pojo.sweb.bean.*; import org.apache.commons.lang3.StringUtils; /** @@ -18,11 +18,12 @@ public class SwebHqlPack { /** * 通用封装isValid、isDeleted等参数 + * * @param bean * @param hqlStr * @return */ - private static String buildHql(BaseBean bean, StringBuffer hqlStr){ + private static String buildHql(BaseBean bean, StringBuffer hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); @@ -34,11 +35,39 @@ public class SwebHqlPack { return hqlStr.toString(); } - public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder){ + public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); - return buildHql(purchaseOrder,result); + return buildHql(purchaseOrder, result); + } + + public static String getPackAgeWhereHql(SwebPackage swebPackage) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); + HqlPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); + HqlPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); + return buildHql(swebPackage, result); + } + + public static String getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); + HqlPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); + return buildHql(swebProcurementPlanOrder, result); + } + + public static String getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); + return buildHql(swebProcurementPlanOrderDetails, result); + } + + public static String getVendorRelWhereHql(SwebVendorRel vendorRel) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); + HqlPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); + return buildHql(vendorRel, result); } } From 6b8ac6240de8758c76c07efd1c697d966aea3e7e Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 2 Apr 2019 13:34:14 +0800 Subject: [PATCH 17/25] =?UTF-8?q?LINK=5FORDER=5FTYPE=E6=97=A0=E9=9C=80?= =?UTF-8?q?=E6=95=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 56 +++++++--------------- 1 file changed, 16 insertions(+), 40 deletions(-) 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 afc39d4..a7bf29d 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 @@ -80,7 +80,6 @@ public class WmsEnumUtil { } - /** * 主表信息 单据类型 */ @@ -584,60 +583,37 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LINK_ORDER_TYPE { - ASN(10, "ASN", "ASN"), - PO(20, "PO", "PO"), - SO(30, "SO", "SO"), - MOVE(40, "MOVE", "MOVE"), - IN_STOCK(50, "IN_STOCK", "IN_STOCK"), - SHIPPING(60, "SHIPPING", "SHIPPING"), - QC(70, "QC", "QC"), - CS(80, "CS", "CS"); - private int value; - private String code; + ASN("ASN", "ASN"), + PO("PO", "PO"), + SO("SO", "SO"), + MOVE("MOVE", "MOVE"), + IN_STOCK("IN_STOCK", "IN_STOCK"), + SHIPPING("SHIPPING", "SHIPPING"), + QC("QC", "QC"), + CS("CS", "CS"); + private String value; private String description; - LINK_ORDER_TYPE(int value, String code, String description) { + LINK_ORDER_TYPE(String value, String description) { this.value = value; - this.code = code; this.description = description; } - public int getValue() { - return value; - } - public String getDescription() { return description; } public String getCode() { - return code; - } - - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; + return value; } - 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 String getValue() { + return value; } - public static LINK_ORDER_TYPE codeOf(String code) { - int tmp = 1; + public static LINK_ORDER_TYPE codeOf(String value) { for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { + if (values()[i].value.equals(value)) { return values()[i]; } } @@ -720,7 +696,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_STATUS { - CREATE(10,"创建"), + CREATE(10, "创建"), QUALITY_CONTROL(20, "质检中"), PRE_INSTOCK(30, "待入库"), INSTOCKED(40, "入库"), From 956c8c0362484ababcfc98520f047c71c4a8112f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 2 Apr 2019 14:17:14 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 036230c..9233e83 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -71,4 +71,16 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + + @Transient + @ApiParam("源库位代码") + public String srcLocateNo; + + @Transient + @ApiParam("生产日期") + public String dateCode; } From c43a166a2501c7389970147051c26b3eaa3e2a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 2 Apr 2019 15:16:17 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E4=BC=98=E5=8C=96module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 4e5bc8c..32a91fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -57,10 +57,18 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "处理数量", example = "0") public Double transQty; + public Double getTransQty(){ + return this.transQty == null ? 0 : this.transQty.doubleValue(); + } + @Column(name="REJECT_QTY") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; + public Double getRejectQty(){ + return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); + } + @Column(name="UNIT") @ApiParam("单位") public String unit; From 60ca989dfc0ebfac8e93186d58868705a659fbfc Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 2 Apr 2019 16:38:49 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=20=E4=B8=8D?= =?UTF-8?q?=E6=87=82=E8=AF=B7=E7=9C=8B=E6=8F=90=E4=BA=A4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/BfElement.java | 73 ++++++++++++++++++++++ .../pojo/mes/repository/BfElementRepository.java | 14 +++++ 2 files changed, 87 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BfElement.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BfElement.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BfElement.java new file mode 100644 index 0000000..02bd079 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BfElement.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.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 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 : Adair Peng + * @CreateDate : 2019-03-21 13:14 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BF_ELEMENT") +@Api(value = "对象元素基础", description = "元素基础表") +public class BfElement extends BaseBean { + + //外键关联数据对象主键 + @Column(name = "ELEMENT_INFO_ID") + @ApiParam(value = "对象元素明细ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementInfoId; + + //外键关联数据对象主键 + @Column(name = "DATA_OBJECT_ID") + @ApiParam(value = "数据对象ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long dataObjectId; + + @Column(name="ELEMENT_TYPE") + @ApiParam(value ="元素类型") + private Integer elementType; + + @Column(name="ELEMENT_NAME") + @ApiParam(value ="元素名称") + private String elementName; + + @Column(name="ELEMENT_CODE") + @ApiParam(value ="元素编码") + private String elementCode; + + @Column(name="ELEMENT_ATTR_ID") + @ApiParam(value ="默认排序属性") + private String elementAttrId; + + @Column(name="ELEMENT_SORT_TYPE") + @ApiParam(value ="默认排序规则") + private String elementSortType; + + @Column(name="ELEMENT_CSS_STYLE") + @ApiParam(value ="元素样式") + private String elementCssStyle; + + @Column(name="ELEMENT_DESCRIPTION") + @ApiParam(value ="元素描述") + private String elementDescription; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.java new file mode 100644 index 0000000..0132694 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.BfElement; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-03-21 15:24 + * @Modify: + **/ +public interface BfElementRepository extends BaseRepository { +} From b04895c67cdbbe5f95fae4d892f211bcb0ccbe97 Mon Sep 17 00:00:00 2001 From: jiajack Date: Tue, 2 Apr 2019 16:47:15 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesArea.java | 38 +++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 45 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 49 ++++++++++++++++++++++ .../pojo/mes/repository/MesAreaRepository.java | 16 +++++++ .../pojo/mes/repository/MesWorkCellRepository.java | 17 ++++++++ .../mes/repository/MesWorkCenterRepository.java | 17 ++++++++ 6 files changed, 182 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java new file mode 100644 index 0000000..8f2288b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_AREA") +@Api("生产区域") +public class MesArea extends BaseBean { + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String areaName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java new file mode 100644 index 0000000..4ec6e23 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL") +@Api("工作单元") +public class MesWorkCell extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java new file mode 100644 index 0000000..bc33bca --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工作中心 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CENTER") +@Api("工作中心") +public class MesWorkCenter extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "ERP_WORK_CENTER") + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @Column(name = "WORK_VER") + @ApiParam("工作版本") + private String workVer; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java new file mode 100644 index 0000000..b1237f5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2018-11-07 14:49 + * @Modify: + **/ +@Repository +public interface MesAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java new file mode 100644 index 0000000..f97c4db --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2018-11-07 14:49 + * @Modify: + **/ +@Repository +public interface MesWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java new file mode 100644 index 0000000..5598e1e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2018-11-07 14:49 + * @Modify: + **/ +@Repository +public interface MesWorkCenterRepository extends BaseRepository { +} From 6f823a5ed91952164c3dbe908ea6978278fe6fe2 Mon Sep 17 00:00:00 2001 From: jiajack Date: Tue, 2 Apr 2019 16:49:13 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/MachineFactory.java | 66 ---------------------- .../java/cn/estsh/i3plus/pojo/mes/WorkPlan.java | 20 ------- 2 files changed, 86 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java deleted file mode 100644 index efc83a4..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package cn.estsh.i3plus.pojo.mes; - - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify: - **/ -@Entity -@Table(name="machine_factory") -@Api("工厂") -public class MachineFactory extends BaseBean { - - @Column(name="factory_code") - @ApiParam("工厂代码") - private String factoryCode; - - @Column(name="factory_name") - @ApiParam("工厂名称") - private String factoryName; - - public MachineFactory() { - } - - public MachineFactory(String factoryCode, String factoryName) { - this.factoryCode = factoryCode; - this.factoryName = factoryName; - } - - public String getFactoryCode() { - return factoryCode; - } - - public void setFactoryCode(String factoryCode) { - this.factoryCode = factoryCode; - } - - public String getFactoryName() { - return factoryName; - } - - public void setFactoryName(String factoryName) { - this.factoryName = factoryName; - } - - @Override - public String toString() { - return "MachineFactory{" + - "factoryCode='" + factoryCode + '\'' + - ", factoryName='" + factoryName + '\'' + - ", id=" + id + - ", createDate='" + createDatetime + '\'' + - ", modifyDate='" + modifyDatetime + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java deleted file mode 100644 index a2e02f2..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.estsh.i3plus.pojo.mes; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify:: - **/ -public class WorkPlan { - private String desc; - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } -} From 865add1f7fb79a1f5b9af5480702fdffc86dde72 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 2 Apr 2019 17:19:01 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 11 +++---- .../cn/estsh/i3plus/pojo/form/bean/BfButton.java | 35 +++++++++++++--------- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 15 ++++++++++ 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 672767d..11363f8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; -import javafx.scene.chart.Chart; - -import java.util.Date; /** * @Description : 模块表单枚举类 @@ -1572,9 +1569,9 @@ public class BlockFormEnumUtil { * 表单功能明细 触发效果信息 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TRIGGER_EFFECT { + public enum BUTTON_TRIGGER_EFFECT { DIALOG(10, "DIALOG", "弹出窗口"), - WINDOW_NEW(20, "NEW_WINDOW", "新开窗口"), + NEW_WINDOW(20, "NEW_WINDOW", "新开窗口"), SQL(30, "SQL", "执行SQL"), CLASS_METHOD(40, "CLASS_METHOD", "执行类方法"); @@ -1582,7 +1579,7 @@ public class BlockFormEnumUtil { private String name; private String description; - TRIGGER_EFFECT(int value, String name, String description) { + BUTTON_TRIGGER_EFFECT(int value, String name, String description) { this.value = value; this.name = name; this.description = description; @@ -1600,7 +1597,7 @@ public class BlockFormEnumUtil { return name; } - public static TRIGGER_EFFECT valueOf(int val) { + public static BUTTON_TRIGGER_EFFECT valueOf(int val) { for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index 7b20d71..bc8a73b 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -9,7 +9,6 @@ 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; @@ -26,31 +25,39 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_BUTTON") -@Api(value="表单按钮",description = "表单按钮") +@Table(name = "BF_BUTTON") +@Api(value = "表单按钮", description = "表单按钮") public class BfButton extends BaseBean { - @Column(name="BUTTON_NAME") - @ApiParam(value ="按钮名称") + @Column(name = "BUTTON_NAME") + @ApiParam(value = "按钮名称") private String buttonName; - // 枚举:BlockFormEnumUtil.TRIGGER_EFFECT - @Column(name="TRIGGER_MODE") - @ApiParam(value ="触发方式") + // 枚举:BlockFormEnumUtil.BUTTON_TRIGGER_EFFECT + @Column(name = "TRIGGER_MODE") + @ApiParam(value = "触发方式") private Integer triggerMode; + public Integer getTriggerMode() { + if (triggerMode == null) { + return null; + } else { + return triggerMode.intValue(); + } + } + // 关联表单功能表id - @Column(name="METHOD_ID") - @ApiParam(value ="表单功能id") + @Column(name = "METHOD_ID") + @ApiParam(value = "表单功能id") @JsonSerialize(using = ToStringSerializer.class) private Long methodId; - @Column(name="METHOD_NAME_RDD") - @ApiParam(value ="表单功能名称") + @Column(name = "METHOD_NAME_RDD") + @ApiParam(value = "表单功能名称") private String methodNameRdd; // 执行类方法,sql,脚本 - @Column(name="METHOD_CONTENT") - @ApiParam(value ="执行内容") + @Column(name = "METHOD_CONTENT") + @ApiParam(value = "执行内容") private String methodContent; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 428758e..c03a7c4 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -164,4 +164,19 @@ public final class FormHqlPack { return result.toString(); } + + /** + * 表单按钮复杂查询 + * @param bfButton 查询条件 + */ + public static String packHqlBfButton(BfButton bfButton){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", result); + HqlPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", result); + HqlPack.getNumEqualPack(bfButton.getIsDeleted(), "isDeleted", result); + result.append(bfButton.orderBy()); + + return result.toString(); + } } From c1b477dd325d539582740653a851ece4d430a7c1 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 2 Apr 2019 17:34:01 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index bb0d888..1225c80 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -56,6 +56,10 @@ public class WmsLocatePart extends BaseBean{ @ApiParam(value = "是否生成领料单", example = "2") private Integer isGeneratePicklist; + public Double getMix() { + return this.min == null ? 0 : this.min; + } + public Integer getIsGeneratePicklist() { return this.isGeneratePicklist == null ? 0 : this.isGeneratePicklist; } From 6b89f8d57264494b6fb4029d9436f703797c0a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 2 Apr 2019 17:58:24 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 9233e83..1c3e91f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -83,4 +83,8 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("生产日期") public String dateCode; + + @ApiParam(value = "散件移库输入移库数量") + @Transient + public Double inputMoveQty; }