From 7ddbc5f76ba486eb35cace46dd71b938dcf49601 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 19 Dec 2018 09:57:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E5=9C=A8=E6=AF=8F=E6=AC=A1=E8=B0=83=E7=94=A8=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E8=A6=81=E9=AA=8C=E8=AF=81=E5=BD=93=E5=89=8D?= =?UTF-8?q?redis=E4=B8=AD=E6=98=AF=E5=90=A6=E5=8C=85=E5=90=AB=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=89=80=E9=9C=80=E5=8F=82=E6=95=B0=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E6=BB=A1=E8=B6=B3=E5=88=99=E6=8A=9B=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; From dadd0a2f30dda212b00478bbd6c5af17a19a4d16 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 20 Dec 2018 14:03:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..32cf2c1 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; 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(); From 52afc18c1aad936b48987a98d0e84123fbc79292 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 20 Dec 2018 16:17:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 3 +++ 2 files changed, 8 insertions(+) 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/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 32cf2c1..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 @@ -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; From e329c69aa58a8b8d03ca137bab417db6108656ac Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 20 Dec 2018 16:59:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=AC=E7=94=A8=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 18 ++++++++++-------- .../pojo/wms/repository/WmsMoveDetailsRepository.java | 2 ++ 2 files changed, 12 insertions(+), 8 deletions(-) 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..2d9652a 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,19 @@ 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(); +// query.getSingleResult() + 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/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 :