公共询价单转询价报价单方法更新

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -182,15 +182,20 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
      */
     private PublicInquiryItem SaveInquiryItems(PublicInquiry inquiry, PublicInquiryItem inquiryItem) throws Exception {
         Set<PublicInquiryItem> items = new HashSet<PublicInquiryItem>();
-        int number = infoDao.countByInquiryId(inquiryItem.getInquiry().getId()) + 1;
+        int number = 1;
+        if (null != inquiryItem.getInquiry() && null != inquiryItem.getInquiry().getId()) {
+            number = infoDao.countByInquiryId(inquiryItem.getInquiry().getId()) + 1;
+        }
         if (null != inquiryItem) {
+            if (null == inquiryItem.getDate()) {
+                inquiryItem.setDate(new Date(System.currentTimeMillis()));
+            }
             inquiryItem.setInquiry(inquiry);
             inquiryItem.setNumber((short) number);
             inquiryItem.setCustLap(Constant.NO);
             inquiryItem.setSendStatus((short) Status.NOT_UPLOAD.value());
             inquiryItem.setSourceId(inquiryItem.getId());
             inquiryItem.setId(null);
-            inquiryItem.setDate(new Date());
             items.add(inquiryItem);
         }
         List<PublicInquiryItem> purcitems = infoDao.save(items);
@@ -275,6 +280,8 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 throw new Exception("询价单已存在，不允许再次报价");
             } else {
                 inquiryItem.setInquiry(inquiry);
+                inquiryItem.setId(id);// 这里设置id是为了后面赋值来源id
+                inquiryItem.setOfferTime(new Date(System.currentTimeMillis()));
                 inquiryItem = SaveInquiryItems(inquiry, inquiryItem);
                 if (null != inquiryItem.getId()) {
                     map.put("content", inquiryItem.getId());