公共询价列表增加返回字段值

src/main/java/com/uas/platform/b2b/model/PurcInquiryItemInfo.java

@@ -229,6 +229,50 @@ public class PurcInquiryItemInfo {
 	private Short agreed;
 	/****** end ******/
 
+    /**
+     * ************* 上传的物料信息，因为可能是手动输入的，物料款不存在，需要先进行保存物料 *************
+     */
+
+    /**
+     * 物料编号
+     */
+    @Column(name = "id_prodcode")
+    private String prodCode;
+
+    /**
+     * 名称
+     */
+    @Column(name = "id_prodtitle")
+    private String prodTitle;
+
+    /**
+     * 规格
+     */
+    @Column(name = "id_prodspec")
+    private String spec;
+
+    /**
+     * 单位
+     */
+    @Column(name = "id_unit")
+    private String unit;
+
+    /**
+     * 型号
+     */
+    @Column(name = "id_cmpcode")
+    private String cmpCode;
+
+    /**
+     * 品牌
+     */
+    @Column(name = "id_inbrand")
+    private String inbrand;
+
+    /**
+     * **end***
+     */
+
 	public Long getId() {
 		return id;
 	}
@@ -508,4 +552,52 @@ public class PurcInquiryItemInfo {
 	public void setQuteId(Long quteId) {
 		this.quteId = quteId;
 	}
+
+    public String getProdCode() {
+        return prodCode;
+    }
+
+    public void setProdCode(String prodCode) {
+        this.prodCode = prodCode;
+    }
+
+    public String getProdTitle() {
+        return prodTitle;
+    }
+
+    public void setProdTitle(String prodTitle) {
+        this.prodTitle = prodTitle;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getCmpCode() {
+        return cmpCode;
+    }
+
+    public void setCmpCode(String cmpCode) {
+        this.cmpCode = cmpCode;
+    }
+
+    public String getInbrand() {
+        return inbrand;
+    }
+
+    public void setInbrand(String inbrand) {
+        this.inbrand = inbrand;
+    }
 }

src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html

@@ -390,10 +390,10 @@
                                <tbody ng-if="active == 'all'">
                                     <tr ng-repeat="inquiryItem in $data">
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.date| date: 'yyyy-MM-dd'"></td>
-                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.brand || inquiryItem.inbrand"></td>
-                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.title || inquiryItem.prodTitle"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.brand || inquiryItem.inbrand || '无'"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.title || inquiryItem.prodTitle || '无'"></td>
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.cmpCode || inquiryItem.cmpCode"></td>
-                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.spec || inquiryItem.spec"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.spec || inquiryItem.spec || '无'"></td>
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.needquantity"></td>
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.enterprise.enName"><a></a></td>
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.endDate| date: 'yyyy-MM-dd'"></td>