From 77a8cdebd5039102ac605b45d9f593b5c5c9b3fa Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 30 Sep 2019 18:14:33 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index e955336..d90de3f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -267,7 +267,7 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){ DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); @@ -462,6 +462,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result); DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result); + DdlPreparedPack.getStringEqualPack(responseCfg.getOrganizeCode(), "organizeCode", result); getStringBuilderPack(responseCfg, result); From cecd37a1e79bccd7a2d17de20511b5ac88d8b0a5 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 8 Oct 2019 16:53:17 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Xml=20=E5=B7=A5?= =?UTF-8?q?=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 19 ++++++++++- .../pojo/model/softswitch/SuitParamModel.java | 37 ++++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 4 +++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 1a64e2d..7f1caa6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -477,7 +477,9 @@ public class BlockSoftSwitchEnumUtil { STRING(20,"字符串"), BOOLEAN(30,"布尔"), MAP(40,"字典"), - LIST(50,"列表"); + LIST(50,"列表"), + JAVA_OBJECT(60,"Java Object"), + JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object"); private int value; private String description; @@ -504,6 +506,21 @@ public class BlockSoftSwitchEnumUtil { } return tmp; } + + public static PARAM_VALUE_TYPE valueOfValueStr(String value){ + PARAM_VALUE_TYPE result = PARAM_VALUE_TYPE.STRING; + try { + if(StringUtils.isNotBlank(value)){ + for (int i = 0; i < values().length; i++) { + if (values()[i].value == Integer.parseInt(value)) { + return values()[i]; + } + } + } + }catch (Exception e){ + } + return result; + } } /** diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java new file mode 100644 index 0000000..19b19eb --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/10/8 下午1:18 + * @Modify: + **/ +@Data +public class SuitParamModel { + + /* 标签名称 */ + private String tagName; + /* 标签 id 属性值 */ + private String id; + /* 标签 name 属性值 */ + private String name; + /* 标签唯一标识 */ + private String pathKey; + /* 标签内容 */ + private String value; + /* 标签类型 Default:PARAM_VALUE_TYPE.STRING */ + private Integer type; // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE + + /* 标签属性 */ + private Map attr; + /* 父节点 */ + private SuitParamModel parent; + /* 标签子集 */ + private List childList; +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index b22545b..c24db02 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -215,6 +215,10 @@ public class BsSuitCase extends BaseBean { private BsSslKey bsSslKey; @Transient + @ApiParam(value = "适配器套件明细") + private String paramXml; + + @Transient @ApiParam(value = "适配器参数") private List bsSuitCaseParamList; From 2b62357ab57443969b26654a28903d6525dd7a2b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 8 Oct 2019 17:40:15 +0800 Subject: [PATCH 03/10] =?UTF-8?q?VDA=E6=94=B6=E8=B4=A7=E3=80=90=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=BF=AB=E9=80=9F=E5=85=A5=E5=BA=93=E3=80=91=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B71051?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 13 ++++++-- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 +++ .../pojo/wms/engine/rule/GenerateSnRule.java | 5 +++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 36 +++++++++++++++++----- 4 files changed, 48 insertions(+), 10 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 e01b83b..9e9f331 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 @@ -3579,6 +3579,15 @@ public class WmsEnumUtil { } return tmp; } + + public static PART_ASSOCIATE_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } } /** @@ -3635,8 +3644,8 @@ public class WmsEnumUtil { return tmp; } } - - + + /** * 物流规则 处理模式 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index fa09e20..82bfeeb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -162,6 +162,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("类型名称") public String busiTypeName; + @Transient + @ApiParam("物料编号") + public String partNo; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java index 6432f58..5ed6569 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java @@ -42,4 +42,9 @@ public class GenerateSnRule { * 库位来源 */ private Integer locateSource; + + /** + * 是否允许生成二维码 + */ + private Integer isSn2d; } 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 b6cafeb..88dc044 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 @@ -2376,9 +2376,9 @@ public class WmsHqlPack { return result; } - - - + + + /** * 业务：库存查询封装 * @@ -2388,24 +2388,44 @@ public class WmsHqlPack { public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); - + getStringBuilderPack(wmsRouting, result); return result; } - + public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result); // DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); - + getStringBuilderPack(wmsRoutingRule, result); return result; } + + /** + * 物料关系查询条件封装 + * + * @param wmsPartRelation + * @return + */ + public static DdlPackBean packHqlWmsPartRelation(WmsPartRelation wmsPartRelation) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringRightLikerPack(wmsPartRelation.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsPartRelation.getPartName(), "partName", result); + DdlPreparedPack.getStringLikerPack(wmsPartRelation.getAssociateCode(), "associateCoded", result); + DdlPreparedPack.getStringLikerPack(wmsPartRelation.getAssociateNameAdd(), "associateNameAdd", result); + DdlPreparedPack.getNumEqualPack(wmsPartRelation.getAssociateType(), "associateType", result); + + getStringBuilderPack(wmsPartRelation, result); + + return result; + } } From 7ee11674abb515ac7103c981dccefaddd5c82d70 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 8 Oct 2019 21:13:05 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=89=98=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 11 ++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 60 +++++++++++----------- 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 13a75d7..c73775b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1243,11 +1243,12 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - PERSON(10, "person", "人"), - EQUIPMENT(20, "equipment", "机"), - MATERIAL(30, "material", "料"), - ROUTE(40, "route", "法"), - ONLINE_SIGNAL(50, "onlineSignal", "开线信号"); + PERSON(10, "person", "人员"), + EQUIPMENT(20, "equipment", "设备"), + MATERIAL(30, "material", "物料"), + ROUTE(40, "route", "工艺"), + ONLINE_SIGNAL(50, "onlineSignal", "开线信号"), + MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号"); private int value; private String code; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index c40458a..609c60e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -403,11 +403,13 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - PERSON(10, "people", "人"), + PERSON(10, "people", "人员"), EQUIPMENT(20, "equipments", "设备"), MATERIAL(30, "materials", "物料"), ROUTE(40, "routes", "工艺"), - ONLINE_SIGNAL(50, "onlineSignal", "开线信号"); + ONLINE_SIGNAL(50, "onlineSignal", "开线信号"), + MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号"); + private int value; private String code; @@ -620,10 +622,10 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_TYPE { - SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), - SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), - SOURCE_ORACLE(30, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), - SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); + SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), + SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"), + SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null), + SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"); private int value; private String code; @@ -632,7 +634,7 @@ public class MesPcnEnumUtil { private int defaultPort; private String defaultSchemaPattern; - private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) { + private DATA_SOURCE_TYPE(int value, String code, String description, String driverClassName, int port, String defaultSchemaPattern) { this.value = value; this.code = code; this.description = description; @@ -715,47 +717,47 @@ public class MesPcnEnumUtil { return tmp; } - public String getJDBCUrl(String database,String host,Integer port){ - if(this.getValue() == SOURCE_MARIA_DB.getValue()){ - return getJDBCUrlMySQL(database,host,port); - }else if(this.getValue() == SOURCE_ORACLE.getValue()){ - return getJDBCUrlOracle(database,host,port); - }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ - return getJDBCUrlPostgreSQL(database,host,port); - }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ - return getJDBCUrlSQLServer(database,host,port); + public String getJDBCUrl(String database, String host, Integer port) { + if (this.getValue() == SOURCE_MARIA_DB.getValue()) { + return getJDBCUrlMySQL(database, host, port); + } else if (this.getValue() == SOURCE_ORACLE.getValue()) { + return getJDBCUrlOracle(database, host, port); + } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) { + return getJDBCUrlPostgreSQL(database, host, port); + } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) { + return getJDBCUrlSQLServer(database, host, port); } return null; } - public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ - if(StringUtils.isNotBlank(databaseProductName)){ - if(databaseProductName.indexOf(":mysql:") != -1){ + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName) { + if (StringUtils.isNotBlank(databaseProductName)) { + if (databaseProductName.indexOf(":mysql:") != -1) { return SOURCE_MARIA_DB; - }else if(databaseProductName.indexOf(":oracle:") != -1){ + } else if (databaseProductName.indexOf(":oracle:") != -1) { return SOURCE_ORACLE; - }else if(databaseProductName.indexOf(":postgresql:") != -1){ + } else if (databaseProductName.indexOf(":postgresql:") != -1) { return SOURCE_POSTGRE_SQL; - }else if(databaseProductName.indexOf(":sqlserver:") != -1){ + } else if (databaseProductName.indexOf(":sqlserver:") != -1) { return SOURCE_SQL_SERVER; } } return null; } - private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + private String getJDBCUrlMySQL(String database, String host, Integer port) { + return "jdbc:mysql://" + host + ":" + port + "/" + database + "?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; } - private String getJDBCUrlOracle(String database,String host,Integer port){ - return "jdbc:oracle:thin:@"+host+":"+port+":"+database; + private String getJDBCUrlOracle(String database, String host, Integer port) { + return "jdbc:oracle:thin:@" + host + ":" + port + ":" + database; } - private String getJDBCUrlPostgreSQL(String database,String host,Integer port){ - return "jdbc:postgresql://"+host+":"+port+"/"+database; + private String getJDBCUrlPostgreSQL(String database, String host, Integer port) { + return "jdbc:postgresql://" + host + ":" + port + "/" + database; } - private String getJDBCUrlSQLServer(String database,String host,Integer port){ + private String getJDBCUrlSQLServer(String database, String host, Integer port) { return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database; } } From 653c8dca1f96f19fb3cc9d5b339bb92072034c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 8 Oct 2019 21:42:12 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=9B=B4=E9=80=81=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=89=A3=E5=87=8FJOB=E8=BF=87=E6=BB=A4=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E7=BA=BF=E8=BE=B9=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E6=9D=A1=E7=A0=81=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +------- 1 file changed, 1 insertion(+), 7 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 b6cafeb..9789500 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 @@ -1533,19 +1533,13 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getNumNOEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); result.setOrderByStr(wmsStockSn.orderBy()); - if(wmsStockSn.getPrinted()!= null){ - if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){ - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result); - } - } - getStringBuilderPack(wmsStockSn, result); return result; } From f682d056be1c7ed47819fb1a3997a3ba23c5ddc5 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Wed, 9 Oct 2019 09:15:24 +0800 Subject: [PATCH 06/10] =?UTF-8?q?[=E7=89=A9=E6=B5=81=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86]=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 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 88dc044..37bce07 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 @@ -2379,7 +2379,7 @@ public class WmsHqlPack { - /** + /** * 业务：库存查询封装 * * @param wmsStockQuan @@ -2388,22 +2388,25 @@ public class WmsHqlPack { public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); - + // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); + DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRouting, result); return result; } - + public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result); -// DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); - + DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getRoutingCode(), "routingCode", result); + + DdlPreparedPack.getInPack(wmsRoutingRule.getIsValid(), "isValid", result); + DdlPreparedPack.getInPack(wmsRoutingRule.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRoutingRule, result); return result; From 0fa1ffa23b009535522db781bc3e80169797353b Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Wed, 9 Oct 2019 09:17:54 +0800 Subject: [PATCH 07/10] =?UTF-8?q?[=E7=89=A9=E6=B5=81=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java index 0b9f58c..af87b92 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java @@ -53,10 +53,18 @@ public class WmsRouting extends BaseBean { @Column(name = "FOR_PRODUCT") @ApiParam(value = "适用产品") + + private Integer forProduct; - + @Transient + @ApiParam(value = "补货规则列表") + List replenishList; + @Transient + @ApiParam(value = "推动规则列表补") + List promotionList; - public WmsRouting(){} + public WmsRouting() { + } } From 4ac7bae38bc3530ea1e43697847935de0467a40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 9 Oct 2019 09:18:05 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=96=B0=E5=A2=9Ehql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 b6cafeb..6dc696d 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 @@ -2408,4 +2408,21 @@ public class WmsHqlPack { return result; } + + /** + * 接口映射分页查询条件 + * + * @param wmsPrinterConfigure + * @return + */ + public static DdlPackBean packHqlWmsPrinterConfigure(WmsPrinterConfigure wmsPrinterConfigure) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPrinterConfigure.getIp(), "ip", result); + DdlPreparedPack.getStringLikerPack(wmsPrinterConfigure.getPrinterNo(), "printerNo", result); + + getStringBuilderPack(wmsPrinterConfigure, result); + + return result; + } } From 4eada1c3430971e9f4e701225b2751e325820510 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 9 Oct 2019 10:53:37 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=A1=A8=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index ee94479..069b395 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -55,6 +55,10 @@ public class MesEquipment extends BaseBean { @ApiParam("区域代码") private String areaCode; + @Column(name="CONNECT_TYPE") + @ApiParam("连接类型") + private Integer connectType; + @Transient @ApiParam(value ="名称") private String name; From 95f156adf4a9420396d0f2e9254c16a04a65ab24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 9 Oct 2019 11:00:30 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=89=80=E6=9C=89double=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=B1=9E=E6=80=A7=E9=83=BD=E8=A6=81=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E7=B2=BE=E5=BA=A6=E6=B3=A8=E8=A7=A3=EF=BC=8C=E5=90=A6?= =?UTF-8?q?=E5=88=99=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E7=B1=BB=E5=9E=8B=E4=B8=BAdouble?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 2 +- .../i3plus/pojo/wms/bean/AmpStockCurrent.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 4 +- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 4 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 4 +- .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- .../i3plus/pojo/wms/bean/WmsCheckFactRecord.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 4 +- .../pojo/wms/bean/WmsDocMovementDetails.java | 12 ++-- .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsFGInStock.java | 2 +- .../i3plus/pojo/wms/bean/WmsLineLocatePart.java | 6 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 77 +++++++++++----------- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 6 +- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 12 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 10 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 8 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 2 +- .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java | 2 +- .../i3plus/pojo/wms/bean/WmsStockInitialize.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 18 ++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 18 ++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 2 +- .../wms/bean/snapshot/WmsMoveDetailsSnapshot.java | 4 +- .../pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java | 6 +- .../wms/bean/snapshot/WmsStockQuanSnapshot.java | 18 ++--- .../pojo/wms/bean/snapshot/WmsStockSnSnapshot.java | 2 +- 40 files changed, 143 insertions(+), 142 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index b236374..9efc5aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -42,7 +42,7 @@ public class AmpJisRec extends BaseBean{ @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java index fd7a488..f5fde23 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java @@ -42,7 +42,7 @@ public class AmpStockCurrent extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index 612276b..250b6a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -46,7 +46,7 @@ public class SapDocFgSum extends BaseBean { @ApiParam("单位") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -75,7 +75,7 @@ public class SapDocFgSum extends BaseBean { @ApiParam("子计量单位") public String itemUnit; - @Column(name="ITEM_QTY") + @Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子用量", example = "0") public Double itemQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 85dc1d4..0666d27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -45,7 +45,7 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -112,7 +112,7 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam("供应商批次") public String vendorLotNo; - @Column(name = "REC_QTY") + @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已收数量", example = "0") public Double recQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index cd708d3..dfdad1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -43,7 +43,7 @@ public class WmsBom extends BaseBean { @ApiParam(value = "计量单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量") private Double qty; @@ -59,7 +59,7 @@ public class WmsBom extends BaseBean { @ApiParam(value = "子计量单位") private String itemUnit; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "子用量") private Double itemQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index 6ecb5c0..263cc0e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -40,7 +40,7 @@ public class WmsBomTotal extends BaseBean { @ApiParam("计量单位") private String UNIT; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam("数量") private Double qty; @@ -56,7 +56,7 @@ public class WmsBomTotal extends BaseBean { @ApiParam(value = "子计量单位") private String itemUnit; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "子用量") private Double itemQty; 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 421410e..9722217 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 @@ -61,7 +61,7 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("条码") public String sn; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "库存数量", example = "0") public Double qty; @@ -70,7 +70,7 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("单位") public String unit; - @Column(name="FACT_QTY") + @Column(name="FACT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "实盘数量", example = "0") public Double factQty; 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 d101b27..6461ae8 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 @@ -44,7 +44,7 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index d4a9c99..f39695e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -66,11 +66,11 @@ public class WmsCheckFactRecord extends BaseBean { @ApiParam("备注") public String remark; - @Column(name="PLAN_QTY") + @Column(name="PLAN_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "应收数量", example = "0") public Double planQty; - @Column(name="CHECK_QTY") + @Column(name="CHECK_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "抽点数量", example = "0") public Double checkQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index f2c20af..79c7f34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -66,7 +66,7 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam("BOM切换标识") public String bomUpdate; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -91,7 +91,7 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam("子计量单位") public String itemUnit; - @Column(name="ITEM_QTY") + @Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子用量", example = "0") public Double itemQty; 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 eb39fc2..7dc5ac8 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 @@ -46,7 +46,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -83,7 +83,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("目标库位代码") public String destLocateNo; - @Column(name = "PRINT_QTY") + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "1") private Double printQty; @@ -119,22 +119,22 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "操作原因") private String remark; - @Column(name = "PICK_QTY") + @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已拣货数量", example = "1") private Double pickQty; - @Column(name = "OUT_QTY") + @Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已出库数量", example = "1") private Double outQty; - @Column(name = "REC_QTY") + @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已收货数量", example = "1") private Double recQty; - @Column(name = "MOVE_QTY") + @Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已移库数量", example = "1") private Double moveQty; 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 e6ba0ab..d546d76 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 @@ -52,7 +52,7 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 301b0ad..89184cf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -46,7 +46,7 @@ public class WmsFGInStock extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java index 8db0703..afc6da3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java @@ -59,15 +59,15 @@ public class WmsLineLocatePart extends BaseBean { return isGeneratePicklist== null ? 0: this.isGeneratePicklist.intValue(); } - @Column(name = "PULL_QTY") + @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "拉动数量") private Double pullQty; - @Column(name = "Max") + @Column(name = "Max", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大值") private Double max; - @Column(name = "Min") + @Column(name = "Min", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值") private Double min; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index fad9c66..a7f54ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -77,7 +77,7 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "最大包装数量", example = "-1") private Integer maxPackageQty; - @Column(name = "MAX_PART_QTY") + @Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大零件数量", example = "-1") private Double maxPartQty; @@ -93,7 +93,7 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "箱数", example = "-1") private Integer boxQty; - @Column(name = "PART_QTY") + @Column(name = "PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "零件数", example = "-1") private Double partQty; 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 7c10ba8..442a5c4 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 @@ -42,15 +42,15 @@ public class WmsLocatePart extends BaseBean { @ApiParam(value = "物料名称") private String partNameRdd; - @Column(name = "PULL_QTY") + @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "拉动数量", example = "0") private Double pullQty; - @Column(name = "MAX") + @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大值", example = "0") private Double max; - @Column(name = "MIN") + @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值", example = "0") private Double min; 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 21a3c0b..0cd2e2f 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 @@ -24,7 +24,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_DETAILS", indexes = { +@Table(name = "WMS_MOVE_DETAILS", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @Index(columnList = "ORGANIZE_CODE") @@ -33,94 +33,94 @@ import javax.persistence.*; public class WmsMoveDetails extends BaseBean { private static final long serialVersionUID = -5898637337319011710L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; - @Column(name="ITEM") + @Column(name = "ITEM") @ApiParam(value = "行号", example = "0") public Integer item; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") public String vendorNo; - @Column(name="CUST_NO") + @Column(name = "CUST_NO") @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY") + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "处理数量", example = "0") public Double transQty; - public Double getTransQty(){ + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } - @Column(name="REJECT_QTY") + @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; - public Double getRejectQty(){ + public Double getRejectQty() { return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); } - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") public String unit; - @Column(name="SRC_WH_NO") + @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") public String srcWhNo; - @Column(name="SRC_ZONE_NO") + @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") public String srcZoneNo; - @Column(name="SRC_LOCATE_NO") + @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") public String srcLocateNo; - @Column(name="DEST_WH_NO") + @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") public String destWhNo; - @Column(name="DEST_ZONE_NO") + @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") public String destZoneNo; - @Column(name="DEST_LOCATE_NO") + @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") public String destLocateNo; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; - @Column(name="REF_ITEM") + @Column(name = "REF_ITEM") @ApiParam("关联单据行号") public String refItem; /** * ASN,PO,SO */ - @Column(name="REF_TYPE") + @Column(name = "REF_TYPE") @ApiParam("关联单据类型") public String refType; - @Column(name="REF_SRC") + @Column(name = "REF_SRC") @ApiParam("关联单号") public String refSrc; @@ -150,7 +150,7 @@ public class WmsMoveDetails extends BaseBean { @Transient @ApiParam("业务类型编码") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @Transient @@ -176,7 +176,7 @@ public class WmsMoveDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; + public Integer lockVersion; @Transient @ApiParam(value = "快照时间") @@ -200,20 +200,21 @@ public class WmsMoveDetails extends BaseBean { return fPartName; }*/ - public WmsMoveDetails(){} + public WmsMoveDetails() { + } - public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ + public WmsMoveDetails(String partNo, Long waitingCounts, Long finishedCounts) { this.partNo = partNo; this.waitingCounts = waitingCounts; this.finishedCounts = finishedCounts; } - public WmsMoveDetails(String partNo, double transQty){ + public WmsMoveDetails(String partNo, double transQty) { this.partNo = partNo; this.transQty = transQty; } - public WmsMoveDetails(String orderNo){ + public WmsMoveDetails(String orderNo) { this.orderNo = orderNo; } @@ -225,8 +226,8 @@ public class WmsMoveDetails extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } - public WmsMoveDetails (String organizeCode,String partNo,String partNameRdd,String workCenterCode,String fPartNo,String fPartName,String unit,Double qty, - String createDateTime,String sn,String srcZoneNo){ + public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty, + String createDateTime, String sn, String srcZoneNo) { this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -241,11 +242,11 @@ public class WmsMoveDetails extends BaseBean { } - public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode - ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo, - String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo, - Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode, - String createUser,String createDatetime,String modifyUser,String modifyDatetime){ + public WmsMoveDetails(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, String transTypeCode + , String transTypeName, Integer itemStatus, String unit, String srcWhNo, String destWhNo, + String srcZoneNo, String destZoneNo, String srcLocateNo, String destLocateNo, + Double transQty, Double rejectQty, String refSrc, String vendorNo, String custNo, Integer busiTypeCode, + String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.organizeCode = organizeCode; this.partNo = partNo; this.orderNo = orderNo; @@ -269,7 +270,7 @@ public class WmsMoveDetails extends BaseBean { this.busiTypeCode = busiTypeCode; this.createUser = createUser; this.createDatetime = createDatetime; - this.modifyDatetime =modifyDatetime; - this.modifyUser =modifyUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index d743cbe..4ea1543 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -83,7 +83,7 @@ public class WmsMoveSn extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name = "SRC_QTY") + @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; @@ -120,12 +120,12 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; - @Column(name = "DEST_QTY") + @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index a46cbea..66fbc2b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -84,11 +84,11 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY") + @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "处理数量", example = "0") public Double transQty; - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; @@ -142,7 +142,7 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单位") public String refUnit; - @Column(name="REF_QTY") + @Column(name="REF_QTY", columnDefinition = "decimal(18,8)") @ApiParam("关联数量") public Double refQty; 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 f84a315..3f3e2b6 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 @@ -50,7 +50,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("行号") private Integer item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") private Double qty; @@ -67,28 +67,28 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("订单号") private String orderNo; - @Column(name = "PRINT_QTY") + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "0") private Double printQty; //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; } - @Column(name = "RC_QTY") + @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") private Double rcQty; //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; } - @Column(name = "PASS_QTY") + @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检合格数量", example = "0") private Double passQty; //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; } - @Column(name = "NG_QTY") + @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检不合格数量", example = "0") private Double ngQty; @@ -114,7 +114,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("状态") private Integer itemStatus; - @Column(name = "SNP") + @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam("标准包装") private Double snp; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java index bf51127..22dc007 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -41,11 +41,11 @@ public class WmsPackSn extends BaseBean { @ApiParam(value = "物料名称") private String partNameAdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam("数量") private Double qty; - @Column(name = "SID") + @Column(name = "SID", columnDefinition = "decimal(18,8)") @ApiParam("SID") private Double sId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index c63c5fc..8af7dae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -74,7 +74,7 @@ public class WmsPart extends BaseBean { @ApiParam(value = "采购单位") private String buyUnit; - @Column(name = "BU2SU") + @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") private Double bu2su; @@ -82,11 +82,11 @@ public class WmsPart extends BaseBean { @ApiParam(value = "计价单位") private String priceUnit; - @Column(name = "PU2SU") + @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") private Double pu2su; - @Column(name = "SNP") + @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标准包装", example = "1") private Double snp; @@ -95,11 +95,11 @@ public class WmsPart extends BaseBean { @ApiParam(value = "是否免检", example = "1") private Integer iqc; - @Column(name = "MIN") + @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") private Double min; - @Column(name = "MAX") + @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") private Double max; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 53a91f8..4aaec5c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -51,7 +51,7 @@ public class WmsPoSn extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -84,7 +84,7 @@ public class WmsPoSn extends BaseBean { @ApiParam("组条码") public String groupNo; - @Column(name="REC_QTY") + @Column(name="REC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") public Double recQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index d58d624..d0275ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -42,7 +42,7 @@ public class WmsQCDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -67,17 +67,17 @@ public class WmsQCDetails extends BaseBean { public String remark; - @Column(name = "FACT_QTY") + @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "实检数量", example = "0") public Double factQty; - @Column(name = "PASS_QTY") + @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "合格数量", example = "0") public Double passQty; - @Column(name = "REJECT_QTY") + @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 27f4a5a..f740e9c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -44,7 +44,7 @@ public class WmsShipping extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 5639a23..8cd1f53 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -44,7 +44,7 @@ public class WmsSnOperateRecord extends BaseBean { @ApiParam(value = "库位代码") private String locateNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量", example = "0") private Double qty = 0d; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java index 5fa795e..d48a771 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java @@ -61,7 +61,7 @@ public class WmsSnPrintRcd extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java index a26d449..001b0a6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -60,12 +60,12 @@ public class WmsStockInitialize extends BaseBean { @AnnoOutputColumn private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "可用数量", example = "0") @AnnoOutputColumn private Double qty = 0d; - @Column(name = "SNP") + @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标准包装", example = "1") @AnnoOutputColumn private Double snp; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index ffa452e..7ae45fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -79,47 +79,47 @@ public class WmsStockQuan extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; 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 37201b2..8ccbb2b 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 @@ -109,7 +109,7 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量", example = "0") private Double qty = 0d; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 0a7ff59..d19ee0c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -64,12 +64,12 @@ public class WmsTaskDetails extends BaseBean { @ApiParam(value = "供应商编号") private String vendorNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "1") private Double qty; - @Column(name = "TRANS_QTY") + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "处理数量", example = "1") private Double transQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 5812f39..674df38 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -58,7 +58,7 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="交易状态",example = "1") private Integer transStatus; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index a7d96c8..d5e6146 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -98,47 +98,47 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "错误信息") private String errorMessage; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 45d366a..1e47d2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -58,7 +58,7 @@ public class WmsTransRcd extends BaseBean{ @ApiParam(value ="交易状态",example = "1") private Integer transStatus; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index 7e066dd..447bdf9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -66,12 +66,12 @@ public class WmsTransSn extends BaseBean { @ApiParam("事务代码") public String transCode; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "交易数量", example = "0") public Double qty; - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格交易数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 30bc5e6..03e877d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -37,7 +37,7 @@ public class WmsUnitConvert extends BaseBean { @ApiParam(value = "目标单位") private String destUnitCode; - @Column(name = "UNIT_COEFFICIENT") + @Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率") private Double unitCoefficient; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java index 01b8aa1..40fdf34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java @@ -63,7 +63,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY") + @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "处理数量", example = "0") public Double transQty; @@ -71,7 +71,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean { return this.transQty == null ? 0 : this.transQty.doubleValue(); } - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index 6f781aa..453d372 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -89,7 +89,7 @@ public class WmsMoveSnSnapshot extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name = "SRC_QTY") + @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; @@ -126,12 +126,12 @@ public class WmsMoveSnSnapshot extends BaseBean { @Transient private Long finishedCounts; - @Column(name = "DEST_QTY") + @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index f7e6aac..7b9e473 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -87,47 +87,47 @@ public class WmsStockQuanSnapshot extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java index 436d126..b13c8f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -116,7 +116,7 @@ public class WmsStockSnSnapshot extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量", example = "0") private Double qty = 0d;