Browse Source

处理物料影响的其他问题

hejq 7 years ago
parent
commit
0b0faaaf7a

+ 2 - 2
src/main/java/com/uas/platform/b2b/erp/model/PurchaseDetail.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.erp.model;
 
-import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.ProductInfo;
 import com.uas.platform.b2b.model.PurcOrderInfoItem;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
@@ -144,7 +144,7 @@ public class PurchaseDetail {
 		item.setVendspec(this.pd_vendspec);
 		item.setRemark(this.pd_remark);
 		item.setStatus((short) Status.NOT_REPLY.value());
-		Product product = new Product();
+		ProductInfo product = new ProductInfo();
 		product.setCode(this.pd_prodcode);
 		product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 		item.setProduct(product);

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

@@ -115,12 +115,11 @@ public class PurchaseServiceImpl implements PurchaseService {
 						item.setOrder(order);
 						item.setStatus((short) Status.NOT_REPLY.value());
 						// 取平台的产品ID
-						Product product = item.getProduct();
+						ProductInfo product = item.getProduct();
 						List<Product> products = productDao.findByEnUUAndCode(product.getEnUU(), product.getCode());
 						if (products.size() > 0) {
-							item.setProduct(products.get(0));
 							item.setProductId(products.get(0).getId());
-							item.setErpDate(new Date());
+							item.setErpDate(new Date(System.currentTimeMillis()));
 							orderItems.add(item);
 						} else {
 							if (StringUtils.isEmpty(sign)) {