Browse Source

新增共询价时如果物料原厂型号不存在或型号为“无”,将规格赋值给型号

hejq 7 years ago
parent
commit
ad6e650dfd

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

@@ -170,6 +170,10 @@ public class InquiryServiceImpl implements InquiryService {
                         item.setProdCode(item.getProduct().getCode());
                         item.setProdCode(item.getProduct().getCode());
                         item.setSpec(item.getProduct().getSpec());
                         item.setSpec(item.getProduct().getSpec());
                         item.setInbrand(item.getProduct().getBrand());
                         item.setInbrand(item.getProduct().getBrand());
+                        item.setCmpCode(item.getProduct().getCmpCode());
+                    }
+                    if (null == item.getCmpCode() || item.getCmpCode().equals("无")) {
+                        item.setCmpCode(item.getSpec());
                     }
                     }
                     items.add(item);
                     items.add(item);
                 }
                 }

+ 3 - 0
src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -454,6 +454,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             item.setUserCode(batch.getBip_buyercode());
                             item.setUserCode(batch.getBip_buyercode());
                             item.setOfferAmount(0);
                             item.setOfferAmount(0);
                             item.setEndDate(inquiry.getBi_enddate());
                             item.setEndDate(inquiry.getBi_enddate());
+                            if (null == item.getCmpCode() || item.getCmpCode().equals("无")) {
+                                item.setCmpCode(item.getSpec());
+                            }
                             if (null != inquiry.getBi_date()) {
                             if (null != inquiry.getBi_date()) {
                                 item.setDate(inquiry.getBi_date());
                                 item.setDate(inquiry.getBi_date());
                             } else {
                             } else {