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

Merge remote-tracking branch 'remotes/origin/dev' into test

Browse Source
yun-zuoyi
Silliter 6 years ago
parent 9c54bc6f9d bbf0fb6b62
commit ac52608e22
10 changed files with 118 additions and 28 deletions
Show Stats Download Patch File Download Diff File

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

@ -184,4 +184,45 @@ public class SwebEnumUtil {
return tmp;
}
}
/**
* 数据状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_STATUS {
YES(1, "是", "fa fa-success cell-fa fa-check"),
NO(2, "否", "fa fa-disabled cell-fa fa-times-circle");
private int value;
private String description;
private String code;
DATA_STATUS(int value, String code, String description) {
this.value = value;
this.description = description;
this.code = code;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].getDescription();
}
}
return tmp;
}
}
}

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

@ -48,7 +48,7 @@ public class DdlPreparedPack {
}
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, endDate);
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, endDate);
}
/**
@ -91,15 +91,15 @@ public class DdlPreparedPack {
time[1] += " 23:59:59";
}
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, time[0]);
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, time[1]);
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, time[1]);
} else {
if (showTaday) {
if (isShowTime) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, today + " 23:59:59");
packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_"+ columnName, today + " 23:59:59");
} else {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today);
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, today);
packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_" + columnName, today);
}
}
}

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

@ -43,4 +43,8 @@ public class SwebProcurementPlanOrder extends BaseBean {
@ApiParam("供应商代码")
@Column(name = "VENDOR_CODE")
private String vendorCode;
@ApiParam("供应商名称")
@Column(name = "VENDOR_NAME")
private String vendorName;
}

17
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.sweb.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
@ -98,5 +100,20 @@ public class SwebPurchaseOrder extends BaseBean {
@Column(name = "EXPECTED_TIME")
@ApiParam(value = "预计到货时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
public String expectedTime;
@Column(name = "REF_NO")
@ApiParam(value = "合同号")
public String refNo;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiParam(value = "预计到货时间 开始时间")
public String expectedTimeStart;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiParam(value = "预计到货时间 结束时间")
public String expectedTimeEnd;
}

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

@ -128,7 +128,7 @@ public class SwebPurchaseOrderDetails extends BaseBean {
@Column(name = "IS_STEEL")
@ApiParam("是否为钢卷料")
private Integer IS_STEEL;
private Integer isSteel;
@Column(name = "EXPECTED_TIME")
@ApiParam(value = "预计到货日期")

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

@ -29,9 +29,9 @@ import javax.persistence.Table;
@Api("采购订单表-条码明细表")
public class SwebPurchaseOrderSn extends BaseBean {
@Column(name = "ORDER_ITEM_NO")
@Column(name = "ORDER_NO")
@ApiParam("单据明细编号")
public String orderItemNo;
public String orderNo;
@Column(name = "PART_NO")
@ApiParam(value = "零件号")

2
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java
Unescape Escape View File

@ -29,7 +29,7 @@ public class SwebPODetailsUpdateHistoryModel extends BaseBean {
private String partName;
@ApiParam(value = "订单数量")
private Double refQty;
private Double orderQty;
@ApiParam(value = "确认到货数量")
private Double confirmQty;

3
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -47,6 +47,9 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result);
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
purchaseOrder.getExpectedTimeEnd(), "expectedTime", result,false);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
return buildHql(purchaseOrder, result);
}

19
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/AgeLevel.java
Unescape Escape View File

@ -0,0 +1,19 @@
package cn.estsh.i3plus.pojo.wms.engine.rule;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class AgeLevel {
/**
* 年龄
*/
private int age;
/**
* 分级
*/
private String level;
}

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

@ -12,9 +12,7 @@ import com.alibaba.fastjson.JSONObject;
import com.google.common.base.Strings;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -1448,31 +1446,40 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
//拼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());
entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
String key = map.getKey();
List<WmsDataAuth> valueList = map.getValue();
List<String> vList = valueList.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList());
String data = String.join(",", vList);
if (StringUtils.isNotBlank(data)) {
List<Map> mapList = JSONObject.parseArray(data, Map.class);
if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", o.getKey())) {
if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", key)) {
for (Map whNoItem : mapList) {
DdlPreparedPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result);
// 拼接仓库查询sql
DdlPreparedPack.getStringEqualPackOr(whNoItem.get("WH_CODE").toString(), "destWhNo", result);
}
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", o.getKey())) {
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) {
for (Map locateNoItem : mapList) {
DdlPreparedPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result);
// 拼接库位查询sql
DdlPreparedPack.getStringEqualPackOr(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result);
}
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", o.getKey())) {
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) {
for (Map zoneNoItem : mapList) {
DdlPreparedPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result);
// 拼接存储区查询sql
DdlPreparedPack.getStringEqualPackOr(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result);
}
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", o.getKey())) {
for (Map zoneNoItem : mapList) {
DdlPreparedPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result);
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
for (Map partNoItem : mapList) {
// 拼接物料查询sql
DdlPreparedPack.getStringEqualPackOr(partNoItem.get("PART_NO").toString(), "partNo", result);
}
}
}
});
}
// 通用数据拼接
getStringBuilderPack(new WmsDataAuth(), result);
return result;
}
@ -1481,13 +1488,12 @@ public class WmsHqlPack {
* 给定字段动态in sql
*
* @param columnName
* @param vals
* @param values
* @return
*/
public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> vals) {
public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> values) {
DdlPackBean packBean = new DdlPackBean();
String data = String.join(",", vals);
DdlPreparedPack.getInPack(data, columnName, packBean);
DdlPreparedPack.getInPackList(values, columnName, packBean);
DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);

Write Preview
Loading…
Cancel
Save