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 b790007..98616cf 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 @@ -1168,6 +1168,7 @@ public class BlockFormEnumUtil { LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null); // DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null); @@ -1320,7 +1321,7 @@ public class BlockFormEnumUtil { public static PROPERTY_TYPE valueOfClassPath(String classPath) { PROPERTY_TYPE tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].classPath == classPath) { + if (values()[i].classPath.equals(classPath)) { tmp = values()[i]; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index c2ad1d4..9b72e6f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * @Description : 操作人对象，用于登陆，非持久化 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java index f2701b2..303f0cb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java @@ -24,4 +24,6 @@ public class IQ { public String ACTHMS=""; + public String WERKS=""; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java index 8f8f97c..89b7bb3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java @@ -24,4 +24,6 @@ public class OQ { public String ACTHMS=""; + public String WERKS=""; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java index 8a02ab0..de8bf6d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java @@ -17,18 +17,24 @@ import java.util.List; @Repository public interface IEngineScriptPersistenceRepository extends BaseRepository { /** - * 按照脚本编号查询脚本实体对象 + * 按照工厂代码和脚本编号查询脚本实体对象 + * @param organizeCode 工厂代码 * @param scriptNo 脚本编号 * @return 脚本实体对象 */ EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo); /** + * 按照脚本编号查询脚本实体对象 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByScriptNo(String scriptNo); + + /** * 查找所有的脚本语言类型 * @return 数据库中已经存在的脚本语言类型 */ @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType") List findGroupByLanguageType(); - - EngineScriptPersistence findByScriptNo(String scriptNo); } 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 fe35285..eb1ff7b 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 @@ -2229,5 +2229,43 @@ public class WmsHqlPack { /******************************************作业记录日志HQLPACK结束************************************************/ + /** + * 库存条码管理查询条件 + * + * @param wmsStockSn + * @return + */ + public static DdlPackBean packHqlWmsStockSnManageByPager(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + + // 物料编码支持多选 + DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + // 存储区 + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + // 库位不为空 + DdlPreparedPack.getStringNotNullPack( "locateNo", result); + DdlPreparedPack.getStringNoEqualPack("","locateNo", result); + // 排除创建及出库状态条码 + if(wmsStockSn.getSnStatus() != null){ + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + } + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); + + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result); + + //数量大于0 + DdlPreparedPack.getNumberBiggerPack(0,"qty",result); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + + getStringBuilderPack(wmsStockSn, result); + return result; + } }