Browse Source

ERP上传采购单到平台默认设置明细状态为待回复

hejq 8 years ago
parent
commit
a74ce56add

+ 1 - 1
src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseServiceImpl.java

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.MessageLog;
@@ -97,6 +96,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 					order.setUser(null);
 					for (PurcOrderInfoItem item : order.getOrderItems()) {
 						item.setOrder(order);
+						item.setStatus((short) Status.NOT_REPLY.value());
 						// 取平台的产品ID
 						Product product = item.getProduct();
 						List<Product> products = productDao.findByEnUUAndCode(product.getEnUU(), product.getCode());

+ 7 - 3
src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -533,12 +533,16 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 				pageInfo.expression(PredicateUtils.in("id", lists, false));
 			}
 
-			if (filter.getFromDate() != null)
+			if (filter.getFromDate() != null) {
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-			if (filter.getEndDate() != null)
+			}
+			if (filter.getEndDate() != null) {
 				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
-			if (!CollectionUtils.isEmpty(filter.getDistribute()))
+			}
+			if (!CollectionUtils.isEmpty(filter.getDistribute())) {
 				pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+			}
+			pageInfo.expression(PredicateUtils.eq("status", Status.NOT_REPLY.value(), false));
 		}
 		Page<PurchaseOrderTodo> pageOrders = purchaseOrderTodoDao.findAll(new Specification<PurchaseOrderTodo>() {
 			@Override