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 4432ac7..90e61fe 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 @@ -390,7 +390,7 @@ public class WmsEnumUtil { public enum LOCATE_TYPE { COLLECT_LOCATE(10, "I", "收货库"), BASICS_LOCATE(20, "P", "基础库"), - maneuver_LOCATE(30, "R", "机动库"), + MANEUVER_LOCATE(30, "R", "机动库"), COMBINATION_LOCATE(40, "D", "组合库"), LINE_LOCATE(50, "L", "线边库"), NC_LOCATE(60, "N", "NC库"); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 21b6e96..6762066 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1027,17 +1027,18 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public double findSumByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { - StringBuffer sb = new StringBuffer("select sum(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); - appendQL(sb,paramName,paramValue); - sb.append(" group by :groupByName"); - + StringBuffer sb = new StringBuffer("select sum(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb, paramName, paramValue); + sb.append(" group by model." + groupByName); Query query = entityManager.createQuery(sb.toString()); - query.setParameter(":sumPropertyName", sumPropertyName); setParameter(query,paramName,paramValue); - query.setParameter(":groupByName", groupByName); - Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); - return sumResult == null ? 0.0 : sumResult.doubleValue(); + double sumResult = 0.0; + List objList = query.getResultList(); + if(objList.size() > 0){ + sumResult = Double.parseDouble(objList.iterator().next().toString()); + } + return sumResult; }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } @@ -1051,17 +1052,19 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public double findAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { - StringBuffer sb = new StringBuffer("select avg(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); + StringBuffer sb = new StringBuffer("select avg(model."+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb,paramName,paramValue); - sb.append(" group by :groupByName"); + sb.append(" group by model." + groupByName); Query query = entityManager.createQuery(sb.toString()); - query.setParameter(":sumPropertyName", sumPropertyName); setParameter(query,paramName,paramValue); - query.setParameter(":groupByName", groupByName); - Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); - return sumResult == null ? 0.0 : sumResult.doubleValue(); + double sumResult = 0.0; + List objList = query.getResultList(); + if(objList.size() > 0){ + sumResult = Double.parseDouble(objList.iterator().next().toString()); + } + return sumResult; }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } @@ -1075,17 +1078,19 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public double findMaxByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { - StringBuffer sb = new StringBuffer("select max(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); - appendQL(sb,paramName,paramValue); - sb.append(" group by :groupByName"); + StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb, paramName, paramValue); + sb.append(" group by model." + groupByName); Query query = entityManager.createQuery(sb.toString()); - query.setParameter(":sumPropertyName", sumPropertyName); setParameter(query,paramName,paramValue); - query.setParameter(":groupByName", groupByName); - Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); - return sumResult == null ? 0.0 : sumResult.doubleValue(); + double sumResult = 0.0; + List objList = query.getResultList(); + if(objList.size() > 0){ + sumResult = Double.parseDouble(objList.iterator().next().toString()); + } + return sumResult; }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } @@ -1099,17 +1104,19 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public double findMinByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { - StringBuffer sb = new StringBuffer("select min(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); - appendQL(sb,paramName,paramValue); - sb.append(" group by :groupByName"); + StringBuffer sb = new StringBuffer("select min(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb, paramName, paramValue); + sb.append(" group by model." + groupByName); Query query = entityManager.createQuery(sb.toString()); - query.setParameter(":sumPropertyName", sumPropertyName); setParameter(query,paramName,paramValue); - query.setParameter(":groupByName", groupByName); - Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); - return sumResult == null ? 0.0 : sumResult.doubleValue(); + double sumResult = 0.0; + List objList = query.getResultList(); + if(objList.size() > 0){ + sumResult = Double.parseDouble(objList.iterator().next().toString()); + } + return sumResult; }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 179e772..f41bf15 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -69,4 +69,9 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "作业步骤名称") private String asName; + @Transient + @ApiParam(value = "流程名称") + private String agName; + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index 04ab940..6a3b866 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -105,7 +105,8 @@ public class WmsActionLogDetails extends BaseBean { } - public WmsActionLogDetails(String createUser, Long id, Integer seq) { + public WmsActionLogDetails(Long amId,String createUser, Long id, Integer seq) { + this.asId = amId; this.createUser = createUser; this.id = id; this.seq = seq; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index d051693..1b61f26 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -30,7 +30,7 @@ public class WmsActionResponseBean { public Map barCode; @ApiParam("进度") - public String percent; + public String percent ="0"; @ApiParam("当前步骤") public Integer currentStep; @@ -71,6 +71,9 @@ public class WmsActionResponseBean { @ApiParam(value = "关键字段列名") public String keyColumn; + @ApiParam(value = "是否完成流程操作") + public Boolean isComplete = false; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; 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 7dea2dd..978d821 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 @@ -77,7 +77,7 @@ public class WmsMoveDetails extends BaseBean { public String srcLocateNo; @Column(name="DEST_WH_NO") - @ApiParam("目标库位代码") + @ApiParam("目标仓库代码") public String destWhNo; @Column(name="DEST_ZONE_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java index 0fbf62b..0a5abf6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import java.util.List; + /** * @Description : 库存移动单明细信息 * @Reference : 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 6cc048b..2760420 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 @@ -1066,7 +1066,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); - HqlPack.getNumEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); + HqlPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); getStringBuilderPack(wmsActionModuleParam, result); return result.toString();