From 1e22ff7e75d49cf6088f04215e9d45df692c2b70 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 19 Apr 2019 14:46:11 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=A1=A8=E5=8D=95-=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E5=99=A8=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java index 375466a..5e67b40 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java @@ -46,4 +46,8 @@ public class BfIntercept extends BaseBean { @Column(name="INTERCEPT_DESCRIPTION") @ApiParam(value ="拦截器描述") private String interceptDescription; + + @Column(name="INTERCEPT_STATUS") + @ApiParam(value ="拦截器状态") + private Integer interceptStatus; } 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 804c605..176e57e 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 @@ -179,6 +179,7 @@ public final class FormHqlPack { DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean); ddlPackBean.setOrderByStr(bfIntercept.orderBy()); From 72691f50edddf21856d43ee4b92fda8f71735768 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 19 Apr 2019 14:55:53 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=95=A3=E4=BB=B6=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E=E7=BB=86=E6=8E=A8=E5=85=A5?= =?UTF-8?q?=E9=98=9F=E5=88=97=E9=94=99=E8=AF=AF=EF=BC=9B=20=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E7=89=A9=E6=96=99=E5=AD=97=E6=AE=B5=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 1c75712..271275b 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 @@ -21,23 +21,23 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_LOCATE_PART") +@Table(name = "WMS_LOCATE_PART") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="库位物料表",description = "库位物料表") -public class WmsLocatePart extends BaseBean{ +@Api(value = "库位物料表", description = "库位物料表") +public class WmsLocatePart extends BaseBean { - @Column(name="LOCATE_NO") - @ApiParam(value ="库位代码") + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") private String locateNo; - @Column(name="PART_NO") - @ApiParam(value ="物料编码") + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") private String partNo; - @Column(name="PART_NAME_RDD") - @ApiParam(value ="物料名称") + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") private String partNameRdd; @Column(name = "PULL_QTY") @@ -56,7 +56,7 @@ public class WmsLocatePart extends BaseBean{ @ApiParam(value = "是否生成领料单", example = "2") private Integer isGeneratePicklist; - public Double getMin() { + public Double getMin() { return this.min == null ? 0 : this.min; } From ae8f051f539dfbfbe910feb96434d6d89b53e950 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 19 Apr 2019 18:25:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 201 +++++++++++---------- 1 file changed, 103 insertions(+), 98 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index a1803cd..b6a45ce 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 @@ -33,6 +33,7 @@ public class WmsHqlPack { /** * 封装公用查询参数 + * * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 @@ -136,7 +137,6 @@ public class WmsHqlPack { */ public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { DdlPackBean packBean = new DdlPackBean(); -// StringBuffer result = new StringBuffer(); //查询参数封装 DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); @@ -272,62 +272,6 @@ public class WmsHqlPack { } /** - * 库位物料信息 分页查询 - * - * @param wmsLocatePart - * @return - */ - public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { - StringBuffer result = new StringBuffer(); - - //查询参数封装 - HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); - - getStringBuilderPack(wmsLocatePart, result); - - return result.toString(); - } - - /** - * 库位信息 分页查询 - * - * @param wmsLocate - * @return - */ - public static DdlPackBean packHqlWmsLocates(WmsLocate wmsLocate) { - //查询参数封装 - DdlPackBean result = new DdlPackBean(); - - //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateNo(), "locateNo", result); - DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); - DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); - DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); - DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); - DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); - - getStringBuilderPack(wmsLocate, result); - - return result; - } - - /** - * 根据类型查询库位分页 - * - * @param wmsLocate - * @return - */ - public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) { - StringBuffer result = new StringBuffer(); - //查询参数封装 - HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); - getStringBuilderPack(wmsLocate, result); - return result.toString(); - } - - /** * 交易类型信息 分页查询 * * @param wmsTransType @@ -365,23 +309,6 @@ public class WmsHqlPack { return result.toString(); } - /** - * 仓库分页查询条件 - * - * @param wareHouse - * @return - */ - public static String packHqlWareHouse(WareHouse wareHouse) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); - HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); - HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - - getStringBuilderPack(wareHouse, result); - - return result.toString(); - } /** * 供应商分页查询 @@ -424,6 +351,24 @@ public class WmsHqlPack { } /** + * 仓库分页查询条件 + * + * @param wareHouse + * @return + */ + public static String packHqlWareHouse(WareHouse wareHouse) { + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); + HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); + HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); + + getStringBuilderPack(wareHouse, result); + + return result.toString(); + } + + /** * 仓库唯一性校验查询条件【用于添加和修改】 * * @param wareHouse @@ -442,6 +387,85 @@ public class WmsHqlPack { } /** + * 存储区信息 查询条件封装 + * + * @param wmsZones + * @return + */ + public static String packHqlWmsZones(WmsZones wmsZones) { + StringBuffer result = new StringBuffer(); + + //仓库代码 + HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); + //库存地代码 + HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); + //存储区代码 + HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + //存储区名称 + HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); + + getStringBuilderPack(wmsZones, result); + + return result.toString(); + } + + /** + * 库位信息 分页查询 + * + * @param wmsLocate + * @return + */ + public static DdlPackBean packHqlWmsLocates(WmsLocate wmsLocate) { + //查询参数封装 + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); + DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); + + getStringBuilderPack(wmsLocate, result); + + return result; + } + + /** + * 根据类型查询库位分页 + * + * @param wmsLocate + * @return + */ + public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) { + StringBuffer result = new StringBuffer(); + //查询参数封装 + HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); + getStringBuilderPack(wmsLocate, result); + return result.toString(); + } + + /** + * 库位物料信息 分页查询 + * + * @param wmsLocatePart + * @return + */ + public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); + + getStringBuilderPack(wmsLocatePart, result); + + return result.toString(); + } + + /** * 供应商唯一性校验查询条件【用于添加和修改】 * * @param basVendor @@ -502,28 +526,6 @@ public class WmsHqlPack { return result.toString(); } - /** - * 存储区信息 查询条件封装 - * - * @param wmsZones - * @return - */ - public static String packHqlWmsZones(WmsZones wmsZones) { - StringBuffer result = new StringBuffer(); - - //仓库代码 - HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result); - //库存地代码 - HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); - //存储区代码 - HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); - //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); - - getStringBuilderPack(wmsZones, result); - - return result.toString(); - } /** * 客户信息 查询条件封装 @@ -1083,8 +1085,8 @@ public class WmsHqlPack { HqlPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "", WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue() + ""), "snStatus", result); //单号 - HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getDateCode(),"dateCode",result); + HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); @@ -1272,6 +1274,7 @@ public class WmsHqlPack { /** * 作业流程分页查询 + * * @return */ public static DdlPackBean packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { @@ -1289,6 +1292,7 @@ public class WmsHqlPack { /** * 作业流程明细分页查询 + * * @return */ public static DdlPackBean packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { @@ -1621,6 +1625,7 @@ public class WmsHqlPack { /** * 查询脚本持久化 查询条件封装 + * * @return */ public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) { From ce55dda3678e2029a0e3ffe23656f8791e3be580 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Fri, 19 Apr 2019 19:01:50 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 54 +++++++++++++++----- .../cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java | 59 ++++++++++++++++++++++ .../pojo/sweb/repository/SwebConfigRepository.java | 14 +++++ 3 files changed, 114 insertions(+), 13 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebConfigRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 47aba3c..933ccd0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -16,17 +16,19 @@ public class SwebEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_MASTER_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "已发布"), - SURE(30, "已确认"), - CLOSED(40, "已打印"), - DELIVERY(50, "已发货"); + CREATE(10, "CREATE","新建"), + RECEIPT(20, "RECEIPT","已发布"), + SURE(30, "SURE","已确认"), + PRINTED(40, "PRINTED","已打印"), + DELIVERY(50, "DELIVERY","已发货"); private int value; + private String code; private String description; - ORDER_MASTER_STATUS(int value, String description) { + ORDER_MASTER_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -57,6 +59,16 @@ public class SwebEnumUtil { } return tmp; } + + public static int codeOf(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; + } } /** @@ -64,17 +76,19 @@ public class SwebEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "已发布"), - SURE(30, "已确认"), - CLOSED(40, "已打印"), - DELIVERY(50, "已发货"); + CREATE(10, "CREATE","新建"), + RECEIPT(20, "RECEIPT","已发布"), + SURE(30, "SURE","已确认"), + PRINTED(40, "PRINTED","已打印"), + DELIVERY(50, "DELIVERY","已发货"); private int value; + private String code; private String description; - ORDER_DETAILS_STATUS(int value, String description) { + ORDER_DETAILS_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -82,6 +96,10 @@ public class SwebEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -105,6 +123,16 @@ public class SwebEnumUtil { } return tmp; } + + public static int codeOf(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; + } } /** @@ -146,7 +174,7 @@ public class SwebEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_TYPE { STANDARD(10, "标准包装"), - NON_STANDARD(20, "非标包装"); + NON_STANDARD(20, "非标准包装"); private int value; private String description; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java new file mode 100644 index 0000000..ccfef29 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java @@ -0,0 +1,59 @@ +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 : sweb系统配置 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-19 11:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "SWEB_CONFIG") +@Api(value = "系统配置", description = "SWEB系统配置") +public class SwebConfig extends BaseBean { + + @Column(name = "NAME") + @ApiParam(value = "名称") + private String name; + + @Column(name = "CONFIG_TYPE") + @ApiParam(value = "参数类型ID（枚举：1.系统配置...）", example = "-1") + private Integer configType; + + @Column(name = "CONFIG_CODE") + @ApiParam(value = "参数代码") + private String configCode; + + // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP + @Column(name = "CONFIG_GROUP") + @ApiParam(value = "参数组") + private Integer configGroup; + + // 枚举 ImppEnumUtil.SYS_VALUE_TYPE + @Column(name = "CONFIG_VALUE_TYPE") + @ApiParam(value = "参数值类型") + private String configValueType; + + @Column(name = "CONFIG_VALUE") + @ApiParam(value = "参数值") + private String configValue; + + @Column(name = "CONFIG_DESCRIPTION") + @ApiParam(value = "参数描述") + private String configDescription; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebConfigRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebConfigRepository.java new file mode 100644 index 0000000..1d9a699 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebConfigRepository.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.SwebConfig; + +/** + * @Description :系统配置 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-19 14:51 + * @Modify: + **/ +public interface SwebConfigRepository extends BaseRepository { +} From 7f36c485abda48949689d065c95bfbeec840ae2f Mon Sep 17 00:00:00 2001 From: Silliter Date: Sat, 20 Apr 2019 16:13:05 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AE=9E=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 09eeefb..15580ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.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 : 盘点实盘信息 @@ -92,4 +93,12 @@ public class WmsCSFactTrans extends BaseBean { @Column(name="REMARK") @ApiParam(value = "备注") public String remark; + + @Transient + @ApiParam(value = "剩余数量", example = "1") + public Double surplusQty; + + @Transient + @ApiParam("源库位编号") + public String srcLocateNo; } From 50f0a7d52a5cc13d06959d0c1ce7dd3d2559e5bf Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Sat, 20 Apr 2019 20:19:49 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 32 ++++--- .../pojo/sweb/bean/SwebOrderDeliveryLog.java | 8 +- .../estsh/i3plus/pojo/sweb/bean/SwebPackage.java | 8 +- .../pojo/sweb/bean/SwebPurchaseChangeLog.java | 4 +- .../i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 34 +++---- .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 6 +- .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 14 +-- .../modelbean/SwebPOBatchInsertEnterModel.java | 39 ++++++++ .../modelbean/SwebPOBatchInsertItemEnterModel.java | 103 +++++++++++++++++++++ 9 files changed, 198 insertions(+), 50 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 933ccd0..4b2e9fc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -16,11 +16,11 @@ public class SwebEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_MASTER_STATUS { - CREATE(10, "CREATE","新建"), - RECEIPT(20, "RECEIPT","已发布"), - SURE(30, "SURE","已确认"), - PRINTED(40, "PRINTED","已打印"), - DELIVERY(50, "DELIVERY","已发货"); + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "已发布"), + SURE(30, "SURE", "已确认"), + PRINTED(40, "PRINTED", "已打印"), + DELIVERY(50, "DELIVERY", "已发货"); private int value; private String code; @@ -76,11 +76,11 @@ public class SwebEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { - CREATE(10, "CREATE","新建"), - RECEIPT(20, "RECEIPT","已发布"), - SURE(30, "SURE","已确认"), - PRINTED(40, "PRINTED","已打印"), - DELIVERY(50, "DELIVERY","已发货"); + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "已发布"), + SURE(30, "SURE", "已确认"), + PRINTED(40, "PRINTED", "已打印"), + DELIVERY(50, "DELIVERY", "已发货"); private int value; private String code; @@ -173,14 +173,16 @@ public class SwebEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_TYPE { - STANDARD(10, "标准包装"), - NON_STANDARD(20, "非标准包装"); + STANDARD(10, "STANDARD", "标准包装"), + NON_STANDARD(20, "NON_STANDARD", "非标准包装"); private int value; + private String code; private String description; - ORDER_TYPE(int value, String description) { + ORDER_TYPE(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -188,6 +190,10 @@ public class SwebEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } 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 index dfa3f3e..2bb1f98 100644 --- 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 @@ -30,17 +30,17 @@ public class SwebOrderDeliveryLog extends BaseBean { @Column(name = "ORDER_ITEM_NO") @ApiParam("单据明细编号") - public String orderItemNo; + private String orderItemNo; @Column(name = "CAR_NO") @ApiParam(value = "发运车号") - public String carNo; + private String carNo; @Column(name = "CONTACT") @ApiParam("联系人") - public String contact; + private String contact; @Column(name = "CONTACT_TEL") @ApiParam(value = "联系人电话") - public String contactTel; + private 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 index 7eadec2..83ad7ca 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 @@ -31,18 +31,18 @@ public class SwebPackage extends BaseBean { @Column(name="PACKAGE_NO") @ApiParam("包装编号") - public String packageNo; + private String packageNo; @Column(name="PACKAGE_TYPE_ID") @ApiParam(value = "包装类型", example = "1") - public Integer packTypeId; + private Integer packTypeId; @Column(name="PARENT_PACKAGE_NO") @ApiParam("上级包装编号") - public String parentPackageNo; + private String parentPackageNo; @ColumnDefault("0") @Column(name="PACKAGE_QTY") @ApiParam(value = "包装件数", example = "1") - public Integer packageQty; + private Integer packageQty; } 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 5f2434f..3e86f3d 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 @@ -31,7 +31,7 @@ public class SwebPurchaseChangeLog extends BaseBean { @Column(name = "ORDER_NO") @ApiParam("单据明细编号") - public String orderNo; + private String orderNo; @ApiParam(value = "零件号") @Column(name = "PART_NO") @@ -44,7 +44,7 @@ public class SwebPurchaseChangeLog extends BaseBean { @Column(name = "QTY") @ApiParam("零件数量") @ColumnDefault("0") - public Double qty; + private Double qty; @Column(name = "REMARK") @ApiParam("备注") 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 index 4927683..add54ef 100644 --- 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 @@ -48,72 +48,72 @@ public class SwebPurchaseOrder extends BaseBean { @ApiParam(value = "订单类型", example = "1") @Column(name = "ORDER_TYPE") - public Integer orderType; + private Integer orderType; @ApiParam(value = "订单状态", example = "1") @Column(name = "ORDER_STATUS") - public Integer orderStatus; + private Integer orderStatus; @Column(name = "PARENT_PACKAGE_NO") @ApiParam("上级包装编号") - public String parentPackageNo; + private String parentPackageNo; @Column(name = "DOCK") @ApiParam("道口") - public String dock; + private String dock; @Column(name = "ERP_WAREHOUSE") @ApiParam(value = "库存地") - public String erpWarehouse; + private String erpWarehouse; @Column(name = "PO_STATUS") @ApiParam(value = "PO状态", example = "1") - public Integer poStatus; + private Integer poStatus; @Column(name = "SHIP_TIME") @ApiParam(value = "发运时间") - public String shipTime; + private String shipTime; @Column(name = "PUBLISH_TIME") @ApiParam(value = "发布时间") - public String publishTime; + private String publishTime; @Column(name = "DELIVERY_TIME") @ApiParam(value = "交货时间") - public String deliveryTime; + private String deliveryTime; @Column(name = "REC_TIME") @ApiParam(value = "收货时间") - public String recTime; + private String recTime; @Column(name = "IS_SYN") @ApiParam(value = "是否收货", example = "2") - public Integer isSyn; + private Integer isSyn; @Column(name = "ORDER_TIME") @ApiParam(value = "订单时间") - public String orderTime; + private String orderTime; @Column(name = "REF_ORDER_NO") @ApiParam(value = "关联单号") - public String refOrderNo; + private String refOrderNo; @Column(name = "EXPECTED_TIME") @ApiParam(value = "预计到货时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - public String expectedTime; + private String expectedTime; @Column(name = "REF_NO") @ApiParam(value = "合同号") - public String refNo; + private String refNo; @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 开始时间") - public String expectedTimeStart; + private String expectedTimeStart; @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 结束时间") - public String expectedTimeEnd; + private String expectedTimeEnd; } 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 index 3842ad7..3c8883e 100644 --- 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 @@ -31,7 +31,7 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "ORDER_NO") @ApiParam("单据号") - public String orderNo; + private String orderNo; @ApiParam("供应商编号") @Column(name = "VENDOR_CODE") @@ -169,7 +169,7 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "CONFIRM_TIME") @ApiParam(value = "确认时间") - public String confirmTime; + private String confirmTime; @Column(name = "DELIVERY_TIME") @ApiParam(value = "交货时间") @@ -177,5 +177,5 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "REF_NO") @ApiParam(value = "合同号") - public String refNo; + private 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 index 0fb4abe..7b145f4 100644 --- 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 @@ -32,7 +32,7 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "ORDER_NO") @ApiParam("单据明细编号") - public String orderNo; + private String orderNo; @Column(name = "PART_NO") @ApiParam(value = "零件号") @@ -81,15 +81,15 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "CHECK_CODE") @ApiParam(value = "检验编号") - public String checkCode; + private String checkCode; @Column(name = "STOVE_NO") @ApiParam(value = "炉批号") - public String stoveNo; + private String stoveNo; @Column(name = "BATCH_NO") @ApiParam(value = "批次号") - public String batchNo; + private String batchNo; @ApiParam("是否同步") @Column(name = "IS_SYN") @@ -97,13 +97,13 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "REC_TIME") @ApiParam(value = "收货时间") - public String recTime; + private String recTime; @Column(name = "PACKAGE_NO") @ApiParam(value = "包装编号") - public String packageNo; + private String packageNo; @Transient @ApiParam(value = "是否可编辑（前端使用）") - public boolean isSet = false; + private boolean isSet = false; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java new file mode 100644 index 0000000..95ad16e --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 订单批量新增输入模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-20 13:13 + * @Modify: + **/ +@Data +public class SwebPOBatchInsertEnterModel extends BaseBean { + + @ApiParam("单据号") + private String orderNo; + + @ApiParam("供应商编号") + private String vendorCode; + + @ApiParam("供应商名称") + private String vendorName; + + @ApiParam(value = "订单类型", example = "10") + private Integer orderType; + + @ApiParam(value = "库存地") + private String erpWarehouse; + + @ApiParam(value = "合同号") + private String refNo; + + @ApiParam(value = "零件列表") + private List partItems; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java new file mode 100644 index 0000000..954bda9 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java @@ -0,0 +1,103 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.ColumnDefault; + +import java.io.Serializable; + +/** + * @Description : 订单批量新增零件输入模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-20 13:13 + * @Modify: + **/ +@Data +public class SwebPOBatchInsertItemEnterModel implements Serializable { + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam("供应商编号") + private String vendorCode; + + @ApiParam("供应商名称") + private String vendorName; + + @ApiParam(value = "订单类型", example = "10") + private Integer orderType = 0; + + @ApiParam(value = "行项目状态", example = "1") + private Integer itemStatus; + + @ApiParam(value = "箱数", example = "0") + private Integer boxQty = 0; + + @ApiParam(value = "默认包装规格", example = "0") + private Double snpQty = 0d; + + @ApiParam(value = "打印数", example = "0") + private Double printQty = 0d; + + @ApiParam(value = "收货数量", example = "0") + private Double recQty = 0d; + + @ApiParam(value = "已收箱数", example = "0") + private Double recBoxQty = 0d; + + @ApiParam(value = "上传数量", example = "0") + private Double uploadQty = 0d; + + @ApiParam("库存地") + private String erpWarehouse; + + @ApiParam(value = "订单数量", example = "0") + private Double refQty = 0d; + + @ColumnDefault("0") + @ApiParam(value = "需求数", example = "0") + private Double orderQty = 0d; + + @ApiParam(value = "发运数量", example = "0") + private Double shipQty = 0d; + + @ApiParam(value = "打印时间") + private String printTime; + + @ApiParam("打印用户code") + private String printUserCode; + + @ApiParam("是否为钢卷料") + private Integer isSteel; + + @ApiParam(value = "预计到货日期") + private String expectedTime; + + @ApiParam("备注") + private String remark; + + @ApiParam(value = "入库数量", example = "0") + private Double instockQty = 0d; + + @ApiParam(value = "入库箱数", example = "0") + private Double instockBoxQty = 0d; + + @ApiParam(value = "不良数", example = "0") + private Double ncQty = 0d; + + @ApiParam(value = "不良箱数", example = "0") + private Double ncBoxQty = 0d; + + @ApiParam(value = "行号", example = "0") + private Integer itemNo; + + @ApiParam(value = "确认时间") + private String confirmTime; + + @ApiParam(value = "交货时间") + private String deliveryTime; +} From cd1c135594cee28bb33f65bb5799a908f24a26d3 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sun, 21 Apr 2019 19:22:34 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6isPart!=3DisSnControl=EF=BC=88=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9E=9A=E4=B8=BE=E5=8F=96=E5=8F=8D=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=89+=E5=BA=93=E4=BD=8D=E6=96=B0=E5=A2=9E=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=8A=B6=E6=80=81=E4=B8=BA=E2=80=9C=E7=A9=BA=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++++ 1 file changed, 5 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 6a618b3..dd4ba2e 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 @@ -1810,6 +1810,11 @@ public class WmsEnumUtil { } return tmp; } + + //取反 + public static int getInvertValue(int val) { + return val == 1 ? 2 : 1; + } } /** From 3a704f8542fe4c7419ba4748b6b1a5c4b0dd74fc Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Sun, 21 Apr 2019 19:25:18 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 6f59cbe..373f34e 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 @@ -61,9 +61,12 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD") @ApiParam(value ="主对象元素属性名称") - @JsonSerialize(using = ToStringSerializer.class) private String priElementPropertyNameRdd; + @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD") + @ApiParam(value ="主对象元素属性code") + private String priElementPropertyCodeRdd; + // 枚举:BlockFormEnumUtil.TRIGGER_EVENT @Column(name="PRI_ELEMENT_EVENT") @ApiParam(value ="主对象元素事件") @@ -100,4 +103,8 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD") @ApiParam(value ="关联对象元素属性名称") private String secElementPropertyNameRdd; + + @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD") + @ApiParam(value ="关联对象元素属性Code") + private String secElementPropertyCodeRdd; } From 97e992f05fbe3942a6fdbf678191df786ae89ea0 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sun, 21 Apr 2019 19:58:51 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=8B=A6=E6=88=AA=E5=99=A8=E5=BC=80=E5=8F=911.1?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=20=20=20=20=20=20=20=20=20=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/dynamic/DynamicEntity.java | 65 +++++++++++++++------- .../pojo/base/enumutil/BlockFormEnumUtil.java | 1 + .../i3plus/pojo/form/bean/BfElementProperty.java | 7 +-- .../estsh/i3plus/pojo/form/bean/BfElementTree.java | 4 ++ .../cn/estsh/i3plus/pojo/model/form/FormModel.java | 7 +-- 5 files changed, 56 insertions(+), 28 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 99771c9..5665951 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -1,9 +1,11 @@ package cn.estsh.i3plus.pojo.base.dynamic; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -28,6 +30,8 @@ public class DynamicEntity extends BaseBean implements Serializable { public String tableName; public List propertyList; + @ApiParam(value ="子集列表") + private List childList = new ArrayList<>(); public DynamicEntity(){ try { @@ -42,13 +46,6 @@ public class DynamicEntity extends BaseBean implements Serializable { this.tableName = tableName; } - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } /** * 初始化属性，以便动态加载 @@ -60,8 +57,7 @@ public class DynamicEntity extends BaseBean implements Serializable { Field[] fields = this.getClass().getDeclaredFields(); for(Field f : fields) { String propName = f.getName().replace(ATTR_PREFIX, ""); - if(!"LOGGER".equals(propName) && !"ATTR_PREFIX".equals(propName) - && !"propertyList".equals(propName) && !"dynProperty".equals(propName) ) { + if (!isDefaultField(propName)) { // 添加到属性list中 this.getPropertyList().add(propName); // 属性初始化 @@ -77,8 +73,7 @@ public class DynamicEntity extends BaseBean implements Serializable { Field[] fields = this.getClass().getDeclaredFields(); for(Field f : fields) { String fieldName = f.getName().replace(ATTR_PREFIX, ""); - if (!"LOGGER".equals(fieldName) && !"ATTR_PREFIX".equals(fieldName) - && !"propertyList".equals(fieldName) && !"dynProperty".equals(fieldName)) { + if (!isDefaultField(fieldName)) { result += "\"" + fieldName + "\":\"" + getDynProperty(fieldName) + "\","; } @@ -92,7 +87,6 @@ public class DynamicEntity extends BaseBean implements Serializable { return result; } - public void setDynProperty(Map params) { if (params != null && params.size() > 0){ params.forEach((k,v)->{{ @@ -140,14 +134,6 @@ public class DynamicEntity extends BaseBean implements Serializable { return getValue(propName,result); } - public List getPropertyList() { - return propertyList; - } - - public void setPropertyList(List propertyList) { - this.propertyList = propertyList; - } - /** * 获取默认值 * @param propName @@ -188,4 +174,43 @@ public class DynamicEntity extends BaseBean implements Serializable { return val; } + /** + * 是否是本类属性 + * @param fieldName + * @return + */ + public boolean isDefaultField(String fieldName){ + if (!ATTR_PREFIX.equals(fieldName)) { + if("propertyList".equals(fieldName) || "dynProperty".equals(fieldName) || "childList".equals(fieldName) + || "LOGGER".equals(fieldName)){ + return true; + } + } + return false; + } + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public List getPropertyList() { + return propertyList; + } + + public void setPropertyList(List propertyList) { + this.propertyList = propertyList; + } + + public List getChildList() { + return childList; + } + + public void setChildList(List childList) { + this.childList = childList; + } } 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 1b302cd..895a4a9 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 @@ -832,6 +832,7 @@ public class BlockFormEnumUtil { PASSWORD(230, "PASSWORD", "密码"), DATE(300, "DATE", "日期(yyyy-MM-dd)"), DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), +// ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), CASCADE(900, "CASCADE", "级联"); //FILE(400, "file", "文件"), 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 3a2b46f..f4a6151 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 @@ -115,10 +115,9 @@ public class BfElementProperty extends BaseBean { @ApiParam(value = "控件显示格式") private String propertyControlFormat; - @Column(name = "PROPERTY_CONTROL_REF_ID") - @ApiParam(value = "控件引用RefId") - @JsonSerialize(using = ToStringSerializer.class) - private Long propertyControlRefId; + @Column(name = "PROPERTY_CONTROL_REF_KEY") + @ApiParam(value = "控件引用RefKey") + private String propertyControlRefKey; @Column(name = "PROPERTY_DESCRIPTION") @ApiParam(value = "属性描述") 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 8883376..aefdef9 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 @@ -52,6 +52,10 @@ public class BfElementTree extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long treeAttrValueId; + @Column(name="TREE_IS_OPEN_ALL") + @ApiParam(value ="是否全部展开") + private Integer treeIsOpenAll; + @Column(name="TREE_DEFAULT_DIRECTION") @ApiParam(value ="树默认方向") private Integer treeDefaultDirection; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java index 08b4fd5..e8cc46b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.form.bean.BfButton; -import cn.estsh.i3plus.pojo.form.bean.BfLayout; -import cn.estsh.i3plus.pojo.form.bean.BfMethod; -import cn.estsh.i3plus.pojo.form.bean.BfMethodDetail; +import cn.estsh.i3plus.pojo.form.bean.*; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -54,4 +51,6 @@ public class FormModel { @ApiParam(value = "元素Model") private List elementModelList; + @ApiParam(value = "表单功能明细关联属性") + private List methodDetailPropertyRefList; } From 3cbc5c4d99fc53a627947bae403c6c69bd2da7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 22 Apr 2019 10:20:02 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsLotQCTransModel.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java new file mode 100644 index 0000000..e6a8165 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 散件质检明细处理model + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-04-22 9:43 + * @Modify: + **/ +@Data +public class WmsLotQCTransModel implements Serializable { + private String orderNo; + private List wmsStockSnList; +}