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); 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-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; } } 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-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; 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/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() { + } } 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..d4e7e0c 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,10 +2376,10 @@ public class WmsHqlPack { return result; } - - - - /** + + + + /** * 业务：库存查询封装 * * @param wmsStockQuan @@ -2391,7 +2391,8 @@ public class WmsHqlPack { 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; @@ -2402,10 +2403,49 @@ public class WmsHqlPack { 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; } + + /** + * 物料关系查询条件封装 + * + * @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; + } + + /** + * 接口映射分页查询条件 + * + * @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; + } }