给商品增加“规格”字段

src/main/java/com/jsh/action/materials/DepotItemAction.java

@@ -153,8 +153,9 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
                     item.put("Id", depotItem.getId());
                     item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
                     String MaterialName = ((depotItem.getMaterialId().getModel().equals(""))?"":""+depotItem.getMaterialId().getModel())+" "+depotItem.getMaterialId().getName()
-                    +((depotItem.getMaterialId().getColor() == null)?"(":"("+depotItem.getMaterialId().getColor()) + ")"
+                    +((depotItem.getMaterialId().getStandard() == null||depotItem.getMaterialId().getStandard().equals(""))?"":"("+depotItem.getMaterialId().getStandard() + ")")
-                    +((depotItem.getMaterialId().getUnit() == null)?"(":"("+depotItem.getMaterialId().getUnit()) + ")";
+                    +((depotItem.getMaterialId().getColor() == null||depotItem.getMaterialId().getColor().equals(""))?"":"("+depotItem.getMaterialId().getColor() + ")")
+                    +((depotItem.getMaterialId().getUnit() == null||depotItem.getMaterialId().getUnit().equals(""))?"":"("+depotItem.getMaterialId().getUnit() + ")");
                     item.put("MaterialName", MaterialName);
                     item.put("OperNumber", depotItem.getOperNumber());
                     item.put("UnitPrice", depotItem.getUnitPrice());
@@ -210,6 +211,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
                     item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
                     item.put("MaterialName", depotItem.getMaterialId().getName());
                     item.put("MaterialModel", depotItem.getMaterialId().getModel());
+                    item.put("MaterialStandard", depotItem.getMaterialId().getStandard());
                     item.put("MaterialColor", depotItem.getMaterialId().getColor());
                     item.put("MaterialUnit", depotItem.getMaterialId().getUnit());
                     item.put("prevSum", prevSum);
@@ -266,6 +268,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
                     item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
                     item.put("MaterialName", depotItem.getMaterialId().getName());
                     item.put("MaterialModel", depotItem.getMaterialId().getModel());
+                    item.put("MaterialStandard", depotItem.getMaterialId().getStandard());
                     item.put("MaterialColor", depotItem.getMaterialId().getColor());
                     item.put("MaterialUnit", depotItem.getMaterialId().getUnit());
                     item.put("InSum", InSum);
@@ -324,6 +327,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
                     item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
                     item.put("MaterialName", depotItem.getMaterialId().getName());
                     item.put("MaterialModel", depotItem.getMaterialId().getModel());
+                    item.put("MaterialStandard", depotItem.getMaterialId().getStandard());
                     item.put("MaterialColor", depotItem.getMaterialId().getColor());
                     item.put("MaterialUnit", depotItem.getMaterialId().getUnit());
                     item.put("OutSum", OutSumRetail + OutSum);
@@ -418,6 +422,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
                     item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
                     item.put("MaterialName", depotItem.getMaterialId().getName());
                     item.put("MaterialModel", depotItem.getMaterialId().getModel());
+                    item.put("MaterialStandard", depotItem.getMaterialId().getStandard());
                     item.put("MaterialColor", depotItem.getMaterialId().getColor());
                     item.put("MaterialUnit", depotItem.getMaterialId().getUnit());
                     item.put("prevSum", prevSum);

src/main/java/com/jsh/action/materials/MaterialAction.java

@@ -43,6 +43,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
 			
 			material.setName(model.getName());
 			material.setModel(model.getModel());
+            material.setStandard(model.getStandard());
 			material.setColor(model.getColor());
 			material.setUnit(model.getUnit());
             material.setRetailPrice(model.getRetailPrice());
@@ -124,6 +125,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
 			
 			material.setName(model.getName());
 			material.setModel(model.getModel());
+            material.setStandard(model.getStandard());
 			material.setColor(model.getColor());
 			material.setUnit(model.getUnit());
             material.setRetailPrice(model.getRetailPrice());
@@ -223,6 +225,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
                     item.put("Id", material.getId());
                     item.put("Name", material.getName());
                     item.put("Model", material.getModel());
+                    item.put("Standard", material.getStandard());
                     item.put("Color", material.getColor());
                     item.put("Unit", material.getUnit());
                     item.put("RetailPrice", material.getRetailPrice());
@@ -271,6 +274,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
                     item.put("Id", material.getId());
                     item.put("Name", material.getName());
                     item.put("Model", material.getModel());
+                    item.put("Standard", material.getStandard());
                     item.put("Color", material.getColor());
                     item.put("Unit", material.getUnit());
                     item.put("RetailPrice", material.getRetailPrice());
@@ -320,6 +324,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
                     item.put("Id", material.getId());
                     //名称
                     String MaterialName = ((material.getModel().equals(""))?"":""+material.getModel()) +" "+ material.getName()
+                    + ((material.getStandard() == null || material.getStandard().equals(""))?"":"("+material.getStandard() + ")")
                     + ((material.getColor() == null || material.getColor().equals(""))?"":"("+material.getColor() + ")")
                     + ((material.getUnit() == null || material.getUnit().equals(""))?"":"("+material.getUnit() + ")");
                     item.put("MaterialName", MaterialName);

src/main/java/com/jsh/model/po/Material.java

@@ -7,6 +7,7 @@ public class Material implements java.io.Serializable
 	private MaterialCategory materialCategory;
 	private String Name;
 	private String Model;
+	private String Standard;
 	private String Color;
 	private String Unit;
     private Double RetailPrice;
@@ -26,13 +27,14 @@ public class Material implements java.io.Serializable
 	}
 
 	public Material(MaterialCategory materialCategory, String name,
-                    String model, String color, String unit, String remark,
+                    String model, String standard, String color, String unit, String remark,
                     Double retailPrice, Double lowPrice, Double presetPriceOne, Double presetPriceTwo)
     {
 		super();
 		this.materialCategory = materialCategory;
 		Name = name;
 		Model = model;
+		Standard = standard;
 		Color = color;
 		Unit = unit;
         RetailPrice = retailPrice;
@@ -82,6 +84,14 @@ public class Material implements java.io.Serializable
 		Model = model;
 	}
 
+	public String getStandard() {
+		return Standard;
+	}
+
+	public void setStandard(String standard) {
+		Standard = standard;
+	}
+
 	public String getColor()
     {
 		return Color;

src/main/java/com/jsh/model/vo/materials/MaterialModel.java

@@ -18,6 +18,11 @@ public class MaterialModel implements Serializable
      */
     private String Model = "";
 
+	/**
+	 * 规格
+	 */
+	private String Standard = "";
+    
     /**
      * 颜色
      */
@@ -112,6 +117,14 @@ public class MaterialModel implements Serializable
 		Model = model;
 	}
 
+	public String getStandard() {
+		return Standard;
+	}
+
+	public void setStandard(String standard) {
+		Standard = standard;
+	}
+
 	public String getColor() {
 		return Color;
 	}

src/main/java/com/jsh/service/materials/DepotItemService.java

@@ -89,8 +89,8 @@ public class DepotItemService extends BaseService<DepotItem> implements DepotIte
 			workbook = Workbook.createWorkbook(os);
 			WritableSheet sheet = workbook.createSheet("进销存报表", 0);
 			//增加列头
-			int[] colunmWidth = {10,10,10,10,10,15,15,15,15,15};
+			int[] colunmWidth = {10,10,10,10,10,10,15,15,15,15,15};
-			String[] colunmName = {"名称","型号","颜色","单位","单价","上月结存数量","入库数量","出库数量","本月结存数量","结存金额"};
+			String[] colunmName = {"名称","型号","规格","颜色","单位","单价","上月结存数量","入库数量","出库数量","本月结存数量","结存金额"};
 			for(int i = 0 ;i < colunmWidth.length;i ++)
 			{
 				sheet.setColumnView(i,colunmWidth[i]);
@@ -102,16 +102,17 @@ public class DepotItemService extends BaseService<DepotItem> implements DepotIte
 			    	JSONObject jo = JSONObject.fromObject(dataArray.get(j)); 
 		    		sheet.addCell(new Label(0, j+1, jo.getString("MaterialName")));
 		    		sheet.addCell(new Label(1, j+1, jo.getString("MaterialModel")));
-		    		sheet.addCell(new Label(2, j+1, jo.getString("MaterialColor")));
+					sheet.addCell(new Label(2, j+1, jo.getString("MaterialStandard")));
-					sheet.addCell(new Label(3, j+1, jo.getString("MaterialUnit")));
+		    		sheet.addCell(new Label(3, j+1, jo.getString("MaterialColor")));
-		    		sheet.addCell(new Label(4, j+1, jo.getString("UnitPrice")));
+					sheet.addCell(new Label(4, j+1, jo.getString("MaterialUnit")));
-		    		sheet.addCell(new Label(5, j+1, jo.getString("prevSum")));
+		    		sheet.addCell(new Label(5, j+1, jo.getString("UnitPrice")));
-		    		sheet.addCell(new Label(6, j+1, jo.getString("InSum")));
+		    		sheet.addCell(new Label(6, j+1, jo.getString("prevSum")));
-		    		sheet.addCell(new Label(7, j+1, jo.getString("OutSum")));
+		    		sheet.addCell(new Label(7, j+1, jo.getString("InSum")));
-		    		sheet.addCell(new Label(8, j+1, jo.getString("thisSum")));
+		    		sheet.addCell(new Label(8, j+1, jo.getString("OutSum")));
+		    		sheet.addCell(new Label(9, j+1, jo.getString("thisSum")));
 		    		double d = Double.parseDouble(jo.getString("thisAllPrice").toString()); 
 		    		String s1 = String.format("%.2f", d);  		
-		    		sheet.addCell(new Label(9, j+1, s1));
+		    		sheet.addCell(new Label(10, j+1, s1));
 			    }
 			}			
 			workbook.write();

src/main/resources/hibernate/Material.hbm.xml

@@ -20,6 +20,11 @@
                 <comment>型号</comment>
             </column>
         </property>
+        <property generated="never" lazy="false" name="Standard" type="java.lang.String">
+            <column length="50" name="Standard">
+                <comment>规格</comment>
+            </column>
+        </property>
         <property generated="never" lazy="false" name="Color" type="java.lang.String">
             <column length="50" name="Color">
                 <comment>颜色</comment>

src/main/webapp/pages/materials/material.jsp

@@ -48,53 +48,49 @@
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
-	    <div id="materialDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
+	    <div id="materialDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 	        <form id="materialFM" method="post"  novalidate>
 	            <table>
 	            <tr>
 	            <td>名称</td>
-	            <td style="padding:5px"><input name="Name" id="Name" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 180px;height: 20px"/></td>
+	            <td style="padding:5px" colspan="3"><input name="Name" id="Name" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 180px;height: 20px"/></td>
 	            </tr>
 	            <tr>
 	            <td>类别</td>
-	            <td style="padding:5px">
+	            <td style="padding:5px" colspan="3">
-                <select name="CategoryId_f" id="CategoryId_f" style="width:180px;height: 20px"></select><br/>
+                <select name="CategoryId_f" id="CategoryId_f" style="width:145px;height: 20px"></select>
-                <select name="CategoryId_s" id="CategoryId_s" style="width:180px;height: 20px"></select><br/>
+                <select name="CategoryId_s" id="CategoryId_s" style="width:145px;height: 20px"></select>
-                <select name="CategoryId_t" id="CategoryId_t" style="width:180px;height: 20px"></select>
+                <select name="CategoryId_t" id="CategoryId_t" style="width:145px;height: 20px"></select>
                 </td>
 	            </tr>
 	            <tr>
 					<td>型号</td>
 					<td style="padding:5px"><input name="Model" id="Model" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
+					<td>规格</td>
+					<td style="padding:5px"><input name="Standard" id="Standard" class="easyui-validatebox" data-options="validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
 				</tr>
 	            <tr>
 					<td>颜色</td>
 					<td style="padding:5px"><input name="Color" id="Color" class="easyui-validatebox" data-options="validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
-	            </tr>
-	            <tr>	          
 					<td>单位</td>
-	            <td style="padding:5px"><input name="Unit" id="Unit" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
+					<td style="padding:5px"><input name="Unit" id="Unit" class="easyui-validatebox" data-options="validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
 	            </tr>
 	            <tr>
 					<td>零售价</td>
 					<td style="padding:5px"><input name="RetailPrice" id="RetailPrice" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
-                </tr>
-	            <tr>
 					<td>最低售价</td>
 					<td style="padding:5px"><input name="LowPrice" id="LowPrice" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
 				</tr>
 	            <tr>      
 					<td>预设售价一</td>
 					<td style="padding:5px"><input name="PresetPriceOne" id="PresetPriceOne" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
-                </tr>
-	            <tr>  
 					<td>预设售价二</td>
 					<td style="padding:5px"><input name="PresetPriceTwo" id="PresetPriceTwo" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
 				</tr>
 	            <tr>
 	            <td>备注</td>
-	            <td style="padding:5px"><input name="Remark" id="Remark" style="width: 180px;height: 20px"/></td>
+	            <td style="padding:5px" colspan="3"><input name="Remark" id="Remark" style="width: 440px;height: 20px"/></td>
 	            </tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
@@ -317,17 +313,17 @@
 					  { field: 'Id',width:35,align:"center",checkbox:true},
 			          { title: '名称',field: 'Name',width:80},
 			          { title: '型号',field: 'Model',width:80},
-    		          { title: '颜色',field: 'Color',width:40},
+					  { title: '规格',field: 'Standard',width:80},
-			          { title: '单位',field: 'Unit',width:50},
+    		          { title: '颜色',field: 'Color',width:60},
-			          { title: '零售价',field: 'RetailPrice',width:50},
+			          { title: '单位',field: 'Unit',width:60},
+			          { title: '零售价',field: 'RetailPrice',width:60},
 			          { title: '最低售价',field: 'LowPrice',width:70},
 			          { title: '预设售价一',field: 'PresetPriceOne',width:70},
 			          { title: '预设售价二',field: 'PresetPriceTwo',width:70},
-			          { title: '备注',field: 'Remark',width:90},
+			          { title: '操作',field: 'op',align:"center",width:110,formatter:function(value,rec)
-			          { title: '操作',field: 'op',align:"center",width:150,formatter:function(value,rec)
 			         	{
 							var str = '';
-							var rowInfo = rec.Id + 'AaBb' + rec.Name+ 'AaBb' + rec.Model + 'AaBb' + rec.Color + 'AaBb' + rec.Unit + 'AaBb' + rec.RetailPrice + 'AaBb' + rec.LowPrice + 'AaBb' + rec.PresetPriceOne + 'AaBb' + rec.PresetPriceTwo + 'AaBb' + rec.Remark;
+							var rowInfo = rec.Id + 'AaBb' + rec.Name+ 'AaBb' + rec.Model + 'AaBb' + rec.Color + 'AaBb' + rec.Unit + 'AaBb' + rec.RetailPrice + 'AaBb' + rec.LowPrice + 'AaBb' + rec.PresetPriceOne + 'AaBb' + rec.PresetPriceTwo + 'AaBb' + rec.Remark + 'AaBb' + rec.Standard;
         					if(1 == value)
         					{
         						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editMaterial(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
@@ -556,6 +552,7 @@
 								CategoryId : parent,
 								Name : $.trim($("#Name").val()),
 								Model : $.trim($("#Model").val()),
+								Standard : $.trim($("#Standard").val()),
 								Color : $.trim($("#Color").val()),
 								Unit : $.trim($("#Unit").val()),
 								RetailPrice : $.trim($("#RetailPrice").val()),
@@ -601,8 +598,9 @@
 	            $("#clientIp").val('<%=clientIp %>');
 	            $("#Name").focus().val(materialInfo[1]);
 	            $("#Model").val(materialInfo[2]);
-	            $("#Color").val(materialInfo[3]);
+				$("#Standard").val(materialInfo[10]=="undefined"?"":materialInfo[10]);
-	            $("#Unit").val(materialInfo[4]);
+	            $("#Color").val(materialInfo[3]=="undefined"?"":materialInfo[3]);
+	            $("#Unit").val(materialInfo[4]=="undefined"?"":materialInfo[4]);
 	            $("#RetailPrice").val(materialInfo[5]);
 	            $("#LowPrice").val(materialInfo[6]);
 	            $("#PresetPriceOne").val(materialInfo[7]);

src/main/webapp/pages/reports/buy_in_report.jsp

@@ -79,6 +79,7 @@
 					columns:[[
 			          { title: '名称',field: 'MaterialName',width:60},
 			          { title: '型号',field: 'MaterialModel',width:80},
+					  { title: '规格',field: 'MaterialStandard',width:80},
 			          { title: '颜色',field: 'MaterialColor',width:80},
 					  { title: '单位',field: 'MaterialUnit',width:80},
 			          { title: '进货数量',field: 'InSum',width:60},			          

src/main/webapp/pages/reports/in_out_stock_report.jsp

@@ -99,6 +99,7 @@
 					columns:[[
 			          { title: '名称',field: 'MaterialName',width:60},
 			          { title: '型号',field: 'MaterialModel',width:80},
+					  { title: '规格',field: 'MaterialStandard',width:80},
 			          { title: '颜色',field: 'MaterialColor',width:80},
 					  { title: '单位',field: 'MaterialUnit',width:80},
 			          { title: '单价',field: 'UnitPrice',width:60,formatter: function(value,row,index){

src/main/webapp/pages/reports/sale_out_report.jsp

@@ -81,6 +81,7 @@
 					columns:[[
 			          { title: '名称',field: 'MaterialName',width:60},
 			          { title: '型号',field: 'MaterialModel',width:80},
+					  { title: '规格',field: 'MaterialStandard',width:80},
 			          { title: '颜色',field: 'MaterialColor',width:80},
 					  { title: '单位',field: 'MaterialUnit',width:80},
 			          { title: '销售数量',field: 'OutSum',width:60},