完善商品添加

src/main/java/com/originspark/drp/models/resources/Ware.java

@@ -183,6 +183,18 @@ public class Ware extends AbstractModel {
         this.inventories = inventories;
     }
 
+    public int getCountOfInCosts(){
+        return getInCosts().size();
+    }
+
+    public int getCountOfOutCosts(){
+        return getOutCosts().size();
+    }
+
+    public int getCountOfInventories(){
+        return getInventories().size();
+    }
+
     @Override
     public String toString() {
         return "Ware(商品) => [" + super.toString() + ", name=" + name + ", brand=" + brand + ", model=" + model + ", unit=" + unit + "]";
@@ -194,20 +206,19 @@ public class Ware extends AbstractModel {
         Vendor vendor = getVendor();
         if (vendor != null) {
             vendorUI.put("id", vendor.getId());
-            vendorUI.put("name", vendor.getName());
+            vendorUI.put("contactMan", vendor.getContactMan());
         }
         return vendorUI;
     }
 
-    public int getCountOfInCosts(){
-        return getInCosts().size();
-    }
-    
-    public int getCountOfOutCosts(){
-        return getOutCosts().size();
+    @JsonProperty("category")
+    public Map<String, Object> getCategoryUI() {
+        Map<String, Object> categoryUI = new HashMap<String, Object>();
+        WareCategory category = getCategory();
+        if (category != null) {
+            categoryUI.put("id", category.getId());
+            categoryUI.put("name", category.getName());
         }
-    
-    public int getCountOfInventories(){
-        return getInventories().size();
+        return categoryUI;
     }
 }

src/main/webapp/drp/app/view/resources/WareView.js

@@ -96,8 +96,11 @@ Ext.define('drp.app.view.resources.WareView', {
                     dataIndex : 'name',
                     text : '品名',
                     renderer : function(value, mate, record) {
+                        if(record.data['category.name']) {
                             return record.data['category.name'] + '-' + value;
                         }
+                        return value;
+                    }
                 }, {
                     xtype : 'gridcolumn',
                     width : 160,

src/main/webapp/drp/app/view/resources/WareViewForm.js

@@ -126,7 +126,7 @@ Ext.define("drp.app.view.resources.WareViewForm", {
             margin : '5 0 0 5',
             name : 'vendor.id',
             valueField : 'id',
-            displayField : 'name',
+            displayField : 'contactMan',
             editable : false,
             store : 'drp.app.store.resources.VendorStore',
             fieldLabel : '供应商'