Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2b/service/impl/PurcInquiryServiceImpl.java

@@ -554,6 +554,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 				inquiry.setIfTax(inquiryInfo.getIfTax());
 				inquiry.setInquirytype(inquiryInfo.getInquirytype());
                 inquiry.setEnteryStatus(Status.ENABLED.value());
+                inquiry.setSourceapp(SOURCERAPP);
 				Set<PurcInquiryItem> items = new HashSet<PurcInquiryItem>();
 				Short i = 1;
 				if (!CollectionUtils.isEmpty(inquiryInfo.getInquiryItems())) {
@@ -585,6 +586,10 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 								product.setSpec(purcitem.getProdTitle());
 								Long proId = ProductUtils.updateOne(product);
 								product = productDao.findOne(proId);
+								item.setProdCode(purcitem.getProdCode());
+								item.setProdTitle(purcitem.getProdTitle());
+								item.setSpec(purcitem.getSpec());
+								item.setCmpCode(purcitem.getCmpCode());
 								if (null != product) {
 									item.setProductId(proId);
 								} else {