From 6960275e3b802ca55b3048201ff67a07febcea18 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 17 Apr 2019 17:53:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?DdlPack=EF=BC=8C=E6=97=A5=E6=9C=9F=E5=B0=81?= =?UTF-8?q?=E8=A3=85bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 ef38a6b..384b1bb 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 @@ -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); } } } From 7343d25e195db19db935120a8fe17462a331c90a Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 17 Apr 2019 19:12:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 46 ++++++++++++---------- 1 file changed, 26 insertions(+), 20 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 edde64c..4f895d0 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 @@ -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; /** @@ -1450,31 +1448,40 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); Set>> entries = groupDataAuth.entrySet(); //拼sql - entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())).forEach(o -> { - List value = o.getValue(); - List vList = value.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList()); + entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); + + for (Map.Entry> map : entries) { + String key = map.getKey(); + List valueList = map.getValue(); + List vList = valueList.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList()); String data = String.join(",", vList); if (StringUtils.isNotBlank(data)) { List 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; } @@ -1483,13 +1490,12 @@ public class WmsHqlPack { * 给定字段动态in sql * * @param columnName - * @param vals + * @param values * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List vals) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List 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); From 9fabcbc85d005c4e53dd4fbc492b625e370cf516 Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Wed, 17 Apr 2019 19:44:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=20=E4=B8=9A=E5=8A=A1=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=B8=AD=E7=94=A8=E5=88=B0=E7=9A=84=E5=AF=B9=E8=B1=A1=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E5=8A=A0=E5=88=B0=20POJO=20=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/engine/rule/AgeLevel.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/AgeLevel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/AgeLevel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/AgeLevel.java new file mode 100644 index 0000000..e281e28 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/AgeLevel.java @@ -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; +} From a464028a3b78c4c24548375b9cb950ccb3316e41 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Wed, 17 Apr 2019 22:35:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 41 ++++++++++++++++++++++ .../pojo/sweb/bean/SwebProcurementPlanOrder.java | 4 +++ .../i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 17 +++++++++ .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 2 +- .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 4 +-- .../modelbean/SwebPODetailsUpdateHistoryModel.java | 2 +- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 3 ++ 7 files changed, 69 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 81e9435..47aba3c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -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; + } + } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java index 7990af5..df34d26 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java @@ -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; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 61f0e26..4927683 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -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; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index a47f959..3842ad7 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -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 = "预计到货日期") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index a1d0033..9ebcb79 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -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 = "零件号") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java index 7abfb33..8cbf146 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java @@ -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; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 4629b42..ea7eaa6 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -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); }