Browse Source

创建单据明细索引时对detno进行非空判断

sunyj 9 years ago
parent
commit
428a74a40f

+ 8 - 6
search-console/src/main/java/com/uas/search/console/util/ObjectToDocumentUtils.java

@@ -102,8 +102,9 @@ public class ObjectToDocumentUtils {
 	 */
 	public static Document toDocument(OrderDetailSimpleInfo orderDetail) {
 		if (orderDetail == null || orderDetail.getId() == null || StringUtils.isEmpty(orderDetail.getCode())
-				|| orderDetail.getOrderid() == null || StringUtils.isEmpty(orderDetail.getCmpCode())
-				|| StringUtils.isEmpty(orderDetail.getKiName()) || StringUtils.isEmpty(orderDetail.getBrName())) {
+				|| orderDetail.getOrderid() == null || orderDetail.getDetno() == null
+				|| StringUtils.isEmpty(orderDetail.getCmpCode()) || StringUtils.isEmpty(orderDetail.getKiName())
+				|| StringUtils.isEmpty(orderDetail.getBrName())) {
 			return null;
 		}
 		Document document = new Document();
@@ -163,7 +164,7 @@ public class ObjectToDocumentUtils {
 	public static Document toDocument(OrderInvoiceDetailSimpleInfo orderInvoiceDetail) {
 		if (orderInvoiceDetail == null || orderInvoiceDetail.getId() == null
 				|| StringUtils.isEmpty(orderInvoiceDetail.getCode()) || orderInvoiceDetail.getInvoiceid() == null
-				|| StringUtils.isEmpty(orderInvoiceDetail.getCmpCode())
+				|| orderInvoiceDetail.getDetno() == null || StringUtils.isEmpty(orderInvoiceDetail.getCmpCode())
 				|| StringUtils.isEmpty(orderInvoiceDetail.getKiName())
 				|| StringUtils.isEmpty(orderInvoiceDetail.getBrName())) {
 			return null;
@@ -219,8 +220,9 @@ public class ObjectToDocumentUtils {
 	 */
 	public static Document toDocument(PurchaseDetailSimpleInfo purchaseDetail) {
 		if (purchaseDetail == null || purchaseDetail.getId() == null || StringUtils.isEmpty(purchaseDetail.getCode())
-				|| purchaseDetail.getPurchaseid() == null || StringUtils.isEmpty(purchaseDetail.getCmpCode())
-				|| StringUtils.isEmpty(purchaseDetail.getKiName()) || StringUtils.isEmpty(purchaseDetail.getBrName())) {
+				|| purchaseDetail.getPurchaseid() == null || purchaseDetail.getDetno() == null
+				|| StringUtils.isEmpty(purchaseDetail.getCmpCode()) || StringUtils.isEmpty(purchaseDetail.getKiName())
+				|| StringUtils.isEmpty(purchaseDetail.getBrName())) {
 			return null;
 		}
 		Document document = new Document();
@@ -276,7 +278,7 @@ public class ObjectToDocumentUtils {
 	public static Document toDocument(PurchaseInvoiceDetailSimpleInfo purchaseInvoiceDetail) {
 		if (purchaseInvoiceDetail == null || purchaseInvoiceDetail.getId() == null
 				|| StringUtils.isEmpty(purchaseInvoiceDetail.getCode()) || purchaseInvoiceDetail.getInvoiceid() == null
-				|| StringUtils.isEmpty(purchaseInvoiceDetail.getCmpCode())
+				|| purchaseInvoiceDetail.getDetno() == null || StringUtils.isEmpty(purchaseInvoiceDetail.getCmpCode())
 				|| StringUtils.isEmpty(purchaseInvoiceDetail.getKiName())
 				|| StringUtils.isEmpty(purchaseInvoiceDetail.getBrName())) {
 			return null;