Browse Source

转报价时将物料冗余字段更新保存到新的报价单中

hejq 8 years ago
parent
commit
2ac3cc8f2b

+ 4 - 1
src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -192,7 +192,10 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         }
         if (null != inquiryItem) {
             Enterprise enterprise = enterpriseDao.findOne(inquiryItem.getVendUU());
-            if (inquiryItem.getProdCode() == null && inquiryItem.getProduct() != null) {
+            if (null != inquiryItem.getProduct()) {
+                inquiryItem.setProdTitle(inquiryItem.getProduct().getTitle());
+                inquiryItem.setSpec(inquiryItem.getProduct().getSpec());
+                inquiryItem.setInbrand(inquiryItem.getProduct().getBrand());
                 inquiryItem.setProdCode(inquiryItem.getProduct().getCode());
             }
             inquiryItem.setVendName(enterprise.getEnName());

+ 2 - 2
src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -128,16 +128,16 @@ public class InquiryServiceImpl implements InquiryService {
                 List<PurcInquiryItem> items = new ArrayList<PurcInquiryItem>();
                 for (PurcInquiryItem item : currentInquiry.getInquiryItems()) {
                     item.setInquiry(inquiry);
+                    item.setOfferAmount(0);
                     if (null == item.getDate()) {
                         item.setDate(new Date(System.currentTimeMillis()));
                     }
                     // 这里设置物料信息的冗余字段
-                    if (null!= item.getProduct()) {
+                    if (null != item.getProduct()) {
                         item.setProdTitle(item.getProduct().getTitle());
                         item.setProdCode(item.getProduct().getCode());
                         item.setSpec(item.getProduct().getSpec());
                         item.setInbrand(item.getProduct().getBrand());
-                        item.setOfferAmount(0);
                     }
                     items.add(item);
                 }