From 2b1bf288e1758949dbaaa3f87a700351ac111074 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 8 Nov 2018 15:16:11 +0800 Subject: [PATCH 1/5] Part --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 6 +- .../pojo/wms/repository/WmsPartRepository.java | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 107 +++++++++++++-------- 3 files changed, 72 insertions(+), 43 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 3660e9a..10be89e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -14,7 +12,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : + * @Description :物料实体 * @Reference : * @Author : dragon.xu * @CreateDate : 2018-11-07 16:06 @@ -65,7 +63,7 @@ public class WmsPart extends BaseBean { @Column(name="ABC") @ApiParam(value ="分类") - private String ABC; + private String abc; @Column(name="BUY_UNIT") @ApiParam(value ="采购单位") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRepository.java index 426a002..902159d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRepository.java @@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsPart; import org.springframework.stereotype.Repository; /** -* @Description : +* @Description :物料Repository的方法接口 * @Reference : * @Author : dragon.xu * @CreateDate : 2018-11-08 10:19 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 a8d6185..3978a76 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 @@ -15,9 +15,29 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; * @Modify: **/ public class WmsHqlPack { + /** + * 物料查询条件封装 + * + * @param wmsPart + * @return + */ + public static String packHqlWmsPart(WmsPart wmsPart) { + StringBuffer result = new StringBuffer(); + //库存地代码 + HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); + //存储区代码 + HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDateTime", result, true); + HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); + HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + HqlPack.getStringLikerPack(wmsPart.getAbc(), "ABC", result); + HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result); + HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result); + return result.toString(); + } /** * 库位物料信息 分页查询 + * * @param wmsLocatePart * @return */ @@ -34,6 +54,7 @@ public class WmsHqlPack { /** * 库位信息 分页查询 + * * @param wmsLocate * @return */ @@ -41,17 +62,18 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringLikerPack(wmsLocate.getLocateNo(),"locateNo",result); - HqlPack.getStringLikerPack(wmsLocate.getLocateName(),"locateName",result); - HqlPack.getStringLikerPack(wmsLocate.getLocateType(),"locateType",result); - HqlPack.getStringLikerPack(wmsLocate.getWhNo(),"whNo",result); - HqlPack.getStringLikerPack(wmsLocate.getZoneNo(),"zoneNo",result); + HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result); + HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result); + HqlPack.getStringLikerPack(wmsLocate.getLocateType(), "locateType", result); + HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); + HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); return result.toString(); } /** * 工厂仓库模糊分页查询 + * * @param wareHouse * @return */ @@ -59,9 +81,9 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); // 部门名称 - HqlPack.getStringLikerPack(wareHouse.getCode(),"code", result); + HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); // 部门代码 - HqlPack.getStringLikerPack(wareHouse.getName(),"name", result); + HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); return result.toString(); } @@ -70,51 +92,54 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); // 功能名称（name） - HqlPack.getStringLikerPack(wmsButton.getName(),"name", result); + HqlPack.getStringLikerPack(wmsButton.getName(), "name", result); // 前端实现（ui） - HqlPack.getStringLikerPack(wmsButton.getUi(),"ui", result); + HqlPack.getStringLikerPack(wmsButton.getUi(), "ui", result); // URI权限规则（bs） - HqlPack.getStringLikerPack(wmsButton.getBs(),"bs", result); + HqlPack.getStringLikerPack(wmsButton.getBs(), "bs", result); return result.toString(); } /** * 元数据信息 分页查询 + * * @param wmsObject * @return */ - public static String packHqlWmsObject(WmsObject wmsObject){ + public static String packHqlWmsObject(WmsObject wmsObject) { StringBuffer result = new StringBuffer(); // 编码 - HqlPack.getStringLikerPack(wmsObject.getCode(),"code",result); - // 名称 - HqlPack.getStringEqualPack(wmsObject.getName(),"name",result); + HqlPack.getStringLikerPack(wmsObject.getCode(), "code", result); + // 名称 + HqlPack.getStringEqualPack(wmsObject.getName(), "name", result); // 数据主表 - HqlPack.getStringEqualPack(wmsObject.getTableName(),"tableName",result); + HqlPack.getStringEqualPack(wmsObject.getTableName(), "tableName", result); // 自定义业务拦截 - HqlPack.getStringEqualPack(wmsObject.getBizIntercept(),"bizIntercept",result); + HqlPack.getStringEqualPack(wmsObject.getBizIntercept(), "bizIntercept", result); return result.toString(); } /** * 元数据字段分页查询 + * * @param wmsField * @return */ - public static String packHqlWmsField(WmsField wmsField){ + public static String packHqlWmsField(WmsField wmsField) { StringBuffer result = new StringBuffer(); // 编码 - HqlPack.getStringLikerPack(wmsField.getObjectCode(),"objectCode",result); - HqlPack.getStringLikerPack(wmsField.getTableName(),"tableName",result); + HqlPack.getStringLikerPack(wmsField.getObjectCode(), "objectCode", result); + HqlPack.getStringLikerPack(wmsField.getTableName(), "tableName", result); return result.toString(); } /** * 交易类型信息 分页查询 + * * @param wmsTransType * @return */ @@ -122,15 +147,16 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getNumEqualPack(wmsTransType.getIsValid(),"isValid",result); - HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(),"transTypeCode",result); - HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(),"transTypeName",result); + HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); + HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); return result.toString(); } /** * 库存交易记录信息 分页查询 + * * @param wmsTrans * @return */ @@ -138,15 +164,16 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringEqualPack(wmsTrans.getTransCode(),"transCode",result); - HqlPack.getStringEqualPack(wmsTrans.getSn(),"sn",result); - HqlPack.timeBuilder(wmsTrans.getCreateDatetime(),null,"createDatetime",result,true); + HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); + HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); + HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); return result.toString(); } /** * 仓库分页查询条件 + * * @param wareHouse * @return */ @@ -155,55 +182,59 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()+"","isValid",result); + HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() + "", "isValid", result); return result.toString(); } + /** * 存储区信息 查询条件封装 + * * @param wmsZones * @return */ public static String packHqlWmsZones(WmsZones wmsZones) { StringBuffer result = new StringBuffer(); //仓库代码 - HqlPack.getStringLikerPack(wmsZones.getWhNo(),"whNo",result); + HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getStringLikerPack(wmsZones.getAreaNo(),"areaNo",result); + HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getStringLikerPack(wmsZones.getZoneNo(),"zoneNo",result); + HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); return result.toString(); } /** * 客户信息 查询条件封装 + * * @param basCustomer * @return */ - public static String packHqlBasCustomer(BasCustomer basCustomer){ + public static String packHqlBasCustomer(BasCustomer basCustomer) { StringBuffer result = new StringBuffer(); //客户编号 - HqlPack.getStringLikerPack(basCustomer.getCustNo(),"custNo",result); + HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result); //客户简称 - HqlPack.getStringLikerPack(basCustomer.getCustName(),"custName",result); + HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称 - HqlPack.getStringLikerPack(basCustomer.getCustDesc(),"custDesc",result); + HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); return result.toString(); } /** * 客户发往地信息 查询条件封装 + * * @param wmsShippingFlag * @return */ - public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag){ + public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { StringBuffer result = new StringBuffer(); //供应商编号 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(),"flagNo",result); + HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(),"flagName",result); - //供应商全称 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(),"flagDesc",result); + HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); + //供应商全称 + HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); return result.toString(); } } From 2108f314b13b0cdf85b8bf7dbb4623de67649f26 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 8 Nov 2018 16:40:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=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/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 6611fee..3bba3a8 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 @@ -170,12 +170,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - // 默认有效 - if(wareHouse.getIsValid()==null){ - HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",result); - }else{ - HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.INVAILD.getValue()+"","isValid",result); - } + HqlPack.getNumEqualPack(wareHouse.getIsValid(),"isValid",result); return result.toString(); } From de2325d2ebc6de459519da6a79b82b13f6b23d4f Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 8 Nov 2018 16:44:24 +0800 Subject: [PATCH 3/5] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 -- 1 file changed, 2 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 3978a76..fdf314e 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 @@ -23,9 +23,7 @@ public class WmsHqlPack { */ public static String packHqlWmsPart(WmsPart wmsPart) { StringBuffer result = new StringBuffer(); - //库存地代码 HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); - //存储区代码 HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDateTime", result, true); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); From 0df6504c561a5d9918c8738e8cf5b316c30855a8 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 8 Nov 2018 16:46:52 +0800 Subject: [PATCH 4/5] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ---- 1 file changed, 4 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 a84d7d9..7abca1a 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,11 +1,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; -import cn.estsh.i3plus.pojo.wms.bean.WareHouse; -import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; /** * @Description : 仓库管理对象封装 From 0e589a8bb2bb81d16a852f345062387ee6e35a06 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 8 Nov 2018 18:15:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 42 +++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 129cfe3..e13e761 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -72,26 +72,6 @@ public interface BaseRepository extends JpaReposito public int deleteByProperties(String[] propNames, Object[] objValues); /** - * 弱删除 - * @return count - */ - public int deleteWeaklyById(ID id); - public int deleteWeaklyByIds(Long[] ids) ; - public int deleteWeaklyByProperty(String propName, Object propValue); - public int deleteWeaklyByPropertyIn(String propName, Object[] propValues); - public int deleteWeaklyByProperties(String[] propNames, Object[] objValues); - - /** - * 更新有效无效状态 - * @return count - */ - public int updateValidStatusById(ID id,int status); - public int updateValidStatusByIds(Long[] ids,int status) ; - public int updateValidStatusByProperty(String propName, Object propValue,int status); - public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status); - public int updateValidStatusByProperties(String[] propNames, Object[] objValues,int status); - - /** * 通过多单属性进行单个值更新 * @param conditionName * @param conditionValue @@ -235,4 +215,26 @@ public interface BaseRepository extends JpaReposito public List findBySqlObjList(String sql); public List findBySqlObjListByPager(String sql,Pager pager); + + /****************** 部分业务处理 *******************/ + + /** + * 弱删除 + * @return count + */ + public int deleteWeaklyById(ID id,String username); + public int deleteWeaklyByIds(Long[] ids,String username) ; + public int deleteWeaklyByProperty(String propName, Object propValue,String username); + public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username); + public int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username); + + /** + * 更新有效无效状态 + * @return count + */ + public int updateValidStatusById(ID id,int status,String username); + public int updateValidStatusByIds(Long[] ids,int status,String username) ; + public int updateValidStatusByProperty(String propName, Object propValue,int status,String username); + public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username); + public int updateValidStatusByProperties(String[] propNames, Object[] objValues,int status,String username); }