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
gragon.xu 6 years ago
parent 86e96e8f76 9c08de7a7a
commit a7dea093d7
8 changed files with 118 additions and 76 deletions
Show Stats Download Patch File Download Diff File

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

@ -533,10 +533,10 @@ public class BlockReportEnumUtil {
LIKE_LEFT(6, "LIKE", "左模糊"),
LIKE_RIGHT(7, "LIKE", "右模糊"),
EQUAL(8, "=", "等于"),
EQUAL_NOT(9, "!=", "不等于"),
AND(10, "AND", "AND"),
OR(11, "OR", "OR"),
NOT(12, "NOT", "NOT"),
EQUAL_NOT(9, "<>", "不等于"),
// AND(10, "AND", "AND"),
// OR(11, "OR", "OR"),
// NOT(12, "NOT", "NOT"),
IS_NULL(13, "IS NULL", "IS NULL"),
IS_NOT_NULL(14, "IS NOT NULL", "IS NOT NULL");

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

@ -1,45 +0,0 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* @Description : wms数据权限枚举
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-3-8 15:53
* @Modify:
**/
public class DataAuthEnumUtil {
/**
* 数据对象枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_OBJ_TYPE {
WAREHOUSE("10", "WAREHOUSE", "仓库对象"),
ZONE("20", "ZONE", "存储区对象"),
LOCATE("30", "LOCATE", "库位对象");
private String code;
private String description;
String value;
DATA_OBJ_TYPE(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public String getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
}

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

@ -1819,18 +1819,53 @@ public class WmsEnumUtil {
}
/**
* 可选项类型枚举
* 数据对象枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_OBJ_TYPE {
WAREHOUSE(10, "WAREHOUSE", "仓库对象"),
ZONE(20, "ZONE", "存储区对象"),
LOCATE(30, "LOCATE", "库位对象"),
MATERIAL(40, "MATERIAL", "物料对象");
private String code;
private String description;
int value;
DATA_OBJ_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
/**
* 数据操作枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_ROLE_TYPE {
WAREHOUSE(1, "WAREHOUSE", "仓库"),
STOCK(2, "STOCK", "库存");
public enum DATA_OBJ_OP_TYPE {
ADD(10, "ADD", "新增"),
DEL(20, "DEL", "删除"),
UPD(30, "UPD", "修改"),
QUERY(40, "QUERY", "查询");
private String code;
private String description;
int value;
DATA_ROLE_TYPE(int value, String code, String description) {
DATA_OBJ_OP_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;

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

@ -451,6 +451,32 @@ public class HqlPack {
* @param columnName
* @param result
*/
public static void getInOrPackString(String data,String columnName, StringBuffer result){
if (data != null && data.trim().length()>0) {
data = getSafeParam(data);
//判断最后一位是不是逗号
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] + "',";
}
}
result.append(" or model."+columnName+" in ( "+ data+ " )");
}
}
/**
* 封装in String查询语句
* @param data
* @param columnName
* @param result
*/
public static void getNotInPackString(String data,String columnName, StringBuffer result){
if (data != null && data.trim().length()>0) {
data = getSafeParam(data);

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

@ -35,6 +35,11 @@ public class SysRefTaskCyclePlan extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long taskCycleId;
@Column(name="TASK_PLAN_ID")
@ApiParam(value ="任务计划id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskPlanId;
@Column(name="TASK_PLAN_NAME")
@ApiParam(value ="任务计划名称")
private String taskPlanName;

11
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
Unescape Escape View File

@ -77,11 +77,12 @@ public class ReportHqlPack {
// 查询参数封装
HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result);
if(template.getTemplateStatus() != null &&
template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue()){
HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result);
}else {
HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
if(template.getTemplateStatus() != null){
if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){
HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
}else {
HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
}
}
HqlPack.getStringLikerPack(template.getName(),"name",result);

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

@ -120,6 +120,10 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
@Column(name = "MOVE_QTY")
@ApiParam(value = "已移库数量", example = "1")
private Double moveQty;
@Column(name = "SRC_AREA_NO")
@ApiParam("源库存地代码")
public String srcAreaNo;

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

@ -2,10 +2,11 @@ package cn.estsh.i3plus.pojo.wms.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.DataAuthEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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.StringUtils;
@ -1343,13 +1344,23 @@ public class WmsHqlPack {
public static String packHqlWmsDataAuth(List<String> roleIds) {
StringBuffer result = new StringBuffer();
String data = String.join(",", roleIds);
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(data,"roleCode",result);
getStringBuilderPack(new WmsDataAuth(), result);
return result.toString();
}
/**
* 根据用户角色id列表查询数据权限信息
* @return
*/
public static String packHqlWmsDataAuth(WmsDataAuth dataAuth) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result);
getStringBuilderPack(new WmsDataAuth(), result);
return result.toString();
}
/**
* 根据权限数据拼查询任务详情sql
* @param groupDataAuth
* @return
@ -1357,25 +1368,30 @@ public class WmsHqlPack {
public static String packHqlWmsTaskDetail(Map<String ,List<WmsDataAuth>> groupDataAuth) {
StringBuffer result = new StringBuffer();
Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
String warehouse = DataAuthEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue();
String locate = DataAuthEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue();
String zone = DataAuthEnumUtil.DATA_OBJ_TYPE.ZONE.getValue();
//拼sql
entries.stream().filter(o->!Strings.isNullOrEmpty(o.getKey())).forEach(o->{
List<WmsDataAuth> value = o.getValue();
List<String> vList = value.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList());
String data = String.join(",", vList);
if(warehouse.equals(o.getKey())){
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(data,"destWhNo",result);
}
if(locate.equals(o.getKey())){
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(data,"destLocateNo",result);
}
if(zone.equals(o.getKey())){
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(data,"destZoneNo",result);
if (StringUtils.isNotBlank(data)) {
List<Map> mapList = JSONObject.parseArray(data, Map.class);
if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", o.getKey())) {
for (Map whNoItem : mapList) {
HqlPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result);
}
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", o.getKey())) {
for (Map locateNoItem : mapList) {
HqlPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result);
}
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", o.getKey())) {
for (Map zoneNoItem : mapList) {
HqlPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result);
}
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", o.getKey())) {
for (Map zoneNoItem : mapList) {
HqlPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result);
}
}
}
});
getStringBuilderPack(new WmsDataAuth(), result);
@ -1391,7 +1407,7 @@ public class WmsHqlPack {
public static String packHqlAndIn(BaseBean bean,String columnName,List<String> vals) {
StringBuffer result = new StringBuffer();
String data = String.join(",", vals);
HqlPack.getInPack(data,columnName,result);
HqlPack.getInPackString(data,columnName,result);
getStringBuilderPack(bean, result);
return result.toString();
}

Write Preview
Loading…
Cancel
Save