ERP公共询价上传增加物料冗余字段

src/main/java/com/uas/ps/inquiry/entity/BatchInProduct.java

@@ -57,6 +57,25 @@ public class BatchInProduct {
      */
     private Double ycgqty;
 
+    /**
+     * 物料名称
+     */
+    private String pr_detail;
+
+    /**
+     * 物料规格
+     */
+    private String pr_spec;
+
+    /**
+     * 物料品牌
+     */
+    private String pr_brand;
+
+    /**
+     * 原厂型号
+     */
+    private String pr_orispeccode;
 
     public Long getBip_id() {
         return bip_id;
@@ -137,4 +156,36 @@ public class BatchInProduct {
     public void setYcgqty(Double ycgqty) {
         this.ycgqty = ycgqty;
     }
+
+    public String getPr_detail() {
+        return pr_detail;
+    }
+
+    public void setPr_detail(String pr_detail) {
+        this.pr_detail = pr_detail;
+    }
+
+    public String getPr_spec() {
+        return pr_spec;
+    }
+
+    public void setPr_spec(String pr_spec) {
+        this.pr_spec = pr_spec;
+    }
+
+    public String getPr_brand() {
+        return pr_brand;
+    }
+
+    public void setPr_brand(String pr_brand) {
+        this.pr_brand = pr_brand;
+    }
+
+    public String getPr_orispeccode() {
+        return pr_orispeccode;
+    }
+
+    public void setPr_orispeccode(String pr_orispeccode) {
+        this.pr_orispeccode = pr_orispeccode;
+    }
 }

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

@@ -450,21 +450,23 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     if (!CollectionUtils.isEmpty(inquiry.getInProducts())) {
                         for (BatchInProduct batch : inquiry.getInProducts()) {
                             PurcInquiryItem item = new PurcInquiryItem();
-                            item.setIsOpen(Constant.YES);
                             List<Product> products = productDao.findByEnUUAndCode(enuu, batch.getBip_prodcode());
-                            if (CollectionUtils.isEmpty(products)) {
-                                throw new NotFoundException("enUU:[" + enuu + "],编号:[" + batch.getBip_prodcode() + "]");
+                            if (!CollectionUtils.isEmpty(products)) {
+                                item.setProductId(products.get(0).getId());
+                                item.setCmpCode(products.get(0).getCmpCode());
+                                item.setInbrand(products.get(0).getBrand());
+                                item.setProdTitle(products.get(0).getTitle());
+                                item.setSpec(products.get(0).getSpec());
+                            } else {
+                                item.setCmpCode(batch.getPr_orispeccode());
+                                item.setInbrand(batch.getPr_brand());
+                                item.setProdTitle(batch.getPr_detail());
+                                item.setSpec(batch.getPr_spec());
                             }
-                            item.setProductId(products.get(0).getId());
-                            item.setCmpCode(products.get(0).getCmpCode());
-                            item.setInbrand(products.get(0).getBrand());
-                            item.setProdTitle(products.get(0).getTitle());
-                            item.setSpec(products.get(0).getSpec());
+                            item.setProdCode(batch.getBip_prodcode());
                             item.setRemark(batch.getBip_remark());
-                            item.setProdCode(products.get(0).getCode());
-                            item.setProdTitle(products.get(0).getTitle());
                             item.setNumber(batch.getBip_detno());
-                            item.setFromDate(new Date());
+                            item.setFromDate(new Date(System.currentTimeMillis()));
                             item.setToDate(purcInquiry.getEndDate());
                             item.setStatus((short) Status.NOT_REPLY.value());
                             item.setIsOpen(Constant.YES);