From 3192d0cd2d5722d1d59a8138396c7ff548bc877d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Sun, 28 Apr 2019 11:12:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?hqlpack=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 | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 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 8d48a59..b42fd28 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 @@ -932,17 +932,17 @@ public class WmsHqlPack { * @param wmsPackage * @return */ - public static String packWmsPackAge(WmsPackage wmsPackage) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsPackAge(WmsPackage wmsPackage) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); - HqlPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); - HqlPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); + DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); + DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); getStringBuilderPack(wmsPackage, result); - return result.toString(); + return result; } /** @@ -1390,20 +1390,20 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); - HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); - HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + public static DdlPackBean packHqlWmsStockSn(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); getStringBuilderPack(wmsStockSn, result); - return result.toString(); + return result; } /** @@ -1412,15 +1412,15 @@ public class WmsHqlPack { * @param wmsSnPrintRcd * @return */ - public static String packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result); + public static DdlPackBean packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsSnPrintRcd, result); - return result.toString(); + return result; } /** From 6d2f783930ad79198cc83ebb10e157d190a46a3c Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sun, 28 Apr 2019 11:17:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93=E3=80=81=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BA=A4=E6=98=93=E6=9D=A1=E7=A0=81sql=E4=BC=98?= =?UTF-8?q?=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 | 74 +++++++++++----------- 1 file changed, 37 insertions(+), 37 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 8d48a59..a43b6a5 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 @@ -895,14 +895,14 @@ public class WmsHqlPack { * @param tranNo * @return */ - public static String packWmsTransSn(String tranNo) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsTransSn(String tranNo) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(tranNo, "transNo", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getStringEqualPack(tranNo, "transNo", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - return result.toString(); + return result; } /** @@ -911,19 +911,19 @@ public class WmsHqlPack { * @param wmsTransQuan * @return */ - public static String packWmsTransQuan(WmsTransQuan wmsTransQuan) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsTransQuan(WmsTransQuan wmsTransQuan) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsTransQuan, result); - return result.toString(); + return result; } /** @@ -1390,20 +1390,20 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); - HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); - HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + public static DdlPackBean packHqlWmsStockSn(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); getStringBuilderPack(wmsStockSn, result); - return result.toString(); + return result; } /** @@ -1429,12 +1429,12 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); - HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); - return result.toString(); + public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + return result; } /** @@ -1443,12 +1443,12 @@ public class WmsHqlPack { * @param wmsStockQuan * @return */ - public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); + public static DdlPackBean packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsStockQuan, result); - return result.toString(); + return result; } /** From 0294f12b5b1d3f583ffe510a39f2a21895521449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Sun, 28 Apr 2019 11:22:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96hql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 32 ++++++++++------------ 1 file changed, 15 insertions(+), 17 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 b42fd28..10f86ec 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 @@ -728,21 +728,21 @@ public class WmsHqlPack { * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ - public static String packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) { + DdlPackBean result = new DdlPackBean(); // 来源单据类型 - HqlPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result); // 来源单据号 - HqlPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); // 打印机 - HqlPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); // 打印机状态 - HqlPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result); + DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result); getStringBuilderPack(wmsSnPrint, result); - return result.toString(); + return result; } /** @@ -826,25 +826,23 @@ public class WmsHqlPack { } /** - * 根据条件查询责任区分配信息封装类 - * - * @param wmsTempOrderLock 责任区分配信息 - * @return 责任区分配信息 + * 根据条件查询单据锁定封装类 + * @return 单据锁定信息 */ - public static String packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) { + DdlPackBean result = new DdlPackBean(); // 订单号 - HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); // 业务类型 - HqlPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); + DdlPreparedPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); // 物料代码 - HqlPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result); getStringBuilderPack(wmsTempOrderLock, result); - return result.toString(); + return result; } /** From 19f62ab85030abb36b942a1f899e4f42df373b6f Mon Sep 17 00:00:00 2001 From: Silliter Date: Sun, 28 Apr 2019 11:36:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 10 +++++----- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 9 ++++++++- .../i3plus/pojo/wms/bean/WmsActionStepCall.java | 12 ++++++------ .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 12 +++++++----- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 13 ++++++++----- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 12 +++++++----- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 11 ++++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 12 +++++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 10 +++++----- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 11 ++++++----- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 9 ++++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 20 +++++++++++++++----- .../estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 9 ++++++++- 16 files changed, 114 insertions(+), 57 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index c61f2c7..791465e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_ASN_MASTER") +@Table(name = "WMS_DOC_ASN_MASTER", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("ASN主表信息") public class WmsASNMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 42f8cf8..0acbebb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.util.List; @@ -28,7 +29,13 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_ASN_DETAILS") +@Table(name = "WMS_DOC_ASN_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SN_1D"), + @Index(columnList = "SN_2D"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("ASN订单明细信息") public class WmsASNMasterDetails extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 74eb9a6..c9e8915 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -4,17 +4,13 @@ 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.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 作业步骤调用 @@ -28,7 +24,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_STEP_CALL") +@Table(name="WMS_ACTION_STEP_CALL", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "AS_ID"), + @Index(columnList = "AM_ID") +}) @Api("作业步骤调用信息") public class WmsActionStepCall extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index db7518b..d075d60 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :移库单明细实体(用于转储类业务) @@ -26,7 +23,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_MOVEMENT_DETAILS") +@Table(name = "WMS_DOC_MOVEMENT_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SRC_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("移库单明细表") public class WmsDocMovementDetails extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index bd4c822..bff377e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -9,10 +9,7 @@ import lombok.ToString; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -27,7 +24,13 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_MOVEMENT_MASTER") +@Table(name = "WMS_DOC_MOVEMENT_MASTER", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "REF_NO"), + @Index(columnList = "ERP_SRC_NO"), + @Index(columnList = "BUSI_TYPE"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("移库单表") @ToString public class WmsDocMovementMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 1f090fe..9181e8a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 移库单条码表 @@ -27,7 +24,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_MOVEMENT_SN") +@Table(name="WMS_DOC_MOVEMENT_SN", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SN"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("移库条码信息") public class WmsDocMovementSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 32a91fa..3c78462 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 库存移动单明细信息 @@ -25,7 +22,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_DETAILS") +@Table(name="WMS_MOVE_DETAILS", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("库存移动单明细信息") public class WmsMoveDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 6926673..86e3fd6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_MOVE_MASTER") +@Table(name = "WMS_MOVE_MASTER", indexes = { + @Index(columnList = "TRANS_TYPE_CODE"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("库存移动单主表信息") public class WmsMoveMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 4231c17..28ddb48 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 库存移动单条码信息 @@ -26,7 +23,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_SN") +@Table(name="WMS_MOVE_SN", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "SN"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("库存移动单条码信息") public class WmsMoveSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 79d47dd..e2f4114 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_PO_MASTER") +@Table(name = "WMS_DOC_PO_MASTER", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("PO主表信息") public class WmsPOMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 1fc9671..8e8a2b3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : PO订单明细信息 @@ -26,7 +23,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_PO_DETAILS") +@Table(name = "WMS_DOC_PO_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("PO订单明细信息") public class WmsPOMasterDetails extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 9fdfdd0..1c3da68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,13 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_PO_SN") +@Table(name="WMS_DOC_PO_SN", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SN_1D"), + @Index(columnList = "SN_2D"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("PO条码信息") public class WmsPoSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index cddb417..fb9a9df 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -22,7 +23,11 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name = "WMS_STOCK_QUAN") +@Table(name = "WMS_STOCK_QUAN", indexes = { + @Index(columnList = "WH_NO"), + @Index(columnList = "ZONE_NO"), + @Index(columnList = "LOCATE_NO") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index dab72a9..8f88bd1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -10,10 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.Date; /** @@ -25,7 +22,20 @@ import java.util.Date; **/ @Data @Entity -@Table(name = "WMS_STOCK_SN") +@Table(name = "WMS_STOCK_SN", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "REF_SRC"), + @Index(columnList = "SN"), + @Index(columnList = "SN_2D"), + @Index(columnList = "WH_NO"), + @Index(columnList = "ZONE_NO"), + @Index(columnList = "LOCATE_NO"), + @Index(columnList = "LOT_NO"), + @Index(columnList = "FIX_LOT_NO"), + @Index(columnList = "DATE_CODE"), + @Index(columnList = "VENDOR_NO") + }) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 34b8db4..16b0109 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_TASK_DETAILS") +@Table(name = "WMS_TASK_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "ITEM_STATUS") +}) @Api("作业任务明细信息") public class WmsTaskDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 7c4009d..831b583 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,13 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_TRANS_QUAN") +@Table(name = "WMS_TRANS_QUAN", indexes = { + @Index(columnList = "WH_NO"), + @Index(columnList = "ZONE_NO"), + @Index(columnList = "LOCATE_NO"), + @Index(columnList = "REF_SRC"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("库存交易信息") public class WmsTransQuan extends BaseBean { From 48eedb360ec8748ed3b84da759114174ce652a1d Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sun, 28 Apr 2019 11:55:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2sql?= =?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 | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 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 56b4e51..47c5ee8 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 @@ -851,19 +851,19 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packWmsStockSn(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsStockSn(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); getStringBuilderPack(wmsStockSn, result); - return result.toString(); + return result; } /** @@ -1099,18 +1099,18 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "", + DdlPreparedPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "", WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue() + ""), "snStatus", result); //单号 - HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringLeftLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); getStringBuilderPack(wmsStockSn, result); - return result.toString(); + return result; } /**