I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
yihang.lv 6 years ago
parent cddb582ab4 fb78a04969
commit 359ceaf702
28 changed files with 412 additions and 136 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape Escape View File

@ -12,3 +12,4 @@ target
.class
.md
.log
*.iml

42
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
Unescape Escape View File

@ -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<String, Object> getHqlPreparedMap() {
@ -87,7 +100,7 @@ public class DdlPackBean {
hqlPreparedMap.put(column, val);
}
sb.append(hql);
whereAppend.append(hql);
}
/**
@ -99,6 +112,23 @@ 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);
}
return sb.toString();
}
/**
* 获取最终的ddl
* @return
*/

4
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -917,7 +917,7 @@ public class WmsEnumUtil {
}
/**
* 盘点实盘 处理状态
* 盘点实盘 处理状态;质检操作明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_ITEM_STATUS {
@ -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;

9
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -561,7 +561,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> 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(key));
}
return query.getResultList();
@ -894,8 +894,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> 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));
@ -1043,7 +1042,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
*/
private T innerSave(T item) {
try {
if(item==null)return null;
if(item ==null) {
return null;
}
Class<?> clazz = item.getClass();
//获取主键

36
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -5,7 +5,9 @@ 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;
/**
* @Description : 数据库脚本封装方法，封装成预加载hql，HqlPack仅限用于一些特定的sql，可能造成性能低下
@ -337,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);
}
}
@ -363,21 +365,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 getInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
if (data != null && data.length > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data));
}
}
/**
* 封装in String查询语句
*
* @param data
* @param columnName
* @param 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);
}
}

9
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java
Unescape Escape View File

@ -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)

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java
Unescape Escape View File

@ -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<MesProcess, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java
Unescape Escape View File

@ -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<MesProdRouteCfg, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java
Unescape Escape View File

@ -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<MesProdRouteOptParam, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java
Unescape Escape View File

@ -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<MesRouteProcessCell, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java
Unescape Escape View File

@ -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<MesRouteProcess, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java
Unescape Escape View File

@ -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<MesRouteProcessStep, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java
Unescape Escape View File

@ -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<MesRoute, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java
Unescape Escape View File

@ -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<MesStepParam, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java
Unescape Escape View File

@ -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<MesStep, Long> {
}

1
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java
Unescape Escape View File

@ -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;

1
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java
Unescape Escape View File

@ -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;

1
modules/i3plus-pojo-model/i3plus-pojo-model.iml
Unescape Escape View File

@ -35,6 +35,7 @@
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.49" level="project" />
<orderEntry type="module" module-name="i3plus-pojo-report" />
<orderEntry type="module" module-name="i3plus-pojo-form" />
<orderEntry type="module" module-name="i3plus-pojo-wms" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.0.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.3.RELEASE" level="project" />

18
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java
Unescape Escape View File

@ -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;

20
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -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;
}
}

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
Unescape Escape View File

@ -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<Obj> {
public class WmsActionResponseBean<Obj> implements Serializable {
@ApiParam("回显BARCODE值")
public Map<String, Obj> barCode;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
Unescape Escape View File

@ -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;
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
Unescape Escape View File

@ -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")

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
Unescape Escape View File

@ -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(); }
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
Unescape Escape View File

@ -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();
}
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java
Unescape Escape View File

@ -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;

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java
Unescape Escape View File

@ -11,4 +11,10 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
* @Modify:
**/
public interface WmsStockSnRepository extends BaseRepository<WmsStockSn, Long> {
/**
* 按照条码查询实体
* @param sn 条码
* @return 库存条码实体
*/
WmsStockSn findFirstBySn(String sn);
}

227
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -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,7 +30,7 @@ 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();
}
@ -37,16 +40,37 @@ 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();
}
@ -97,17 +121,15 @@ public class WmsHqlPack {
* @param orderNos
* @return
*/
public static String packWmsOrderDetailsByOrderNos(String colName, List<String> orderNos) {
StringBuffer result = new StringBuffer();
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();
public static DdlPackBean packWmsOrderDetailsByOrderNos(String colName, List<String> orderNos) {
DdlPackBean packBean = new DdlPackBean();
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(
new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},
new String[]{colName, "orderNo"}, packBean);
return packBean;
}
/**
@ -163,8 +185,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);
@ -313,17 +335,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;
}
/**
@ -702,6 +724,7 @@ public class WmsHqlPack {
/**
* 根据条件查询打印机队列信息封装类
*
* @param wmsSnPrint 打印机队列信息
* @return 打印机队列信息
*/
@ -724,6 +747,7 @@ public class WmsHqlPack {
/**
* 盘点库位 条件封装
*
* @param wmsCSLocate
* @return
*/
@ -740,6 +764,7 @@ public class WmsHqlPack {
/**
* 盘点物料 条件封装
*
* @param wmsCSPart
* @return
*/
@ -758,6 +783,7 @@ public class WmsHqlPack {
/**
* 盘点存储区 条件封装
*
* @param wmsCSZone
* @return
*/
@ -774,6 +800,7 @@ public class WmsHqlPack {
/**
* 根据条件查询责任区分配信息封装类
*
* @param wmsAreaOwner 责任区分配信息
* @return 责任区分配信息
*/
@ -800,6 +827,7 @@ public class WmsHqlPack {
/**
* 根据条件查询责任区分配信息封装类
*
* @param wmsTempOrderLock 责任区分配信息
* @return 责任区分配信息
*/
@ -918,6 +946,7 @@ public class WmsHqlPack {
/**
* 内部单据：库存移动单主表唯一性查询
*
* @param wmsMoveMaster
* @return
*/
@ -935,6 +964,7 @@ public class WmsHqlPack {
/**
* 内部单据：库存移动单主表分页查询
*
* @param wmsMoveMaster
* @return
*/
@ -951,6 +981,7 @@ public class WmsHqlPack {
/**
* 内部单据：库存移动单明细表分页查询
*
* @param wmsMoveDetails
* @return
*/
@ -981,6 +1012,7 @@ public class WmsHqlPack {
/**
* 内部单据：库存移动单条码信息分页查询
*
* @param wmsMoveSn
* @return
*/
@ -1033,8 +1065,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);
@ -1091,6 +1123,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);
@ -1138,19 +1171,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 +1192,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 +1209,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 +1226,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 +1242,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 +1295,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 +1310,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 +1326,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 +1360,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;
}
/**
@ -1461,6 +1495,7 @@ public class WmsHqlPack {
/**
* 根据权限数据拼查询任务详情sql
*
* @param groupDataAuth
* @return
*/
@ -1499,14 +1534,15 @@ public class WmsHqlPack {
/**
* 给定字段动态in sql
*
* @param columnName
* @param vals
* @return
*/
public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List<String> vals) {
public static String packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> 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 +1550,7 @@ public class WmsHqlPack {
/**
* 根据条件查询dataAuth
*
* @param wmsDataAuth
* @return
*/
@ -1534,6 +1571,7 @@ public class WmsHqlPack {
/**
* 根据条件查询任务明细信息
*
* @param taskDetails
* @return
*/
@ -1581,6 +1619,7 @@ public class WmsHqlPack {
/**
* 根据条件查询系统配置信息
*
* @param wmsConfig
* @return
*/

Write Preview
Loading…
Cancel
Save