From 0825229a78b7d846b36c83f2783bd58eb93b0fa6 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Wed, 3 Apr 2019 09:35:05 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) 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 2639206..d367a24 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 @@ -163,4 +163,8 @@ public class WmsDocMovementDetails extends BaseBean { public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); } + + public Double getPickQty() {return pickQty == null ? 0L : this.pickQty.doubleValue(); } + + public Double getActualQty() {return actualQty == null ? 0L : this.actualQty.doubleValue(); } } From 9c468e70d1bdc36e73d044c9dcdd1036b9374536 Mon Sep 17 00:00:00 2001 From: jiajack Date: Wed, 3 Apr 2019 13:46:01 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/repository/MesProcessRepository.java | 16 ++++++++++++++++ .../pojo/mes/repository/MesProdRouteCfgRepository.java | 16 ++++++++++++++++ .../mes/repository/MesProdRouteOptParamRepository.java | 16 ++++++++++++++++ .../mes/repository/MesRouteProcessCellRepository.java | 16 ++++++++++++++++ .../pojo/mes/repository/MesRouteProcessRepository.java | 16 ++++++++++++++++ .../mes/repository/MesRouteProcessStepRepository.java | 16 ++++++++++++++++ .../i3plus/pojo/mes/repository/MesRouteRepository.java | 16 ++++++++++++++++ .../pojo/mes/repository/MesStepParamRepository.java | 16 ++++++++++++++++ .../i3plus/pojo/mes/repository/MesStepRepository.java | 16 ++++++++++++++++ .../pojo/mes/repository/MesWorkCellRepository.java | 1 - .../pojo/mes/repository/MesWorkCenterRepository.java | 1 - 11 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java new file mode 100644 index 0000000..620b24c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java new file mode 100644 index 0000000..4c21991 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java new file mode 100644 index 0000000..51a8c39 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteOptParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java new file mode 100644 index 0000000..468d495 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java new file mode 100644 index 0000000..2f7b0aa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java new file mode 100644 index 0000000..4391f26 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java new file mode 100644 index 0000000..a7e0fc9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java new file mode 100644 index 0000000..c29cda0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStepParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java new file mode 100644 index 0000000..30726eb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java index 766cd08..8ea9b89 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesArea; import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; import org.springframework.stereotype.Repository; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java index 6fcdd97..bf89b2a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; import org.springframework.stereotype.Repository; From 59b086dc5d24fb244cbc5851486adb6a04ccea59 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 3 Apr 2019 13:46:51 +0800 Subject: [PATCH 03/18] =?UTF-8?q?BaseBean.findByHqlWhere:=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=AB=E5=90=8D=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF?= =?UTF-8?q?=20WmsHqlPack:=E4=BF=AE=E6=94=B9=E5=B0=81=E8=A3=85=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E4=BD=BF=E7=94=A8DdlHqlPack=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 52 ++++++++++++++++------ 2 files changed, 40 insertions(+), 14 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 86cae1c..c857b40 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 @@ -561,7 +561,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter(key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get("m_" + key)); } return query.getResultList(); 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 0f5f954..2640883 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 @@ -1,13 +1,16 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import java.util.List; @@ -27,12 +30,13 @@ public class WmsHqlPack { public static String packInParams(String colnumName, String[] params) { StringBuffer sb = new StringBuffer(); HqlPack.getInPackString(String.join(",", params), colnumName, sb); - HqlPack.getNumEqualPack( WmsEnumUtil.IS_PART.IS_ADJUST.getValue(),"snControl", sb); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_PART.IS_ADJUST.getValue(), "snControl", sb); return sb.toString(); } /** * 封装公用查询参数 + * * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 @@ -97,17 +101,20 @@ public class WmsHqlPack { * @param orderNos * @return */ - public static String packWmsOrderDetailsByOrderNos(String colName, List orderNos) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsOrderDetailsByOrderNos(String colName, List orderNos) { + DdlPackBean packBean = new DdlPackBean(); StringBuffer orderNoStr = new StringBuffer(); for (int i = 0; i < orderNos.size(); i++) { orderNoStr.append("'" + orderNos.get(i) + "',"); } orderNoStr.deleteCharAt(orderNoStr.length() - 1); - result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() + - " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + - " and model.orderNo in (" + orderNoStr + ")" + " order by model." + colName + ",model.orderNo"); - return result.toString(); + DdlPreparedPack.getInPack(orderNoStr.toString(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, + new String[]{colName, "orderNo"}, packBean); + return packBean; } /** @@ -163,8 +170,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", - WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart", result); + WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""), "poStatus", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); @@ -702,6 +709,7 @@ public class WmsHqlPack { /** * 根据条件查询打印机队列信息封装类 + * * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ @@ -724,6 +732,7 @@ public class WmsHqlPack { /** * 盘点库位 条件封装 + * * @param wmsCSLocate * @return */ @@ -740,6 +749,7 @@ public class WmsHqlPack { /** * 盘点物料 条件封装 + * * @param wmsCSPart * @return */ @@ -758,6 +768,7 @@ public class WmsHqlPack { /** * 盘点存储区 条件封装 + * * @param wmsCSZone * @return */ @@ -774,6 +785,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ @@ -800,6 +812,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsTempOrderLock 责任区分配信息 * @return 责任区分配信息 */ @@ -918,6 +931,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表唯一性查询 + * * @param wmsMoveMaster * @return */ @@ -935,6 +949,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表分页查询 + * * @param wmsMoveMaster * @return */ @@ -951,6 +966,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单明细表分页查询 + * * @param wmsMoveDetails * @return */ @@ -981,6 +997,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单条码信息分页查询 + * * @param wmsMoveSn * @return */ @@ -1033,8 +1050,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "", - WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart",result); + WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""), "orderStatus", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); //单号 HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsQCMaster, result); @@ -1225,6 +1242,7 @@ public class WmsHqlPack { /** * 作业流程分页查询 + * * @return */ public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { @@ -1240,6 +1258,7 @@ public class WmsHqlPack { /** * 作业流程明细分页查询 + * * @return */ public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { @@ -1289,6 +1308,7 @@ public class WmsHqlPack { /** * 作业记录 查询条件封装 + * * @param wmsActionLog * @return */ @@ -1323,6 +1343,7 @@ public class WmsHqlPack { /** * 作业记录明细 查询条件封装 + * * @param wmsActionLogDetails * @return */ @@ -1461,6 +1482,7 @@ public class WmsHqlPack { /** * 根据权限数据拼查询任务详情sql + * * @param groupDataAuth * @return */ @@ -1499,14 +1521,15 @@ public class WmsHqlPack { /** * 给定字段动态in sql + * * @param columnName * @param vals * @return */ - public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List vals) { + public static String packHqlAndIn(WmsTaskInfo bean, String columnName, List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); - HqlPack.getInPackString(data,columnName,result); + HqlPack.getInPackString(data, columnName, result); HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result); getStringBuilderPack(bean, result); return result.toString(); @@ -1514,6 +1537,7 @@ public class WmsHqlPack { /** * 根据条件查询dataAuth + * * @param wmsDataAuth * @return */ @@ -1534,6 +1558,7 @@ public class WmsHqlPack { /** * 根据条件查询任务明细信息 + * * @param taskDetails * @return */ @@ -1581,6 +1606,7 @@ public class WmsHqlPack { /** * 根据条件查询系统配置信息 + * * @param wmsConfig * @return */ From 1adb344e31a856776d1ae541285f10b2a5acce66 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 3 Apr 2019 14:22:09 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 176 ++++++++++++--------- 1 file changed, 99 insertions(+), 77 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 0f5f954..eccbdfa 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 @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -27,7 +29,6 @@ public class WmsHqlPack { public static String packInParams(String colnumName, String[] params) { StringBuffer sb = new StringBuffer(); HqlPack.getInPackString(String.join(",", params), colnumName, sb); - HqlPack.getNumEqualPack( WmsEnumUtil.IS_PART.IS_ADJUST.getValue(),"snControl", sb); return sb.toString(); } @@ -37,16 +38,36 @@ public class WmsHqlPack { * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + /** + * 封装公用查询参数 + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + HqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } // 封装有效状态和删除状态 - SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); - SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + HqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); return hqlStr.toString(); } @@ -313,17 +334,17 @@ public class WmsHqlPack { * @param wmsTransType * @return */ - public static String packHqlWmsTransType(WmsTransType wmsTransType) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTransType(WmsTransType wmsTransType) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); - HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); - HqlPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); + DdlPreparedPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); + DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); getStringBuilderPack(wmsTransType, result); - return result.toString(); + return result; } /** @@ -1138,19 +1159,19 @@ public class WmsHqlPack { * @param wmsActionStepCall * @return */ - public static String packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); - HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); - HqlPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result); getStringBuilderPack(wmsActionStepCall, result); - HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - return result.toString(); + return result; } /** @@ -1159,15 +1180,15 @@ public class WmsHqlPack { * @param wmsActionStepType * @return */ - public static String packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + DdlPreparedPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); getStringBuilderPack(wmsActionStepType, result); - return result.toString(); + return result; } /** @@ -1176,15 +1197,15 @@ public class WmsHqlPack { * @param wmsActionStep * @return */ - public static String packHqlWmsActionStep(WmsActionStep wmsActionStep) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStep(WmsActionStep wmsActionStep) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); + DdlPreparedPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); getStringBuilderPack(wmsActionStep, result); - return result.toString(); + return result; } /** @@ -1193,15 +1214,14 @@ public class WmsHqlPack { * @param wmsActionModuleParam * @return */ - public static String packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); - HqlPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); + DdlPreparedPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + DdlPreparedPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); getStringBuilderPack(wmsActionModuleParam, result); - - return result.toString(); + return result; } /** @@ -1210,49 +1230,51 @@ public class WmsHqlPack { * @param wmsActionModule * @return */ - public static String packHqlWmsActionModule(WmsActionModule wmsActionModule) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionModule(WmsActionModule wmsActionModule) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); - HqlPack.getNumEqualPack(wmsActionModule.getId(), "id", result); - HqlPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); + DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); getStringBuilderPack(wmsActionModule, result); - return result.toString(); + return result; } /** * 作业流程分页查询 * @return */ - public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 agDescC;agNameC - HqlPack.getStringLikerPack(wmsActionGroup.getAgNameC(), "agNameC", result); - HqlPack.getStringLikerPack(wmsActionGroup.getAgDescC(), "agDescC", result); + DdlPreparedPack.getStringLikerPack(wmsActionGroup.getAgNameC(), "agNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionGroup.getAgDescC(), "agDescC", result); getStringBuilderPack(wmsActionGroup, result); - return result.toString(); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, result); + + return result; } /** * 作业流程明细分页查询 * @return */ - public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsActionGroupDetails.getAgId(), "agId", result); + DdlPreparedPack.getNumEqualPack(wmsActionGroupDetails.getAgId(), "agId", result); getStringBuilderPack(wmsActionGroupDetails, result); - HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - return result.toString(); + return result; } /** @@ -1261,13 +1283,13 @@ public class WmsHqlPack { * @param wmsActionLogData * @return */ - public static String packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); getStringBuilderPack(wmsActionLogData, result); - return result.toString(); + return result; } /** @@ -1276,15 +1298,15 @@ public class WmsHqlPack { * @param wmsActionStepCallParam * @return */ - public static String packHqlWmsActionStepCallParam(WmsActionStepCallParam wmsActionStepCallParam) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStepCallParam(WmsActionStepCallParam wmsActionStepCallParam) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result); - HqlPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result); - HqlPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result); getStringBuilderPack(wmsActionStepCallParam, result); - return result.toString(); + return result; } /** @@ -1292,33 +1314,33 @@ public class WmsHqlPack { * @param wmsActionLog * @return */ - public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionLog(WmsActionLog wmsActionLog) { + DdlPackBean result = new DdlPackBean(); if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), + DdlPreparedPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), "startTime", result, true); } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), + DdlPreparedPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), "endTime", result, true); } // 作业流程编号 - HqlPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); + DdlPreparedPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); // 作业流程名称 - HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); // 单据编号 - HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); // 设备编号 - HqlPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); + DdlPreparedPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); // 交易类型代码 - HqlPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); // 流程状态 - HqlPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); + DdlPreparedPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); getStringBuilderPack(wmsActionLog, result); - return result.toString(); + return result; } /** @@ -1326,21 +1348,21 @@ public class WmsHqlPack { * @param wmsActionLogDetails * @return */ - public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { + DdlPackBean result = new DdlPackBean(); //作业流程id（对应作业记录明细里自增的id） - HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); getStringBuilderPack(wmsActionLogDetails, result); - HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - return result.toString(); + return result; } /** From a7370f4cc02d43468fdb3152cce640d38be1c074 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 3 Apr 2019 15:20:14 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c857b40..1663288 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 @@ -561,7 +561,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get("m_" + key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); } return query.getResultList(); From 1d57eb5a104d21c649251e31e7893da502b00462 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Wed, 3 Apr 2019 15:54:20 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E7=9B=98=E7=82=B9pc=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index edbb890..10ea661 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -43,7 +43,7 @@ public class WmsCSOrderMaster extends BaseBean { public Integer orderType; @Column(name = "ORDER_STATUS") - @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中 30-盘点完成 40-已解冻 50-已关闭)", example = "1") + @ApiParam(value = "状态 (10-创建 20-开启盘点 30-盘点中 40-盘点完成 50-已解冻 60-已关闭)", example = "1") public Integer orderStatus; @Column(name = "ACTION_PERSENT") 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 0f5f954..4bfeb32 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 @@ -1091,6 +1091,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); + HqlPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); getStringBuilderPack(wmsCSOrderMaster, result); From 36034d492501f7994f691e46263b7f8ca56b4a0a Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 3 Apr 2019 16:31:55 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/bean/DdlPackBean.java | 43 +++++++++++++++++++--- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 3 +- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 05c06fd..94ed7aa 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -27,11 +27,14 @@ public class DdlPackBean { //是否是hql private boolean isHql; - //排序内容 - private String orderByStr; + //手动hql，尽量避免直接传参，使用？代替 + private String hqlAppend; //where后跟着的hql/sql - private String whereAppend; + private StringBuilder whereAppend; + + //排序内容 + private String orderByStr; //需要拼接的hql private StringBuilder sb = null; @@ -39,11 +42,13 @@ public class DdlPackBean { public DdlPackBean(){ this.isHql = true; sb = new StringBuilder(); + whereAppend = new StringBuilder(); } public DdlPackBean(boolean isHql){ this.isHql = isHql; sb = new StringBuilder(); + whereAppend = new StringBuilder(); } public boolean isHql() { @@ -62,12 +67,20 @@ public class DdlPackBean { this.orderByStr = orderByStr; } + public String getHqlAppend() { + return hqlAppend; + } + + public void setHqlAppend(String hqlAppend) { + this.hqlAppend = hqlAppend; + } + public String getWhereAppend() { - return whereAppend; + return whereAppend.toString(); } public void setWhereAppend(String whereAppend) { - this.whereAppend = whereAppend; + this.whereAppend = new StringBuilder(whereAppend); } public HashMap getHqlPreparedMap() { @@ -87,7 +100,7 @@ public class DdlPackBean { hqlPreparedMap.put(column, val); } - sb.append(hql); + whereAppend.append(hql); } /** @@ -99,6 +112,24 @@ public class DdlPackBean { } /** + * 获取包含hql的最终的ddl + * @return + */ + public String getPackedHqlAll(){ + if(hqlAppend != null){ + sb.append(hqlAppend); + } + if(whereAppend != null){ + sb.append(whereAppend); + } + if(orderByStr != null){ + sb.append(orderByStr); + } + System.out.println("===" + sb.toString()); + return sb.toString(); + } + + /** * 获取最终的ddl * @return */ 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 1663288..9278d72 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 @@ -894,8 +894,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public double findByHqlDouble(DdlPackBean packBean) { try{ - Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() - + " as model where 1=1 " + packBean.getPackedHql(),Double.class); + Query query = entityManager.createQuery(packBean.getPackedHqlAll(),Double.class); for (String key : packBean.getHqlPreparedMap().keySet()) { query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); From 34cadcfb54adc345cde681c677fa73af6e6abc81 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 3 Apr 2019 17:03:18 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AE=B9?= =?UTF-8?q?=E5=85=AC=E7=94=A8=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 f5eabd7..6b60984 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 @@ -96,19 +96,19 @@ public class WmsLocate extends BaseBean { private Double partQty; public Integer getMaxPackageQty() { - return this.maxPackageQty == null ? 0 : this.maxPackageQty; + return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); } public Double getMaxPartQty() { - return this.maxPartQty == null ? 0 : this.maxPartQty; + return this.maxPartQty == null ? 0 : this.maxPartQty.doubleValue(); } public Integer getBoxQty() { - return this.boxQty == null ? 0 : this.boxQty; + return this.boxQty == null ? 0 : this.boxQty.intValue(); } public Double getPartQty() { - return this.partQty == null ? 0 : this.partQty; + return this.partQty == null ? 0 : this.partQty.doubleValue(); } } From 4ba121d7c99d50ebfaab376558e9f2fc7b190bdb Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Wed, 3 Apr 2019 17:18:18 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E6=9E=B6=E6=9E=84=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 4 ++- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 31 +++++++++++----------- 2 files changed, 19 insertions(+), 16 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 1663288..521e707 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 @@ -1043,7 +1043,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep */ private T innerSave(T item) { try { - if(item==null)return null; + if(item ==null) { + return null; + } Class clazz = item.getClass(); //获取主键 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 4dd2b98..cecaee4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** * @Description : 数据库脚本封装方法，封装成预加载hql，HqlPack仅限用于一些特定的sql，可能造成性能低下 @@ -363,21 +364,21 @@ public class DdlPreparedPack { * @param columnName * @param packBean */ - public static void getInPackString(String data, String columnName, DdlPackBean packBean) { - if (data != null && data.trim().length() > 0) { - //判断最后一位是不是逗号 - if (data.lastIndexOf(",") != (data.length() - 1)) { - data += ","; - } - String[] dataArray = data.substring(0, data.length() - 1).split(","); - data = ""; - for (int i = 0; i < dataArray.length; i++) { - if (i == dataArray.length - 1) { - data += "'" + dataArray[i] + "'"; - } else { - data += "'" + dataArray[i] + "',"; - } - } + public static void getInPackString(Object[] data, String columnName, DdlPackBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackString(List data, String columnName, DdlPackBean packBean) { + if (data != null && data.size() > 0) { packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); } } From a49647f275ba26a4bb31f87f07a7c4fecdf2e188 Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Wed, 3 Apr 2019 17:49:01 +0800 Subject: [PATCH 10/18] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java index fa5063d..e8e2b89 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * @Description : 可选项模型 @@ -8,8 +11,13 @@ import lombok.Data; * @Author : silliter.yuan * @CreateDate : 2018-11-30 10:50 * @Modify: + * 2019-04-03 15:42 Rock.Yu + * 1. 增加了构造方法和构建器的注解 **/ @Data +@NoArgsConstructor +@AllArgsConstructor +@Builder public class WmsOptionModel { private String code; From 6c2f2e53f32542a4e92daf6291ccf874899e9ba0 Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Wed, 3 Apr 2019 17:50:21 +0800 Subject: [PATCH 11/18] =?UTF-8?q?1.=20=E5=BF=BD=E7=95=A5=20iml=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 586e79f..d9357f1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ target .class .md .log +*.iml From 7876ab6475133020f98e728a7b3fef7c1d729ac8 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 3 Apr 2019 18:14:14 +0800 Subject: [PATCH 12/18] =?UTF-8?q?hql=E5=B0=81=E8=A3=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 1 - .../java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 94ed7aa..c052dcc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -125,7 +125,6 @@ public class DdlPackBean { if(orderByStr != null){ sb.append(orderByStr); } - System.out.println("===" + sb.toString()); return sb.toString(); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index cecaee4..f74f02f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -338,8 +339,8 @@ public class DdlPreparedPack { * @param columnName * @param packBean */ - public static void getInPack(String data, String columnName, DdlPackBean packBean) { - if (data != null && data.trim().length() > 0) { + public static void getInPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -364,9 +365,9 @@ public class DdlPreparedPack { * @param columnName * @param packBean */ - public static void getInPackString(Object[] data, String columnName, DdlPackBean packBean) { + public static void getInPackArray(Object[] data, String columnName, DdlPackBean packBean) { if (data != null && data.length > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data)); } } @@ -377,7 +378,7 @@ public class DdlPreparedPack { * @param columnName * @param packBean */ - public static void getInPackString(List data, String columnName, DdlPackBean packBean) { + public static void getInPackList(List data, String columnName, DdlPackBean packBean) { if (data != null && data.size() > 0) { packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); } From 0863e49b1aab69ae89f84cb29f5528d6e11be1b5 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 3 Apr 2019 19:33:34 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=8E=E7=BB=86=E9=94=99=E8=AF=AF=EF=BC=9A?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=E6=94=B9?= =?UTF-8?q?=E7=89=88=20=E5=8D=95=E6=8D=AE=E4=BB=BB=E5=8A=A1=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81=E9=BB=98=E8=AE=A4=EF=BC=9A10?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=20=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E7=A7=BB=E5=8A=A8=E5=8D=95=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E5=AE=9A=E6=9C=89=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +------ 1 file changed, 1 insertion(+), 6 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 8cdee66..1c58e3c 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 @@ -123,12 +123,7 @@ public class WmsHqlPack { */ public static DdlPackBean packWmsOrderDetailsByOrderNos(String colName, List orderNos) { DdlPackBean packBean = new DdlPackBean(); - StringBuffer orderNoStr = new StringBuffer(); - for (int i = 0; i < orderNos.size(); i++) { - orderNoStr.append("'" + orderNos.get(i) + "',"); - } - orderNoStr.deleteCharAt(orderNoStr.length() - 1); - DdlPreparedPack.getInPack(orderNoStr.toString(), "orderNo", packBean); + DdlPreparedPack.getInPack(orderNos, "orderNo", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); DdlPreparedPack.getOrderByPack( From f04cb00994b0e1745381628024c9d4b2d601f07c Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Wed, 3 Apr 2019 19:44:23 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E7=9B=98=E7=82=B9pc=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 4 ++++ 1 file changed, 4 insertions(+) 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 b6684c8..e04bbd6 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 @@ -103,6 +103,10 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam(value = "剩余数量", example = "1") public Double surplusQty; + @Transient + @ApiParam("目标库位编号") + public String descLocateNo; + public Double getQty() { return this.qty == null ? 0 : this.qty; } From 426b2e8952e7458b978cdb5ef4adef065d8a28ad Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Wed, 3 Apr 2019 20:10:46 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a7bf29d..c99938d 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 @@ -1069,7 +1069,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_ITEM_STATUS { NORMAL(10, "创建"), - CANCELLATION(20, "行取消"); + CANCELLATION(20, "已处理"); private int value; private String description; From a222cf09d9e46e559e82d2458319fac948f2f655 Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Wed, 3 Apr 2019 21:30:42 +0800 Subject: [PATCH 16/18] =?UTF-8?q?1.=20PDA=E9=80=9A=E7=94=A8=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 62f285f..8ddd632 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 @@ -8,6 +8,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -22,7 +23,7 @@ import java.util.Map; @NoArgsConstructor @AllArgsConstructor @Api("返回前端数据实体") -public class WmsActionResponseBean { +public class WmsActionResponseBean implements Serializable { @ApiParam("回显BARCODE值") public Map barCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java index 88085bf..75d02d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java @@ -11,4 +11,10 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; * @Modify: **/ public interface WmsStockSnRepository extends BaseRepository { + /** + * 按照条码查询实体 + * @param sn 条码 + * @return 库存条码实体 + */ + WmsStockSn findFirstBySn(String sn); } From 54f974ae89e87ed002a447a383f8efb4760d6674 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 3 Apr 2019 21:12:16 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/bean/BfInterceptDetail.java | 9 +++++++++ .../cn/estsh/i3plus/pojo/platform/bean/SysFile.java | 18 +++++++++++++----- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java index 37bbade..900be53 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java @@ -43,10 +43,19 @@ public class BfInterceptDetail extends BaseBean { @ApiParam(value ="拦截器类型") private Integer interceptType; + // 枚举 BlockFormEnumUtil.INTERCEPT_POSITION @Column(name="INTERCEPT_POSITION") @ApiParam(value ="拦截器位置") private Integer interceptPosition; + public Integer getInterceptPosition() { + if(this.interceptPosition == null){ + return null; + } else { + return this.interceptPosition.intValue(); + } + } + @Column(name="INTERCEPT_TARGET_ID") @ApiParam(value ="拦截目标id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index 3b7d26b..e719404 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -34,7 +34,15 @@ public class SysFile extends BaseBean { @Column(name="NAME") @ApiParam(value ="文件名称") private String name; - + + @Column(name="FILE_CODE") + @ApiParam(value ="文件代码") + private String fileCode; + + @Column(name="FILE_SOFT_TYPE") + @ApiParam(value ="文件所属模块") + private Integer fileSoftType; + @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -51,11 +59,11 @@ public class SysFile extends BaseBean { @Column(name="FILE_PATH") @ApiParam(value ="文件路径") private String filePath; - + @Column(name="FILE_ORIGINAL_NAME") @ApiParam(value ="原始文件名称") private String fileOriginalName; - + @Column(name="FILE_TYPE_ID") @ApiParam(value ="文件类型ID") private Long fileTypeId; @@ -67,11 +75,11 @@ public class SysFile extends BaseBean { @Column(name="FILE_TYPE_NAME") @ApiParam(value ="文件类型名称") private String fileTypeName; - + @Column(name="FILE_SIZE") @ApiParam(value ="文件大小(KB)" , example ="0") private Integer fileSize; - + @Column(name="DOWNLOAD_NUM") @ApiParam(value ="下载次数" , example ="0") private Integer downloadNum; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 94489e1..c3faf6d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.sqlpack; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.commons.lang3.StringUtils; @@ -704,4 +706,22 @@ public class CoreHqlPack { return result.toString(); } + + + + /** + * 文件代码是否存在 + * @param sysFile 查询条件 + * @return DdlPackBean + */ + public static DdlPackBean packHqlSysFileCode(SysFile sysFile){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + // and + DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",ddlPackBean); + // not + DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",ddlPackBean); + + return ddlPackBean; + } } \ No newline at end of file From 863b7b0d61e906b6c96e3f0fbb699991d1f320a1 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 3 Apr 2019 21:45:33 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E8=A1=8C=E5=8F=B7=E4=B8=8D=E5=81=9A=E4=B8=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=EF=BC=9A=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=EF=BC=9A=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=8F=AF=E8=83=BD=E6=B2=A1=E6=9C=89=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=EF=BC=8C=E6=89=80=E4=BB=A5=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=BA=90=E5=BA=93=E4=BD=8D=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=92=8C=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=B8=E5=BA=94=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a7bf29d..8d164d3 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 @@ -917,7 +917,7 @@ public class WmsEnumUtil { } /** - * 盘点实盘 处理状态 + * 盘点实盘 处理状态;质检操作明细状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_ITEM_STATUS {