优化界面，给商品和单位模块增加了部分字段

WebRoot/WEB-INF/classes/com/jsh/model/po/Material.hbm.xml

@@ -30,6 +30,26 @@
                 <comment>单位</comment>
             </column>
         </property>
+        <property generated="never" lazy="false" name="RetailPrice" type="java.lang.Double">
+            <column name="RetailPrice" precision="22" scale="3">
+                <comment>零售价</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="LowPrice" type="java.lang.Double">
+            <column name="LowPrice" precision="22" scale="3">
+                <comment>最低售价</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="PresetPriceOne" type="java.lang.Double">
+            <column name="PresetPriceOne" precision="22" scale="3">
+                <comment>预设售价一</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="PresetPriceTwo" type="java.lang.Double">
+            <column name="PresetPriceTwo" precision="22" scale="3">
+                <comment>预设售价二</comment>
+            </column>
+        </property>
         <property generated="never" lazy="false" name="Remark" type="java.lang.String">
             <column length="100" name="Remark">
                 <comment>备注</comment>

WebRoot/WEB-INF/classes/com/jsh/model/po/Supplier.hbm.xml

@@ -32,6 +32,26 @@
                 <comment>电子邮箱</comment>
             </column>
         </property>
+        <property generated="never" lazy="false" name="BeginNeedGet" type="java.lang.Double">
+            <column name="BeginNeedGet" precision="22" scale="3">
+                <comment>期初应收</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="BeginNeedPay" type="java.lang.Double">
+            <column name="BeginNeedPay" precision="22" scale="3">
+                <comment>期初应付</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="AllNeedGet" type="java.lang.Double">
+            <column name="AllNeedGet" precision="22" scale="3">
+                <comment>累计应收</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="AllNeedPay" type="java.lang.Double">
+            <column name="AllNeedPay" precision="22" scale="3">
+                <comment>累计应付</comment>
+            </column>
+        </property>
         <property name="description" type="java.lang.String">
             <column name="description" length="500" />
         </property>

WebRoot/WEB-INF/classes/com/jsh/model/po/VisitAccount.hbm.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-                                   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
- <class name="com.jsh.model.po.VisitAccount" table="jsh_visitaccount">
-  <id name="Id" type="java.lang.Long">
-   <column name="Id"/>
-   <generator class="native"/>
-  </id>
-  <many-to-one name="depot" class="com.jsh.model.po.Depot" lazy="false">
-    <column name="ProjectId" not-null="true" />
-  </many-to-one>
-  <property generated="never" lazy="false" name="LouHao" type="java.lang.String">
-   <column length="50" name="LouHao">
-    <comment>楼号</comment>
-   </column>
-  </property>
-  <property generated="never" lazy="false" name="HuHao" type="java.lang.String">
-   <column length="50" name="HuHao">
-    <comment>户号</comment>
-   </column>
-  </property>
-  <property generated="never" lazy="false" name="HuiFang" type="java.lang.String">
-   <column length="50" name="HuiFang">
-    <comment>回访情况</comment>
-   </column>
-  </property>
-  <property generated="never" lazy="false" name="LuoShi" type="java.lang.String">
-   <column length="50" name="LuoShi">
-    <comment>落实情况</comment>
-   </column>
-  </property>
-   <property generated="never" lazy="false" name="Name" type="java.lang.String">
-   <column length="50" name="Name">
-    <comment>住户姓名</comment>
-   </column>
-  </property>
-   <property generated="never" lazy="false" name="Tel" type="java.lang.String">
-   <column length="50" name="Tel">
-    <comment>电话 </comment>
-   </column>
-  </property>
-  <property name="AddTime" type="java.sql.Timestamp">
-    <column length="19" name="AddTime">
-    <comment>时间 </comment>
-    </column>
-  </property>
- </class>
-</hibernate-mapping>

WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml

@@ -33,7 +33,6 @@
 	<mapping resource="com/jsh/model/po/Role.hbm.xml" />
 	<mapping resource="com/jsh/model/po/Functions.hbm.xml" />
 	<mapping resource="com/jsh/model/po/UserBusiness.hbm.xml" />
-	<mapping resource="com/jsh/model/po/VisitAccount.hbm.xml" />
 	<mapping resource="com/jsh/model/po/Person.hbm.xml" />
 	<mapping resource="com/jsh/model/po/MaterialCategory.hbm.xml" />
 	<mapping resource="com/jsh/model/po/Material.hbm.xml" />

WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml

@@ -238,18 +238,6 @@
 	</bean>
 	<!--资产报表配置结束 -->
 	
-	<!--回访台帐配置开始 -->
-	<bean id="visitAccountService" class="com.jsh.service.basic.VisitAccountService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="visitAccountDao" ref="visitAccountDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="visitAccountAction" class="com.jsh.action.basic.VisitAccountAction" scope="prototype">
-		<property name="visitAccountService" ref="visitAccountService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--回访台帐配置结束 -->
-	
 	<!--经手人配置开始 -->
 	<bean id="personService" class="com.jsh.service.materials.PersonService">
 		<property name="baseDao" ref="baseDao"/>
@@ -262,7 +250,7 @@
 	</bean>
 	<!--经手人配置结束 -->
 	
-	<!--物料类别配置开始 -->
+	<!--商品类别配置开始 -->
 	<bean id="materialCategoryService" class="com.jsh.service.materials.MaterialCategoryService">
 		<property name="baseDao" ref="baseDao"/>
 		<property name="materialCategoryDao" ref="materialCategoryDao"/>
@@ -272,9 +260,9 @@
 		<property name="materialCategoryService" ref="materialCategoryService"/>
 		<property name="logService" ref="logService"/>
 	</bean>
-	<!--物料类别配置结束 -->
+	<!--商品类别配置结束 -->
 	
-	<!--物料配置开始 -->
+	<!--商品配置开始 -->
 	<bean id="materialService" class="com.jsh.service.materials.MaterialService">
 		<property name="baseDao" ref="baseDao"/>
 		<property name="materialDao" ref="materialDao"/>
@@ -284,7 +272,7 @@
 		<property name="materialService" ref="materialService"/>
 		<property name="logService" ref="logService"/>
 	</bean>
-	<!--物料配置结束 -->
+	<!--商品配置结束 -->
 	
 	<!--单元配置开始 -->
 	<bean id="buildingService" class="com.jsh.service.materials.BuildingService">

WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml

@@ -34,8 +34,6 @@
 	<bean id="functionsDao" parent="daoTemplate" class="com.jsh.dao.basic.FunctionsDAO"/>	
 	<!-- 配置userBusinessDao组件 -->
 	<bean id="userBusinessDao" parent="daoTemplate" class="com.jsh.dao.basic.UserBusinessDAO"/>	
-	<!-- 配置visitAccountDao组件 -->
-	<bean id="visitAccountDao" parent="daoTemplate" class="com.jsh.dao.basic.VisitAccountDAO"/>	
 	<!-- 配置personDao组件 -->
 	<bean id="personDao" parent="daoTemplate" class="com.jsh.dao.materials.PersonDAO"/>	
 	<!-- 配置materialCategoryDao组件 -->

WebRoot/WEB-INF/classes/struts2/visitAccount-struts.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
-	"http://struts.apache.org/dtds/struts-2.1.7.dtd">
-<struts>
-	<package name="visitAccount" namespace="/visitAccount" extends="json-default">
-		<action name="*" class="visitAccountAction" method="{1}">
-			<result type="json"/>
-		</action>
-	</package>
-</struts>

WebRoot/pages/log/home.jsp

@@ -1,76 +0,0 @@
-<%@page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<meta http-equiv=Content-Type content="text/html; charset=utf-8">
-		<!-- 指定以IE8的方式来渲染 -->
-		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
-		<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
-		<link href="css/admin.css" type="text/css" rel="stylesheet">
-		<title>首页说明</title>
-		<style type="text/css">
-			<!--
-			body {
-				margin-left: 0px;
-				margin-top: 0px;
-				margin-right: 0px;
-				margin-bottom: 0px;
-		  		background-color: #EAF2FD;
-			}
-			.STYLE1 {font-size: 12px}
-			.STYLE4 {
-				font-size: 12px;
-				color: #1F4A65;
-				font-weight: bold;
-			}
-			
-			a:link {
-				font-size: 12px;
-				color: #06482a;
-				text-decoration: none;
-			
-			}
-			a:visited {
-				font-size: 12px;
-				color: #06482a;
-				text-decoration: none;
-			}
-			a:hover {
-				font-size: 12px;
-				color: #FF0000;
-				text-decoration: underline;
-			}
-			a:active {
-				font-size: 12px;
-				color: #FF0000;
-				text-decoration: none;
-			}
-			.STYLE7 {font-size: 12}
-			-->
-		</style>
-	</head>
-	<body>
-		<table cellSpacing=0 cellPadding=0 width="100%" align=center border=0>
-			<tr height=28>
-	    		<td width="1101" class="STYLE4">
-        			&nbsp;&nbsp;<img src="<%=path%>/images/blogging.png" width="16" height="16" /> 
-        			<span >日志管理</span>
-        		</td>
-			</tr>
-		  	<tr>
-		    	<td bgColor=#b1ceef height=1></td>
-		    </tr>
-		  	<tr height="5px">
-		    	<td background=images/shadow_bg.jpg></td>
-		    </tr>
-		</table>
-		<p style="font-size: 12px;color: #1F4A65;padding: 10px">
-				&nbsp;&nbsp;&nbsp;&nbsp;
-				日志管理是记录资产管理系统增删改查操作明细，包括资产管理、系统管理等操作信息，通过日志管理，可以记录平时资产管理系统操作明细信息。日志管理主要以搜索操作信息为主。
-		</p>
-    </body>
-</html>

WebRoot/pages/log/operatelog.jsp

@@ -28,26 +28,26 @@
 				<tr>
 					<td>操作模块：</td>
 					<td>
-						<input type="text" name="searchOperation" id="searchOperation"  style="width:150px;"/>
+						<input type="text" name="searchOperation" id="searchOperation"  style="width:90px;"/>
 					</td>
 				
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>操作人员：</td>
 					<td>
-						<select name="searchUsernameID" id="searchUsernameID"  style="width:150px;"/>
+						<select name="searchUsernameID" id="searchUsernameID"  style="width:90px;" />
 					</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>操作IP：</td>
 					<td>
-						<input type="text" name="searchIP" id="searchIP"  style="width:150px;"/>
+						<input type="text" name="searchIP" id="searchIP"  style="width:90px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>操作状态：</td>
 					<td>
-						<select name="searchStatus" id="searchStatus"  style="width:150px;">
+						<select name="searchStatus" id="searchStatus"  style="width:90px;">
 							<option value="">请选择</option>
 							<option value="0">成功</option>
 							<option value="1">失败</option>
@@ -57,24 +57,22 @@
 				<tr>
 					<td>开始时间：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" class="easyui-datebox" style="width:150px;"/> 
+						<input type="text" name="searchBeginTime" id="searchBeginTime" class="easyui-datebox" style="width:90px;"/> 
 					</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>结束时间：</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" class="easyui-datebox" style="width:150px;"/> 
+						<input type="text" name="searchEndTime" id="searchEndTime" class="easyui-datebox" style="width:90px;"/> 
 					</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>操作详情：</td>
 					<td>
-						<input type="text" name="searchDesc" id="searchDesc"  style="width:150px;"/>
+						<input type="text" name="searchDesc" id="searchDesc"  style="width:90px;"/>
 					</td>	
 					<td>&nbsp;</td>
-					<td>&nbsp;</td>
+					<td colspan="3">
-					<td>&nbsp;</td>
-					<td>
 						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>
 						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
 					</td>															

WebRoot/pages/manage/app.jsp

@@ -28,13 +28,13 @@
 				<tr>
 					<td>名称：</td>
 					<td>
-						<input type="text" name="searchName" id="searchName"  style="width:230px;"/>
+						<input type="text" name="searchName" id="searchName"  style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>种类：</td>
 					<td>
-						<input type="text" name="searchType" id="searchType"  style="width:230px;"/>
+						<input type="text" name="searchType" id="searchType"  style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>

WebRoot/pages/manage/functions.jsp

@@ -28,16 +28,19 @@
 				<tr>
 					<td>名称：</td>
 					<td>
-						<input type="text" name="searchName" id="searchName"  style="width:230px;"/>
+						<input type="text" name="searchName" id="searchName"  style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>类型: </td>
 					<td>&nbsp;</td>
-					<td><select name="searchType" id="searchType" style="width: 230px;height: 20px">
+					<td>
+						<select name="searchType" id="searchType" style="width:100px; height:20px">
 					    	<option value="">全部</option>
 	                		<option value="电脑版">电脑版</option>
-	                	<option value="手机版">手机版</option></select></td>
+	                		<option value="手机版">手机版</option>
+	                	</select>
+	                </td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>
@@ -128,7 +131,6 @@
 					//iconCls:'icon-save',
 					//width:700,
 					height:heightInfo,
-					nowrap: false,
 					rownumbers: false,
 					//动画效果
 					animate:false,
@@ -148,14 +150,14 @@
 					pageList: initPageNum,
 					columns:[[
 					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '编号 ',field: 'Number',width:100},
+			          { title: '编号 ',field: 'Number',width:60},
-			          { title: '名称',field: 'Name',width:200},
+			          { title: '名称',field: 'Name',width:80},
-			          { title: '上级编号',field: 'PNumber',width:100},
+			          { title: '上级编号',field: 'PNumber',width:60},
-			          { title: '链接',field: 'URL',width:200},
+			          { title: '链接',field: 'URL',width:120},
 			          { title: '排序',field: 'Sort',width:50},
 			          { title: '收缩',field: 'State',width:50},
 			          { title: '启用',field: 'Enabled',width:50},
-			          { title: '类型',field: 'Type',width:100},
+			          { title: '类型',field: 'Type',width:50},
 			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
 			         	{
 							var str = '';

WebRoot/pages/manage/vendor.jsp

@@ -8,7 +8,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   	<head>
-    	<title>供应商信息</title>
+    	<title>单位信息</title>
     	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<!-- 指定以IE8的方式来渲染 -->
 		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -71,7 +71,7 @@
 		</div>
 		
 		<!-- 数据显示table -->
-		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="供应商列表" iconCls="icon-list" collapsible="true" closable="false">
+		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="单位列表" iconCls="icon-list" collapsible="true" closable="false">
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 	    <div id="supplierDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
@@ -100,6 +100,23 @@
 	                <label id="emailLabel">电子邮箱&nbsp;&nbsp;</label>
 	                <input name="email" id="email" class="easyui-validatebox" validType="email" style="width: 230px;height: 20px"/>
 	            </div>
+	            
+	            <div class="fitem" style="padding:5px">
+                    <label id="BeginNeedGetLabel">期初应收</label>
+                    <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 230px;height: 20px"></input>
+                </div>
+                <div class="fitem" style="padding:5px">
+                    <label id="BeginNeedPayLabel">期初应付</label>
+                    <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 230px;height: 20px"></input>
+                </div>
+                <div class="fitem" style="padding:5px">
+                    <label id="AllNeedGetLabel">累计应收</label>
+                    <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 230px;height: 20px" disabled="true"></input>
+                </div>
+                <div class="fitem" style="padding:5px">
+                    <label id="AllNeedPayLabel">累计应付</label>
+                    <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 230px;height: 20px" disabled="true"></input>
+                </div>
 	            <div class="fitem" style="padding:5px">
 	                <label id="descriptionLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;</label>
 	                <textarea name="description" id="description" rows="2" cols="2" style="width: 230px;"></textarea>
@@ -154,7 +171,7 @@
 			function initTableData()
 			{
 				$('#tableData').datagrid({
-					//title:'供应商列表',
+					//title:'单位列表',
 					//iconCls:'icon-save',
 					//width:700,
 					height:heightInfo,
@@ -180,18 +197,18 @@
 					pageList: initPageNum,
 					columns:[[
 					  { field: 'id',width:35,align:"center",checkbox:true},
-			          { title: '名称',field: 'supplier',width:200},
+			          { title: '名称',field: 'supplier',width:120},
-			          { title: '联系人', field: 'contacts',width:100,align:"center"},
+			          { title: '联系人', field: 'contacts',width:50,align:"center"},
-			          { title: '联系电话', field: 'phonenum',width:115,align:"center"},
+			          { title: '联系电话', field: 'phonenum',width:60,align:"center"},
-			          { title: '电子邮箱',field: 'email',width:180,align:"center"},
+			          { title: '电子邮箱',field: 'email',width:80,align:"center"},
-			          //{ title: '是否系统',field: 'isystem',width:70,align:"center"},
+			          { title: '累计应收',field: 'AllNeedGet',width:70,align:"center"},
-			          { title: '描述',field: 'description',width:100},
+			          { title: '累计应付',field: 'AllNeedPay',width:70,align:"center"},
-			          { title: '类型',field: 'type',width:100},
+			          { title: '类型',field: 'type',width:50},
-			          { title: '启动',field: 'enabled',width:100},
+			          { title: '启动',field: 'enabled',width:40},
 			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
 			         	{
 							var str = '';
-							var rowInfo = rec.id + 'AaBb' + rec.supplier +'AaBb' + rec.contacts + 'AaBb'+ rec.phonenum + 'AaBb'+ rec.email + 'AaBb' + rec.isystem + 'AaBb' + rec.description+ 'AaBb' + rec.type+ 'AaBb' + rec.enabled;
+							var rowInfo = rec.id + 'AaBb' + rec.supplier +'AaBb' + rec.contacts + 'AaBb'+ rec.phonenum + 'AaBb'+ rec.email + 'AaBb'+ rec.BeginNeedGet + 'AaBb'+ rec.BeginNeedPay + 'AaBb'+ rec.AllNeedGet + 'AaBb'+ rec.AllNeedPay + 'AaBb' + rec.isystem + 'AaBb' + rec.description+ 'AaBb' + rec.type+ 'AaBb' + rec.enabled;
 	       					if(1 == value)
 	       					{
 	       						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSupplier(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editSupplier(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
@@ -278,10 +295,10 @@
 				}
 			}
 			
-			//删除供应商信息
+			//删除单位信息
 			function deleteSupplier(supplierInfo)
 			{
-				$.messager.confirm('删除确认','确定要删除此供应商信息吗？',function(r)
+				$.messager.confirm('删除确认','确定要删除此单位信息吗？',function(r)
 			 	{
                     if (r)
                     {
@@ -302,12 +319,12 @@
 									//加载完以后重新初始化
 									$("#searchBtn").click();
 								else
-									$.messager.alert('删除提示','删除供应商信息失败，请稍后再试！','error');
+									$.messager.alert('删除提示','删除单位信息失败，请稍后再试！','error');
 							},
 							//此处添加错误处理
 				    		error:function()
 				    		{
-				    			$.messager.alert('删除提示','删除供应商信息异常，请稍后再试！','error');
+				    			$.messager.alert('删除提示','删除单位信息异常，请稍后再试！','error');
 								return;
 							}
 						});			
@@ -315,7 +332,7 @@
                 });
 			}
 			
-			//批量删除供应商
+			//批量删除单位
 			function batDeleteSupplier()
 			{
 				var row = $('#tableData').datagrid('getChecked');
@@ -326,7 +343,7 @@
 				}
 				if(row.length > 0)
 				{
-					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条供应商信息吗？',function(r)
+					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条单位信息吗？',function(r)
 				 	{
 	                    if (r)
 	                    {
@@ -359,12 +376,12 @@
 										$(":checkbox").attr("checked",false);
 									}
 									else
-										$.messager.alert('删除提示','删除供应商信息失败，请稍后再试！','error');
+										$.messager.alert('删除提示','删除单位信息失败，请稍后再试！','error');
 								},
 								//此处添加错误处理
 					    		error:function()
 					    		{
-					    			$.messager.alert('删除提示','删除供应商信息异常，请稍后再试！','error');
+					    			$.messager.alert('删除提示','删除单位信息异常，请稍后再试！','error');
 									return;
 								}
 							});	
@@ -373,7 +390,7 @@
 				 }
 			}
 			
-			//增加供应商
+			//增加单位
 			var url;
 			var supplierID = 0;
 			//保存编辑前的名称
@@ -381,7 +398,7 @@
 			
 			function addSuppler()
 			{
-				$('#supplierDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商');
+				$('#supplierDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加单位信息');
 				$(".window-mask").css({ width: webW ,height: webH});
 	            $('#supplierFM').form('clear');
 	            
@@ -396,7 +413,7 @@
 	            url = '<%=path %>/supplier/create.action';
 			}
 			
-			//保存供应商信息
+			//保存单位信息
 			$("#saveSupplier").unbind().bind({
 				click:function()
 				{
@@ -425,15 +442,12 @@
 		                    {
 		                        $.messager.show({
 		                            title: '错误提示',
-		                            msg: '保存供应商信息失败，请稍后重试!'
+		                            msg: '保存单位信息失败，请稍后重试!'
 		                        });
 		                    } 
 		                    else 
 		                    {
 		                        $('#supplierDlg').dialog('close');
-		                        //$('#tableData').datagrid('reload');
-		                        //加载完以后重新初始化
-								//$("#searchBtn").click(); 
 								var opts = $("#tableData").datagrid('options'); 
 								showSupplierDetails(opts.pageNumber,opts.pageSize);   
 		                    }
@@ -442,7 +456,7 @@
 				}
 			});
 			
-			//编辑供应商信息
+			//编辑单位信息
 	        function editSupplier(supplierTotalInfo)
 	        {
 	        	var supplierInfo = supplierTotalInfo.split("AaBb");
@@ -451,13 +465,17 @@
 	            	contacts : supplierInfo[2],
 	            	phonenum : supplierInfo[3],
 	            	email : supplierInfo[4],
-	            	description : supplierInfo[6],
+	            	BeginNeedGet : supplierInfo[5],
-	            	type : supplierInfo[7],
+	            	BeginNeedPay : supplierInfo[6],
-	            	enabled : supplierInfo[8],
+	            	AllNeedGet : supplierInfo[7],
+	            	AllNeedPay : supplierInfo[8],
+	            	description : supplierInfo[10],
+	            	type : supplierInfo[11],
+	            	enabled : supplierInfo[12],
 	            	clientIp:'<%=clientIp %>'
 	            };
 	            orgSupplier = supplierInfo[1];
-                $('#supplierDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑供应商信息');
+                $('#supplierDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑单位信息');
                 $(".window-mask").css({ width: webW ,height: webH});
                 $('#supplierFM').form('load',row);
                 supplierID = supplierInfo[0];
@@ -466,11 +484,8 @@
                 url = '<%=path %>/supplier/update.action?supplierID=' + supplierInfo[0];
 	        }
 	        
-	        //$("#supplier").unbind().bind({
-	        	//blur:checkSupplierName
-	        //});
 	        
-	        //检查供应商 名称是否存在 ++ 重名无法提示问题需要跟进
+	        //检查单位名称是否存在 ++ 重名无法提示问题需要跟进
 	        function checkSupplierName()
 	        {
 	        	var supplierName = $.trim($("#supplier").val());
@@ -493,16 +508,14 @@
 							flag = tipInfo;
 							if(tipInfo)
 							{
-								$.messager.alert('提示','供应商名称已经存在','info');
+								$.messager.alert('提示','单位名称已经存在','info');
-								//alert("供应商名称已经存在");
-								//$("#supplier").val("");
 								return;
 							}
 						},
 						//此处添加错误处理
 			    		error:function()
 			    		{
-			    			$.messager.alert('提示','检查供应商名称是否存在异常，请稍后再试！','error');
+			    			$.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
 							return;
 						}
 					});	

WebRoot/pages/materials/allocation_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -80,7 +80,7 @@
                 <td style="padding:5px">
                 <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
                 </td>
-	            <td>对方店面：</td>
+	            <td>对方仓库：</td>
 	            <td style="padding:5px">
 	            <select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
 	            </td>
@@ -129,7 +129,7 @@
                 <td style="padding:5px;width:120px;">
                 <span id="OperTimeShow"></span>
                 </td>
-	            <td>对方店面：</td>
+	            <td>对方仓库：</td>
 	            <td style="padding:5px;width:120px;">
 	            <span id="AllocationProjectIdShow"></span>
 	            </td>
@@ -828,7 +828,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/allocation_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -80,7 +80,7 @@
                 <td style="padding:5px">
                 <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
                 </td>
-	            <td>对方店面：</td>
+	            <td>对方仓库：</td>
 	            <td style="padding:5px">
 	            <select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
 	            </td>
@@ -129,7 +129,7 @@
                 <td style="padding:5px;width:120px;">
                 <span id="OperTimeShow"></span>
                 </td>
-	            <td>对方店面：</td>
+	            <td>对方仓库：</td>
 	            <td style="padding:5px;width:120px;">
 	            <span id="AllocationProjectIdShow"></span>
 	            </td>
@@ -872,7 +872,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/audit_allocation_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -78,7 +78,7 @@
                 <td style="padding:5px">
                 <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
                 </td>
-	            <td>对方店面：</td>
+	            <td>对方仓库：</td>
 	            <td style="padding:5px">
 	            <select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
 	            </td>
@@ -127,7 +127,7 @@
                 <td style="padding:5px;width:120px;">
                 <span id="OperTimeShow"></span>
                 </td>
-	            <td>对方店面：</td>
+	            <td>对方仓库：</td>
 	            <td style="padding:5px;width:120px;">
 	            <span id="AllocationProjectIdShow"></span>
 	            </td>
@@ -912,7 +912,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/audit_consuming_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -963,7 +963,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/audit_lease_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -913,7 +913,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/audit_purchase_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -923,7 +923,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/audit_return_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -909,7 +909,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/audit_sale_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -121,7 +121,7 @@
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 	            <table>
 	            <tr>
-	            <td>店面：</td>
+	            <td>仓库：</td>
 	            <td style="padding:5px;width:120px;">
                 <span id="ProjectIdShow"></span>
                 </td>
@@ -963,7 +963,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/audit_supply_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -906,7 +906,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/building.jsp

@@ -71,7 +71,7 @@
 	    </div>
 	    
 		<script type="text/javascript">
-			var depotID = getUrlParam('ProjectId');  //获取传值ProjectId（店面ProjectId）
+			var depotID = getUrlParam('ProjectId');  //获取传值ProjectId（仓库ProjectId）
 			//初始化界面
 			$(function()
 			{

WebRoot/pages/materials/consuming_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -923,7 +923,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/fix_allocation_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -125,7 +125,7 @@
                 <td style="padding:5px;width:120px;">
                 <span id="OperTimeShow"></span>
                 </td>
-	            <td>对方店面：</td>
+	            <td>对方仓库：</td>
 	            <td style="padding:5px;width:120px;">
 	            <span id="AllocationProjectIdShow"></span>
 	            </td>
@@ -849,7 +849,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/fix_lease_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -848,7 +848,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/fix_purchase_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -852,7 +852,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/fix_sale_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -848,7 +848,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/lease_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -873,7 +873,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/material.jsp

@@ -8,7 +8,7 @@
 <!DOCTYPE html>
 <html>
   	<head>
-    	<title>物料管理</title>
+    	<title>商品信息</title>
         <meta charset="utf-8">
 		<!-- 指定以IE8的方式来渲染 -->
 		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -44,7 +44,7 @@
 		</div>
 		
 		<!-- 数据显示table -->
-		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="物料列表" iconCls="icon-list" collapsible="true" closable="false">
+		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="商品列表" iconCls="icon-list" collapsible="true" closable="false">
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
@@ -75,6 +75,22 @@
 	            <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>
+	            </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>
@@ -127,7 +143,7 @@
 						var msgTip = systemInfo.showModel.msgTip;
 						if(msgTip == "exceptoin")
 						{
-							$.messager.alert('提示','查找物料异常,请与管理员联系！','error');
+							$.messager.alert('提示','查找商品异常,请与管理员联系！','error');
 							return;
 						}	
 					}
@@ -275,7 +291,7 @@
 			function initTableData()
 			{
 				$('#tableData').datagrid({
-					//title:'物料列表',
+					//title:'商品列表',
 					//iconCls:'icon-save',
 					//width:700,
 					height:heightInfo,
@@ -299,15 +315,19 @@
 					pageList: initPageNum,
 					columns:[[
 					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '名称',field: 'Name',width:150},
+			          { title: '名称',field: 'Name',width:80},
-			          { title: '款号',field: 'Model',width:150},
+			          { title: '款号',field: 'Model',width:80},
-    		          { title: '颜色',field: 'Color',width:150},
+    		          { title: '颜色',field: 'Color',width:40},
-			          { title: '单位',field: 'Unit',width:150},
+			          { title: '单位',field: 'Unit',width:50},
-			          { title: '备注',field: 'Remark',width:150},
+			          { title: '零售价',field: 'RetailPrice',width:50},
-			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
+			          { title: '最低售价',field: 'LowPrice',width:50},
+			          { title: '预设售价一',field: 'PresetPriceOne',width:80},
+			          { title: '预设售价二',field: 'PresetPriceTwo',width:80},
+			          { title: '备注',field: 'Remark',width:120},
+			          { title: '操作',field: 'op',align:"center",width:120,formatter:function(value,rec)
 			         	{
 							var str = '';
-							var rowInfo = rec.Id + 'AaBb' + rec.Name+ 'AaBb' + rec.Model+ 'AaBb' + rec.Color+ 'AaBb' + rec.Unit+ '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;
         					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;';
@@ -391,10 +411,10 @@
 				}
 			}
 			
-			//删除物料信息
+			//删除商品信息
 			function deleteMaterial(materialID)
 			{
-				$.messager.confirm('删除确认','确定要删除此物料信息吗？',function(r)
+				$.messager.confirm('删除确认','确定要删除此商品信息吗？',function(r)
 			 	{
                     if (r)
                     {
@@ -415,12 +435,12 @@
 									$("#searchBtn").click();
 								}
 								else
-									$.messager.alert('删除提示','删除物料信息失败，请稍后再试！','error');
+									$.messager.alert('删除提示','删除商品信息失败，请稍后再试！','error');
 							},
 							//此处添加错误处理
 				    		error:function()
 				    		{
-				    			$.messager.alert('删除提示','删除物料信息异常，请稍后再试！','error');
+				    			$.messager.alert('删除提示','删除商品信息异常，请稍后再试！','error');
 								return;
 							}
 						});			
@@ -428,7 +448,7 @@
                 });
 			}
 			
-			//批量删除物料
+			//批量删除商品
 			function batDeleteMaterial()
 			{
 				var row = $('#tableData').datagrid('getChecked');	
@@ -439,7 +459,7 @@
 				}
 				if(row.length > 0)
 				{
-					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条物料信息吗？',function(r)
+					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条商品信息吗？',function(r)
 				 	{
 	                    if (r)
 	                    {
@@ -473,12 +493,12 @@
 										$(":checkbox").attr("checked",false);
 									}
 									else
-										$.messager.alert('删除提示','删除物料信息失败，请稍后再试！','error');
+										$.messager.alert('删除提示','删除商品信息失败，请稍后再试！','error');
 								},
 								//此处添加错误处理
 					    		error:function()
 					    		{
-					    			$.messager.alert('删除提示','删除物料信息异常，请稍后再试！','error');
+					    			$.messager.alert('删除提示','删除商品信息异常，请稍后再试！','error');
 									return;
 								}
 							});	
@@ -497,7 +517,7 @@
 			{
 				$("#clientIp").val('<%=clientIp %>');
 				$('#materialFM').form('clear');
-				$('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加物料信息');
+				$('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品信息');
 				$(".window-mask").css({ width: webW ,height: webH});
 	            $("#Name").val("").focus();
 	            
@@ -538,6 +558,10 @@
 								Model : $.trim($("#Model").val()),
 								Color : $.trim($("#Color").val()),
 								Unit : $.trim($("#Unit").val()),
+								RetailPrice : $.trim($("#RetailPrice").val()),
+								LowPrice : $.trim($("#LowPrice").val()),
+								PresetPriceOne : $.trim($("#PresetPriceOne").val()),
+								PresetPriceTwo : $.trim($("#PresetPriceTwo").val()),
 								Remark : $.trim($("#Remark").val()),
 								clientIp:'<%=clientIp %>'
 							}),
@@ -554,14 +578,14 @@
 								{
 									$.messager.show({
 			                            title: '错误提示',
-			                            msg: '保存物料信息失败，请稍后重试!'
+			                            msg: '保存商品信息失败，请稍后重试!'
 			                        });
 								}
 							},
 							//此处添加错误处理
 				    		error:function()
 				    		{
-				    			$.messager.alert('提示','保存物料信息异常，请稍后再试！','error');
+				    			$.messager.alert('提示','保存商品信息异常，请稍后再试！','error');
 								return;
 							}
 						});	
@@ -579,10 +603,14 @@
 	            $("#Model").val(materialInfo[2]);
 	            $("#Color").val(materialInfo[3]);
 	            $("#Unit").val(materialInfo[4]);
-	            $("#Remark").val(materialInfo[5]);
+	            $("#RetailPrice").val(materialInfo[5]);
+	            $("#LowPrice").val(materialInfo[6]);
+	            $("#PresetPriceOne").val(materialInfo[7]);
+	            $("#PresetPriceTwo").val(materialInfo[8]);
+	            $("#Remark").val(materialInfo[9]);
 	            
 	            //orgMaterial = materialInfo[1];
-                $('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑物料信息');
+                $('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品信息');
                 $(".window-mask").css({ width: webW ,height: webH});
                 materialID = materialInfo[0];
                 //焦点在名称输入框==定焦在输入文字后面 

WebRoot/pages/materials/materialcategory.jsp

@@ -8,7 +8,7 @@
 <!DOCTYPE html>
 <html>
   	<head>
-    	<title>物料类别管理</title>
+    	<title>商品类别管理</title>
         <meta charset="utf-8">
 		<!-- 指定以IE8的方式来渲染 -->
 		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -44,7 +44,7 @@
 		</div>
 		
 		<!-- 数据显示table -->
-		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="物料类别列表" iconCls="icon-list" collapsible="true" closable="false">
+		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="商品类别列表" iconCls="icon-list" collapsible="true" closable="false">
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
@@ -116,7 +116,7 @@
 						var msgTip = systemInfo.showModel.msgTip;
 						if(msgTip == "exceptoin")
 						{
-							$.messager.alert('提示','查找物料类别异常,请与管理员联系！','error');
+							$.messager.alert('提示','查找商品类别异常,请与管理员联系！','error');
 							return;
 						}	
 					}
@@ -229,7 +229,7 @@
 			function initTableData()
 			{
 				$('#tableData').datagrid({
-					//title:'物料类别列表',
+					//title:'商品类别列表',
 					//iconCls:'icon-save',
 					//width:700,
 					height:heightInfo,
@@ -341,10 +341,10 @@
 				}
 			}
 			
-			//删除物料类别信息
+			//删除商品类别信息
 			function deleteMaterialCategory(materialCategoryID)
 			{
-				$.messager.confirm('删除确认','确定要删除此物料类别信息吗？',function(r)
+				$.messager.confirm('删除确认','确定要删除此商品类别信息吗？',function(r)
 			 	{
                     if (r)
                     {
@@ -365,12 +365,12 @@
 									$("#searchBtn").click();
 								}
 								else
-									$.messager.alert('删除提示','删除物料类别信息失败，请稍后再试！','error');
+									$.messager.alert('删除提示','删除商品类别信息失败，请稍后再试！','error');
 							},
 							//此处添加错误处理
 				    		error:function()
 				    		{
-				    			$.messager.alert('删除提示','删除物料类别信息异常，请稍后再试！','error');
+				    			$.messager.alert('删除提示','删除商品类别信息异常，请稍后再试！','error');
 								return;
 							}
 						});			
@@ -378,7 +378,7 @@
                 });
 			}
 			
-			//批量删除物料类别
+			//批量删除商品类别
 			function batDeleteMaterialCategory()
 			{
 				var row = $('#tableData').datagrid('getChecked');	
@@ -389,7 +389,7 @@
 				}
 				if(row.length > 0)
 				{
-					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条物料类别信息吗？',function(r)
+					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条商品类别信息吗？',function(r)
 				 	{
 	                    if (r)
 	                    {
@@ -423,12 +423,12 @@
 										$(":checkbox").attr("checked",false);
 									}
 									else
-										$.messager.alert('删除提示','删除物料类别信息失败，请稍后再试！','error');
+										$.messager.alert('删除提示','删除商品类别信息失败，请稍后再试！','error');
 								},
 								//此处添加错误处理
 					    		error:function()
 					    		{
-					    			$.messager.alert('删除提示','删除物料类别信息异常，请稍后再试！','error');
+					    			$.messager.alert('删除提示','删除商品类别信息异常，请稍后再试！','error');
 									return;
 								}
 							});	
@@ -447,7 +447,7 @@
 			{
 				$("#clientIp").val('<%=clientIp %>');
 				$('#materialCategoryFM').form('clear');
-				$('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加物料类别信息');
+				$('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品类别信息');
 				$(".window-mask").css({ width: webW ,height: webH});
 	            $("#Name").val("").focus();
 	            
@@ -497,14 +497,14 @@
 								{
 									$.messager.show({
 			                            title: '错误提示',
-			                            msg: '保存物料类别信息失败，请稍后重试!'
+			                            msg: '保存商品类别信息失败，请稍后重试!'
 			                        });
 								}
 							},
 							//此处添加错误处理
 				    		error:function()
 				    		{
-				    			$.messager.alert('提示','保存物料类别信息异常，请稍后再试！','error');
+				    			$.messager.alert('提示','保存商品类别信息异常，请稍后再试！','error');
 								return;
 							}
 						});	
@@ -523,7 +523,7 @@
 	            $("#Name").val(materialCategoryInfo[3]);
 	            
 	            //orgMaterialCategory = materialCategoryInfo[1];
-                $('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑物料类别信息');
+                $('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品类别信息');
                 $(".window-mask").css({ width: webW ,height: webH});
                 materialCategoryID = materialCategoryInfo[0];
                 //焦点在名称输入框==定焦在输入文字后面 

WebRoot/pages/materials/other_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -859,7 +859,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/person.jsp

@@ -26,7 +26,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:230px;"></select>
 					</td>
@@ -60,7 +60,7 @@
 	        <form id="personFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-	            <td>店面</td>
+	            <td>仓库</td>
 	            <td style="padding:5px">
                 <select name="ProjectId" id="ProjectId" style="width:230px;height: 20px"></select>
                 </td>
@@ -184,7 +184,7 @@
 					pageList: initPageNum,
 					columns:[[
 					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '店面',field: 'ProjectName',width:180},
+			          { title: '仓库',field: 'ProjectName',width:180},
 			          { title: '类型',field: 'Type',width:180},
 			          { title: '经手人',field: 'Name',width:180},
 			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)

WebRoot/pages/materials/purchase_in_list.jsp

@@ -27,25 +27,25 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
+						<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
 					</td>
 					<td>单据号：</td>
 					<td>
-						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
 					</td>
 					<td>入库时间：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
 					</td>
 					<td>-</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
 					</td>
 					<td>状态：</td>
 					<td>
-						<select name="searchState" id="searchState"  style="width:100px;">
+						<select name="searchState" id="searchState"  style="width:60px;">
 						<option value="">全部</option>
 						<option value="草稿">草稿</option>
 						<option value="待审核">待审核</option>
@@ -408,8 +408,8 @@
 			          { title: '入库时间 ',field: 'OperTime',width:100},
 			          { title: '创建时间',field: 'CreateTime',width:100},
 			          { title: '操作员',field: 'OperPersonName',width:100},
-			          { title: '备注',field: 'Remark',width:200},
+			          { title: '备注',field: 'Remark',width:100},
-			          { title: '状态',field: 'State',width:100},
+			          { title: '状态',field: 'State',width:50},
 			          { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec)
 			         	{
 							var str = '';
@@ -881,7 +881,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/recover_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -863,7 +863,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/return_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -869,7 +869,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/sale_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -868,7 +868,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/supply_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -866,7 +866,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/user/user.jsp

@@ -31,14 +31,13 @@
 				<tr>
 					<td>用户名称：</td>
 					<td>
-						<input type="text" name="searchUsername" id="searchUsername"  style="width:190px;"/>
+						<input type="text" name="searchUsername" id="searchUsername"  style="width:100px;"/>
 					</td>				
-				
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>登录名称：</td>
 					<td>
-						<input type="text" name="searchLoginame" id="searchLoginame"  style="width:190px;"/>
+						<input type="text" name="searchLoginame" id="searchLoginame"  style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>

WebRoot/pages/visit/visitAccount.jsp

@@ -1,533 +0,0 @@
-<%@page import="com.jsh.util.common.Tools"%>
-<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
-<%
-	String path = request.getContextPath();
-	String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-	String clientIp = Tools.getCurrentUserIP();
-%>
-<!DOCTYPE html>
-<html>
-  	<head>
-    	<title>回访管理</title>
-        <meta charset="utf-8">
-		<!-- 指定以IE8的方式来渲染 -->
-		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
-    	<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
-    	<script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
-        <script type="text/javascript" src="<%=path %>/js/colorbox/jquery.colorbox-min.js"></script>
-        <script type="text/javascript" src="<%=path %>/js/colorbox/colorboxSet.js"></script>
-        <link href="<%=path %>/js/colorbox/colorbox.css" rel="stylesheet" type="text/css" />
-		<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
-		<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
-		<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
-		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
-  	</head>
-  	<body>
-  		<!-- 查询 -->
-		<div id = "searchPanel"	class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
-			<table id="searchTable">
-				<tr>
-			    	<td>店面：</td>
-					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:230px;"></select>
-					</td>
-					<td>楼号：</td>
-					<td>
-						<input type="text" name="searchLouHao" id="searchLouHao"  style="width:230px;"/>
-					</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>
-						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
-						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a> 
-					</td>
-				</tr>
-			</table>
-		</div>
-		
-		<!-- 数据显示table -->
-		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="回访列表" iconCls="icon-list" collapsible="true" closable="false">
-			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
-		</div>
-		
-	    <div id="visitAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
-	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
-	        <form id="visitAccountFM" method="post"  novalidate>
-	            <table>
-	            <tr>
-	            <td>店面</td>
-	            <td style="padding:5px">
-                <select name="ProjectId" id="ProjectId" style="width:230px;height: 20px"></select>
-                </td>
-	            </tr>
-	            <tr>
-	            <td>楼号</td>
-	            <td style="padding:5px"><input name="LouHao" id="LouHao" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>户号</td>
-	            <td style="padding:5px"><input name="HuHao" id="HuHao" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>回访情况</td>
-	            <td style="padding:5px"><input name="HuiFang" id="HuiFang" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>落实情况</td>
-	            <td style="padding:5px"><input name="LuoShi" id="LuoShi" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <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: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>电话</td>
-	            <td style="padding:5px"><input name="Tel" id="Tel" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            </table>
-	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
-	        </form>
-	    </div>
-	    <div id="dlg-buttons">
-	        <a href="javascript:void(0)" id="saveVisitAccount" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-	        <a href="javascript:void(0)" id="cancelVisitAccount" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#visitAccountDlg').dialog('close')">取消</a>
-	    </div>
-	    
-		<script type="text/javascript">
-			var depotList = null;
-			var depotID = null;
-			//初始化界面
-			$(function()
-			{
-				//初始化系统基础信息
-				initSystemData();
-				initSelectInfo();
-				initTableData();
-				ininPager();
-				initForm();
-			});	
-		
-			//初始化系统基础信息
-			function initSystemData()
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path%>/depot/getBasicData.action",
-					//设置为同步
-					async:false,
-					dataType: "json",
-					success: function (systemInfo)
-					{
-						depotList = systemInfo.showModel.map.depotList;
-						var msgTip = systemInfo.showModel.msgTip;
-						if(msgTip == "exceptoin")
-						{
-							$.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
-							return;
-						}	
-					}
-				});				
-			}
-			//初始化页面选项卡
-			function initSelectInfo()
-			{
-				var options = "";
-				
-				if(depotList !=null)
-				{
-					options = "";
-					for(var i = 0 ;i < depotList.length;i ++)
-					{
-						var depot = depotList[i];
-						if(0 == i)
-						{
-							depotID = depot.id;
-						}
-						options += '<option value="' + depot.id + '">' + depot.name + '</option>';
-					}	
-					$("#ProjectId").empty().append(options);
-					$("#searchProjectId").empty().append('<option value="">全部</option>').append(options);
-				}
-			}
-			
-			//防止表单提交重复
-			function initForm()
-			{
-				$('#visitAccountFM').form({
-				    onSubmit: function(){
-				        return false;
-				    }
-				});
-			}
-			
-			//初始化表格数据
-			function initTableData()
-			{
-				$('#tableData').datagrid({
-					//title:'回访列表',
-					//iconCls:'icon-save',
-					//width:700,
-					height:heightInfo,
-					nowrap: false,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					url:'<%=path %>/visitAccount/findBy.action?pageSize=' + initPageSize,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					pageSize: initPageSize,
-					pageList: initPageNum,
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '店面',field: 'ProjectName',width:80},
-			          { title: '楼号',field: 'LouHao',width:80},
-			          { title: '户号',field: 'HuHao',width:80},
-			          { title: '回访情况',field: 'HuiFang',width:150},
-			          { title: '落实情况',field: 'LuoShi',width:150},
-			          { title: '住户姓名',field: 'Name',width:150},
-			          { title: '电话',field: 'Tel',width:80},
-			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
-			         	{
-							var str = '';
-							var rowInfo = rec.Id + 'AaBb' + rec.ProjectId+ 'AaBb' + rec.LouHao+ 'AaBb' + rec.HuHao
-							+ 'AaBb' + rec.HuiFang+ 'AaBb' + rec.LuoShi+ 'AaBb' + rec.Name+ 'AaBb' + rec.Tel;
-        					if(1 == value)
-        					{
-        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editVisitAccount(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editVisitAccount(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
-        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteVisitAccount('+ rec.Id +');"/>&nbsp;<a onclick="deleteVisitAccount('+ rec.Id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
-        					}
-        					return str;
-						}
-			          }
-					]],
-					toolbar:[
-						{
-							id:'addVisitAccount',
-							text:'增加',
-							iconCls:'icon-add',
-							handler:function()
-							{
-								addVisitAccount();
-							}
-						},
-						{
-							id:'deleteVisitAccount',
-							text:'删除',
-							iconCls:'icon-remove',
-							handler:function()
-							{
-								batDeleteVisitAccount();	
-							}
-						}
-					],
-					onLoadError:function()
-					{
-						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
-						return;
-					}    
-				});
-			}
-			
-			//初始化键盘enter事件
-			$(document).keydown(function(event)
-			{  
-			   	//兼容 IE和firefox 事件 
-			    var e = window.event || event;  
-			    var k = e.keyCode||e.which||e.charCode;  
-			    //兼容 IE,firefox 兼容  
-			    var obj = e.srcElement ? e.srcElement : e.target;  
-			    //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
-			    if(k == "13"&&(obj.id=="LouHao"||obj.id=="HuHao"|| obj.id=="HuiFang"|| obj.id=="LuoShi"|| obj.id=="Name"|| obj.id=="Tel" ))
-			    {  
-			        $("#saveVisitAccount").click();
-			    }
-			    //搜索按钮添加快捷键
-			    if(k == "13"&&(obj.id=="searchLouHao"))
-			    {  
-			        $("#searchBtn").click();
-			    }  
-			}); 
-			//分页信息处理
-			function ininPager()
-			{
-				try
-				{
-					var opts = $("#tableData").datagrid('options');  
-					var pager = $("#tableData").datagrid('getPager'); 
-					pager.pagination({  
-						onSelectPage:function(pageNum, pageSize)
-						{  
-							opts.pageNumber = pageNum;  
-							opts.pageSize = pageSize;  
-							pager.pagination('refresh',
-							{  
-								pageNumber:pageNum,  
-								pageSize:pageSize  
-							});  
-							showVisitAccountDetails(pageNum,pageSize);
-						}  
-					}); 
-				}
-				catch (e) 
-				{
-					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
-				}
-			}
-			
-			//删除回访信息
-			function deleteVisitAccount(visitAccountID)
-			{
-				$.messager.confirm('删除确认','确定要删除此回访信息吗？',function(r)
-			 	{
-                    if (r)
-                    {
-						$.ajax({
-							type:"post",
-							url: "<%=path %>/visitAccount/delete.action",
-							dataType: "json",
-							data: ({
-								visitAccountID : visitAccountID,
-								clientIp:'<%=clientIp %>'
-							}),
-							success: function (tipInfo)
-							{
-								var msg = tipInfo.showModel.msgTip;
-								if(msg == '成功')
-								{
-									//加载完以后重新初始化
-									$("#searchBtn").click();
-								}
-								else
-									$.messager.alert('删除提示','删除回访信息失败，请稍后再试！','error');
-							},
-							//此处添加错误处理
-				    		error:function()
-				    		{
-				    			$.messager.alert('删除提示','删除回访信息异常，请稍后再试！','error');
-								return;
-							}
-						});			
-                    }
-                });
-			}
-			
-			//批量删除回访
-			function batDeleteVisitAccount()
-			{
-				var row = $('#tableData').datagrid('getChecked');	
-				if(row.length == 0)
-				{
-					$.messager.alert('删除提示','没有记录被选中！','info');				
-					return;	
-				}
-				if(row.length > 0)
-				{
-					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条回访信息吗？',function(r)
-				 	{
-	                    if (r)
-	                    {
-	                    	var ids = "";
-	                        for(var i = 0;i < row.length; i ++)
-	                        {
-	                        	if(i == row.length-1)
-	                        	{
-	                        		ids += row[i].Id;
-	                        		break;
-	                        	}
-	                        	//alert(row[i].id);
-	                        	ids += row[i].Id + ",";
-	                        }
-	                        $.ajax({
-								type:"post",
-								url: "<%=path %>/visitAccount/batchDelete.action",
-								dataType: "json",
-								async :  false,
-								data: ({
-									visitAccountIDs : ids,
-									clientIp:'<%=clientIp %>'
-								}),
-								success: function (tipInfo)
-								{
-									var msg = tipInfo.showModel.msgTip;
-									if(msg == '成功')
-									{
-										//加载完以后重新初始化
-										$("#searchBtn").click();
-										$(":checkbox").attr("checked",false);
-									}
-									else
-										$.messager.alert('删除提示','删除回访信息失败，请稍后再试！','error');
-								},
-								//此处添加错误处理
-					    		error:function()
-					    		{
-					    			$.messager.alert('删除提示','删除回访信息异常，请稍后再试！','error');
-									return;
-								}
-							});	
-	                    }
-	                });
-				 }
-			}
-			
-			//增加
-			var url;
-			var visitAccountID = 0;
-			//保存编辑前的名称
-			var orgVisitAccount = "";
-			
-			function addVisitAccount()
-			{
-				$("#clientIp").val('<%=clientIp %>');
-				$('#visitAccountFM').form('clear');
-				$('#visitAccountDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加回访信息');
-				$(".window-mask").css({ width: webW ,height: webH});
-	            $("#name").val("").focus();
-	            
-	            orgVisitAccount = "";
-	            visitAccountID = 0;
-	            url = '<%=path %>/visitAccount/create.action';
-			}
-			
-			//保存信息
-			$("#saveVisitAccount").unbind().bind({
-				click:function()
-				{
-					if(!$('#visitAccountFM').form('validate'))
-						return;
-					else 
-					{
-						$.ajax({
-							type:"post",
-							url: url,
-							dataType: "json",
-							async :  false,
-							data: ({
-								ProjectId : $.trim($("#ProjectId").val()),
-								LouHao : $.trim($("#LouHao").val()),
-								HuHao : $.trim($("#HuHao").val()),
-								HuiFang : $.trim($("#HuiFang").val()),
-								LuoShi : $.trim($("#LuoShi").val()),
-								Name : $.trim($("#Name").val()),
-								Tel : $.trim($("#Tel").val()),
-								clientIp:'<%=clientIp %>'
-							}),
-							success: function (tipInfo)
-							{
-								if(tipInfo)
-								{
-									$('#visitAccountDlg').dialog('close');
-			                        
-									var opts = $("#tableData").datagrid('options'); 
-									showVisitAccountDetails(opts.pageNumber,opts.pageSize); 
-								}
-								else
-								{
-									$.messager.show({
-			                            title: '错误提示',
-			                            msg: '保存回访信息失败，请稍后重试!'
-			                        });
-								}
-							},
-							//此处添加错误处理
-				    		error:function()
-				    		{
-				    			$.messager.alert('提示','保存回访信息异常，请稍后再试！','error');
-								return;
-							}
-						});	
-					}
-				}
-			});
-			
-			//编辑信息
-	        function editVisitAccount(visitAccountTotalInfo)
-	        {
-	        	var visitAccountInfo = visitAccountTotalInfo.split("AaBb");
-	            
-	            $("#clientIp").val('<%=clientIp %>');
-	            $("#ProjectId").focus().val(visitAccountInfo[1]);
-	            $("#LouHao").val(visitAccountInfo[2]);
-	            $("#HuHao").val(visitAccountInfo[3]);
-	            $("#HuiFang").val(visitAccountInfo[4]);
-	            $("#LuoShi").val(visitAccountInfo[5]);
-	            $("#Name").val(visitAccountInfo[6]);
-	            $("#Tel").val(visitAccountInfo[7]);
-	            
-	            //orgVisitAccount = visitAccountInfo[1];
-                $('#visitAccountDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑回访信息');
-                $(".window-mask").css({ width: webW ,height: webH});
-                visitAccountID = visitAccountInfo[0];
-                //焦点在名称输入框==定焦在输入文字后面 
-                $("#name").val("").focus().val(visitAccountInfo[1]);
-                url = '<%=path %>/visitAccount/update.action?visitAccountID=' + visitAccountInfo[0];
-	        }
-	        
-			//搜索处理
-			$("#searchBtn").unbind().bind({
-				click:function()
-				{
-					showVisitAccountDetails(1,initPageSize);	
-					var opts = $("#tableData").datagrid('options');  
-					var pager = $("#tableData").datagrid('getPager'); 
-					opts.pageNumber = 1;  
-					opts.pageSize = initPageSize;  
-					pager.pagination('refresh',
-					{  
-						pageNumber:1,  
-						pageSize:initPageSize  
-					});  
-				}
-			});
-			
-			function showVisitAccountDetails(pageNo,pageSize)
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path %>/visitAccount/findBy.action",
-					dataType: "json",
-					data: ({
-						ProjectId:$.trim($("#searchProjectId").val()),
-						LouHao:$.trim($("#searchLouHao").val()),
-						pageNo:pageNo,
-						pageSize:pageSize
-					}),
-					success: function (data)
-					{
-						$("#tableData").datagrid('loadData',data);
-					},
-					//此处添加错误处理
-		    		error:function()
-		    		{
-		    			$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
-						return;
-					}
-				});
-			}
-			
-			//重置按钮
-			$("#searchResetBtn").unbind().bind({
-				click:function(){
-					$("#searchProjectId").val("");
-					$("#searchLouHao").val("");
-					
-					//加载完以后重新初始化
-					$("#searchBtn").click();
-			    }	
-			});
-			
-		</script>
-	</body>
-</html>

config/hibernate/hibernate.cfg.xml

@@ -33,7 +33,6 @@
 	<mapping resource="com/jsh/model/po/Role.hbm.xml" />
 	<mapping resource="com/jsh/model/po/Functions.hbm.xml" />
 	<mapping resource="com/jsh/model/po/UserBusiness.hbm.xml" />
-	<mapping resource="com/jsh/model/po/VisitAccount.hbm.xml" />
 	<mapping resource="com/jsh/model/po/Person.hbm.xml" />
 	<mapping resource="com/jsh/model/po/MaterialCategory.hbm.xml" />
 	<mapping resource="com/jsh/model/po/Material.hbm.xml" />

config/spring/basic-applicationContext.xml

@@ -238,18 +238,6 @@
 	</bean>
 	<!--资产报表配置结束 -->
 	
-	<!--回访台帐配置开始 -->
-	<bean id="visitAccountService" class="com.jsh.service.basic.VisitAccountService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="visitAccountDao" ref="visitAccountDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="visitAccountAction" class="com.jsh.action.basic.VisitAccountAction" scope="prototype">
-		<property name="visitAccountService" ref="visitAccountService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--回访台帐配置结束 -->
-	
 	<!--经手人配置开始 -->
 	<bean id="personService" class="com.jsh.service.materials.PersonService">
 		<property name="baseDao" ref="baseDao"/>
@@ -262,7 +250,7 @@
 	</bean>
 	<!--经手人配置结束 -->
 	
-	<!--物料类别配置开始 -->
+	<!--商品类别配置开始 -->
 	<bean id="materialCategoryService" class="com.jsh.service.materials.MaterialCategoryService">
 		<property name="baseDao" ref="baseDao"/>
 		<property name="materialCategoryDao" ref="materialCategoryDao"/>
@@ -272,9 +260,9 @@
 		<property name="materialCategoryService" ref="materialCategoryService"/>
 		<property name="logService" ref="logService"/>
 	</bean>
-	<!--物料类别配置结束 -->
+	<!--商品类别配置结束 -->
 	
-	<!--物料配置开始 -->
+	<!--商品配置开始 -->
 	<bean id="materialService" class="com.jsh.service.materials.MaterialService">
 		<property name="baseDao" ref="baseDao"/>
 		<property name="materialDao" ref="materialDao"/>
@@ -284,7 +272,7 @@
 		<property name="materialService" ref="materialService"/>
 		<property name="logService" ref="logService"/>
 	</bean>
-	<!--物料配置结束 -->
+	<!--商品配置结束 -->
 	
 	<!--单元配置开始 -->
 	<bean id="buildingService" class="com.jsh.service.materials.BuildingService">

config/spring/dao-applicationContext.xml

@@ -34,8 +34,6 @@
 	<bean id="functionsDao" parent="daoTemplate" class="com.jsh.dao.basic.FunctionsDAO"/>	
 	<!-- 配置userBusinessDao组件 -->
 	<bean id="userBusinessDao" parent="daoTemplate" class="com.jsh.dao.basic.UserBusinessDAO"/>	
-	<!-- 配置visitAccountDao组件 -->
-	<bean id="visitAccountDao" parent="daoTemplate" class="com.jsh.dao.basic.VisitAccountDAO"/>	
 	<!-- 配置personDao组件 -->
 	<bean id="personDao" parent="daoTemplate" class="com.jsh.dao.materials.PersonDAO"/>	
 	<!-- 配置materialCategoryDao组件 -->

config/struts2/visitAccount-struts.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
-	"http://struts.apache.org/dtds/struts-2.1.7.dtd">
-<struts>
-	<package name="visitAccount" namespace="/visitAccount" extends="json-default">
-		<action name="*" class="visitAccountAction" method="{1}">
-			<result type="json"/>
-		</action>
-	</package>
-</struts>

sql/jsh_erp.sql

@@ -382,7 +382,7 @@ INSERT INTO `jsh_assetname` VALUES ('1','联想Y450','17','1','','1'), ('2','惠
 INSERT INTO `jsh_depot` VALUES ('1','上海花边店','1','');
 INSERT INTO `jsh_depothead` VALUES ('29','入库','采购','1','1234','李四','2016-11-08 22:14:37','2016-11-08 00:00:00','1','2','1','记账',NULL,NULL,'','草稿',NULL,NULL), ('30','入库','采购','1','1235','李四','2016-11-08 22:15:16','2016-11-08 00:00:00','1','2','1','记账',NULL,NULL,'','草稿',NULL,NULL), ('31','出库','销售','1','123A','李四','2016-11-08 22:16:11','2016-11-08 00:00:00','2',NULL,'1','',NULL,NULL,'','草稿',NULL,NULL), ('32','入库','采购','1','ww123','季圣华','2016-11-25 22:14:46','2016-11-25 00:00:00','1','2','1','现金',NULL,NULL,'','草稿',NULL,NULL);
 INSERT INTO `jsh_depotitem` VALUES ('1014','29','485','300','0.4',NULL,'',''), ('1015','29','487','200','0.2',NULL,'',''), ('1016','30','498','432','0.5',NULL,'',''), ('1017','31','485','100','0.6',NULL,'',''), ('1018','32','487','1','0.9',NULL,'','');
-INSERT INTO `jsh_functions` VALUES ('1','00','系统管理','0','','
','0010','
','电脑版'), ('2','01','基础数据','0','','
','0020','
','电脑版'), ('3','02','物资管理','0','','
','0030','
','电脑版'), ('10','09','留言管理','0','','\0','0100','
','手机版'), ('11','0001','系统管理','00','','\0','0110','
','电脑版'), ('12','000101','应用管理','0001','../manage/app.jsp','\0','0132','
','电脑版'), ('13','000102','角色管理','0001','../manage/role.jsp','\0','0130','
','电脑版'), ('14','000103','用户管理','0001','../user/user.jsp','\0','0140','
','电脑版'), ('15','000104','日志管理','0001','../log/operatelog.jsp','\0','0160','
','电脑版'), ('16','000105','功能管理','0001','../manage/functions.jsp','\0','0135','
','电脑版'), ('21','0101','物料管理','01','','\0','0220','
','电脑版'), ('22','010101','物料类别管理','0101','../materials/materialcategory.jsp','\0','0230','
','电脑版'), ('23','010102','物料档案管理','0101','../materials/material.jsp','\0','0240','
','电脑版'), ('24','0102','公司数据管理','01','','\0','0250','
','电脑版'), ('25','010201','单位信息','0102','../manage/vendor.jsp','\0','0260','
','电脑版'), ('26','010202','部门管理','0102','../manage/depot.jsp','\0','0270','
','电脑版'), ('30','0201','其他管理','02','','\0','0310','
','电脑版'), ('31','020101','经手人管理','0201','../materials/person.jsp','\0','0312','
','电脑版'), ('32','0202','入库管理','02','','\0','0330','
','电脑版'), ('33','020201','采购入库','0202','../materials/purchase_in_list.jsp','\0','0340','
','电脑版'), ('34','020202','甲供入库','0202','../materials/supply_in_list.jsp','\0','0350','
','电脑版'), ('35','020203','租赁入库','0202','../materials/lease_in_list.jsp','\0','0360','
','电脑版'), ('36','020204','回收入库','0202','../materials/recover_in_list.jsp','\0','0370','
','电脑版'), ('37','020205','调拨入库','0202','../materials/allocation_in_list.jsp','\0','0380','
','电脑版'), ('38','0203','出库管理','02','','\0','0390','
','电脑版'), ('39','020301','领用出库','0203','../materials/consuming_out_list.jsp','\0','0400','
','电脑版'), ('40','020302','调拨出库','0203','../materials/allocation_out_list.jsp','\0','0410','
','电脑版'), ('41','020303','销售出库','0203','../materials/sale_out_list.jsp','\0','0420','
','电脑版'), ('42','020304','退还出库','0203','../materials/return_out_list.jsp','\0','0430','
','电脑版'), ('43','020305','报废出库','0203','../materials/other_out_list.jsp','\0','0430','
','电脑版'), ('44','0204','财务管理','02','','\0','0450','
','电脑版'), ('45','020401','单据审核','0204','','
','0460','
','电脑版'), ('46','02040101','采购入库审核','020401','../materials/audit_purchase_in_list.jsp','\0','0470','
','电脑版'), ('47','02040102','甲供入库审核','020401','../materials/audit_supply_in_list.jsp','\0','0480','
','电脑版'), ('48','02040103','租赁入库审核','020401','../materials/audit_lease_in_list.jsp','\0','0490','
','电脑版'), ('49','02040104','调拨出库审核','020401','../materials/audit_allocation_out_list.jsp','\0','0500','
','电脑版'), ('50','02040105','领用出库审核','020401','../materials/audit_consuming_out_list.jsp','\0','0510','
','电脑版'), ('51','02040106','退还出库审核','020401','../materials/audit_return_out_list.jsp','\0','0520','
','电脑版'), ('52','020402','采购定价','0204','../materials/fix_purchase_in_list.jsp','\0','0530','
','电脑版'), ('53','020403','租赁定价','0204','../materials/fix_lease_in_list.jsp','\0','0540','
','电脑版'), ('54','020404','调拨定价','0204','../materials/fix_allocation_out_list.jsp','\0','0550','
','电脑版'), ('55','020405','销售定价','0204','../materials/fix_sale_out_list.jsp','\0','0560','
','电脑版'), ('58','0205','报表中心','02','','\0','0590','
','电脑版'), ('59','020501','项目进销存报表','0205','../reports/in_out_stock_report.jsp','\0','0600','
','电脑版'), ('193','02040107','销售出库审核','020401','../materials/audit_sale_out_list.jsp','\0','0525','
','电脑版'), ('194','010204','收支项目','0102','../manage/inOutItem.jsp','\0','0282','
','电脑版'), ('195','010205','结算账户','0102','../manage/account.jsp','\0','0283','
','电脑版');
+INSERT INTO `jsh_functions` VALUES ('1','00','系统管理','0','','
','0010','
','电脑版'), ('2','01','基础数据','0','','
','0020','
','电脑版'), ('3','02','物资管理','0','','
','0030','
','电脑版'), ('10','09','留言管理','0','','\0','0100','
','手机版'), ('11','0001','系统管理','00','','\0','0110','
','电脑版'), ('12','000101','应用管理','0001','../manage/app.jsp','\0','0132','
','电脑版'), ('13','000102','角色管理','0001','../manage/role.jsp','\0','0130','
','电脑版'), ('14','000103','用户管理','0001','../user/user.jsp','\0','0140','
','电脑版'), ('15','000104','日志管理','0001','../log/operatelog.jsp','\0','0160','
','电脑版'), ('16','000105','功能管理','0001','../manage/functions.jsp','\0','0135','
','电脑版'), ('21','0101','商品管理','01','','\0','0220','
','电脑版'), ('22','010101','商品类别管理','0101','../materials/materialcategory.jsp','\0','0230','
','电脑版'), ('23','010102','商品档案管理','0101','../materials/material.jsp','\0','0240','
','电脑版'), ('24','0102','公司数据管理','01','','\0','0250','
','电脑版'), ('25','010201','单位信息','0102','../manage/vendor.jsp','\0','0260','
','电脑版'), ('26','010202','部门管理','0102','../manage/depot.jsp','\0','0270','
','电脑版'), ('30','0201','其他管理','02','','\0','0310','
','电脑版'), ('31','020101','经手人管理','0201','../materials/person.jsp','\0','0312','
','电脑版'), ('32','0202','入库管理','02','','\0','0330','
','电脑版'), ('33','020201','采购入库','0202','../materials/purchase_in_list.jsp','\0','0340','
','电脑版'), ('34','020202','甲供入库','0202','../materials/supply_in_list.jsp','\0','0350','
','电脑版'), ('35','020203','租赁入库','0202','../materials/lease_in_list.jsp','\0','0360','
','电脑版'), ('36','020204','回收入库','0202','../materials/recover_in_list.jsp','\0','0370','
','电脑版'), ('37','020205','调拨入库','0202','../materials/allocation_in_list.jsp','\0','0380','
','电脑版'), ('38','0203','出库管理','02','','\0','0390','
','电脑版'), ('39','020301','领用出库','0203','../materials/consuming_out_list.jsp','\0','0400','
','电脑版'), ('40','020302','调拨出库','0203','../materials/allocation_out_list.jsp','\0','0410','
','电脑版'), ('41','020303','销售出库','0203','../materials/sale_out_list.jsp','\0','0420','
','电脑版'), ('42','020304','退还出库','0203','../materials/return_out_list.jsp','\0','0430','
','电脑版'), ('43','020305','报废出库','0203','../materials/other_out_list.jsp','\0','0430','
','电脑版'), ('44','0204','财务管理','02','','\0','0450','
','电脑版'), ('45','020401','单据审核','0204','','
','0460','
','电脑版'), ('46','02040101','采购入库审核','020401','../materials/audit_purchase_in_list.jsp','\0','0470','
','电脑版'), ('47','02040102','甲供入库审核','020401','../materials/audit_supply_in_list.jsp','\0','0480','
','电脑版'), ('48','02040103','租赁入库审核','020401','../materials/audit_lease_in_list.jsp','\0','0490','
','电脑版'), ('49','02040104','调拨出库审核','020401','../materials/audit_allocation_out_list.jsp','\0','0500','
','电脑版'), ('50','02040105','领用出库审核','020401','../materials/audit_consuming_out_list.jsp','\0','0510','
','电脑版'), ('51','02040106','退还出库审核','020401','../materials/audit_return_out_list.jsp','\0','0520','
','电脑版'), ('52','020402','采购定价','0204','../materials/fix_purchase_in_list.jsp','\0','0530','
','电脑版'), ('53','020403','租赁定价','0204','../materials/fix_lease_in_list.jsp','\0','0540','
','电脑版'), ('54','020404','调拨定价','0204','../materials/fix_allocation_out_list.jsp','\0','0550','
','电脑版'), ('55','020405','销售定价','0204','../materials/fix_sale_out_list.jsp','\0','0560','
','电脑版'), ('58','0205','报表中心','02','','\0','0590','
','电脑版'), ('59','020501','项目进销存报表','0205','../reports/in_out_stock_report.jsp','\0','0600','
','电脑版'), ('193','02040107','销售出库审核','020401','../materials/audit_sale_out_list.jsp','\0','0525','
','电脑版'), ('194','010204','收支项目','0102','../manage/inOutItem.jsp','\0','0282','
','电脑版'), ('195','010205','结算账户','0102','../manage/account.jsp','\0','0283','
','电脑版');
 INSERT INTO `jsh_inoutitem` VALUES ('1','山山水水','支出','yyyy'), ('5','啊啊啊','收入','ttttttt'), ('7','44454','收入','33333');
 INSERT INTO `jsh_log` VALUES ('1722','63','登录系统','192.168.1.104','2016-11-27 13:17:17','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1723','63','登录系统','192.168.1.104','2016-11-27 13:17:30','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1724','63','退出系统','192.168.1.104','2016-11-27 13:17:48','0','管理用户：jsh 退出系统','jsh 退出系统'), ('1725','65','登录系统','192.168.1.104','2016-11-27 13:17:52','0','管理用户：ls 登录系统','ls 登录系统'), ('1726','65','退出系统','192.168.1.104','2016-11-27 13:18:18','0','管理用户：ls 退出系统','ls 退出系统'), ('1727','63','登录系统','192.168.1.104','2016-11-27 13:18:22','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1728','63','更新UserBusiness','192.168.1.104','2016-11-27 13:18:44','0','更新UserBusiness的ID为  6 成功！','更新UserBusiness成功'), ('1729','63','退出系统','192.168.1.104','2016-11-27 13:18:48','0','管理用户：jsh 退出系统','jsh 退出系统'), ('1730','65','登录系统','192.168.1.104','2016-11-27 13:18:53','0','管理用户：ls 登录系统','ls 登录系统');
 INSERT INTO `jsh_material` VALUES ('485','1','棉线','A21-4321','米色','码',''), ('487','1','网布','12343','红色','码',''), ('498','2','蕾丝','B123','蓝色','码','');

src/com/jsh/action/basic/AppAction.java

@@ -1,6 +1,4 @@
 package com.jsh.action.basic;
-
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -29,7 +27,6 @@ import com.jsh.model.vo.basic.AppModel;
 import com.jsh.service.basic.AppIService;
 import com.jsh.service.basic.UserBusinessIService;
 import com.jsh.util.common.PageUtil;
-//import com.opensymphony.xwork2.ActionContext;
 /**
  * 应用
  * @author ji_sheng_hua

src/com/jsh/action/basic/DepotAction.java

@@ -21,7 +21,10 @@ import com.jsh.model.vo.basic.DepotModel;
 import com.jsh.service.basic.DepotIService;
 import com.jsh.service.basic.UserBusinessIService;
 import com.jsh.util.common.PageUtil;
-
+/**
+ * 仓库
+ * @author ji sheng hua
+ */
 @SuppressWarnings("serial")
 public class DepotAction extends BaseAction<DepotModel>
 {

src/com/jsh/action/basic/SupplierAction.java

@@ -40,6 +40,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
 		    supplier.setType(model.getType());
 		    supplier.setDescription(model.getDescription());
 		    supplier.setEmail(model.getEmail());
+            supplier.setBeginNeedGet(model.getBeginNeedGet());
+            supplier.setBeginNeedPay(model.getBeginNeedPay());
 		    supplier.setIsystem((short)1);
 		    supplier.setPhonenum(model.getPhonenum());
 		    supplier.setSupplier(model.getSupplier());
@@ -118,6 +120,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
             supplier.setType(model.getType());
             supplier.setDescription(model.getDescription());
             supplier.setEmail(model.getEmail());
+            supplier.setBeginNeedGet(model.getBeginNeedGet());
+            supplier.setBeginNeedPay(model.getBeginNeedPay());
             supplier.setIsystem((short)1);
             supplier.setPhonenum(model.getPhonenum());
             supplier.setSupplier(model.getSupplier());
@@ -220,10 +224,6 @@ public class SupplierAction extends BaseAction<SupplierModel>
             supplierService.find(pageUtil);
             List<Supplier> dataList = pageUtil.getPageList();
             
-            //开始拼接json数据
-//            {"total":28,"rows":[
-//                {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"}
-//            ]}
             JSONObject outer = new JSONObject();
             outer.put("total", pageUtil.getTotalCount());
             //存放数据json数组
@@ -240,6 +240,10 @@ public class SupplierAction extends BaseAction<SupplierModel>
                     item.put("contacts",supplier.getContacts());
                     item.put("phonenum", supplier.getPhonenum());
                     item.put("email", supplier.getEmail());
+                    item.put("BeginNeedGet",supplier.getBeginNeedGet());
+                    item.put("BeginNeedPay",supplier.getBeginNeedPay());
+                    item.put("AllNeedGet",supplier.getAllNeedGet());
+                    item.put("AllNeedPay",supplier.getAllNeedPay());
                     item.put("isystem", supplier.getIsystem() == (short)0?"是":"否");
                     item.put("description", supplier.getDescription());
                     item.put("enabled", supplier.getEnabled());

src/com/jsh/action/basic/VisitAccountAction.java

@@ -1,267 +0,0 @@
-package com.jsh.action.basic;
-
-import java.io.IOException;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import org.springframework.dao.DataAccessException;
-
-import com.jsh.base.BaseAction;
-import com.jsh.base.Log;
-import com.jsh.model.po.Category;
-import com.jsh.model.po.Depot;
-import com.jsh.model.po.VisitAccount;
-import com.jsh.model.po.Logdetails;
-import com.jsh.model.vo.basic.VisitAccountModel;
-import com.jsh.service.basic.VisitAccountIService;
-import com.jsh.util.common.PageUtil;
-
-@SuppressWarnings("serial")
-public class VisitAccountAction extends BaseAction<VisitAccountModel>
-{
-    private VisitAccountIService visitAccountService;
-    private VisitAccountModel model = new VisitAccountModel();
-	/**
-	 * 增加回访
-	 * @return
-	 */
-	public void create()
-	{
-	    Log.infoFileSync("==================开始调用增加回访信息方法create()===================");
-	    Boolean flag = false;
-		try
-		{
-			VisitAccount visitAccount = new VisitAccount();
-			visitAccount.setDepot(new Depot(model.getProjectId()));
-			
-			visitAccount.setLouHao(model.getLouHao());
-			visitAccount.setHuHao(model.getHuHao());
-			visitAccount.setHuiFang(model.getHuiFang());
-			visitAccount.setLuoShi(model.getLuoShi());
-			visitAccount.setName(model.getName());
-			visitAccount.setTel(model.getTel());
-			visitAccount.setAddTime(new Timestamp(new Date().getTime()));
-			visitAccountService.create(visitAccount);
-			
-			//========标识位===========
-			flag = true;
-			//记录操作日志使用
-			tipMsg = "成功";
-            tipType = 0;
-		}
-		catch (DataAccessException e)
-		{
-			Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加回访信息异常", e);
-			flag = false;
-			tipMsg = "失败";
-            tipType = 1;
-		}
-		finally
-		{
-		    try 
-		    {
-                toClient(flag.toString());
-            } 
-		    catch (IOException e) 
-		    {
-                Log.errorFileSync(">>>>>>>>>>>>增加回访信息回写客户端结果异常", e);
-            }
-		}
-		
-		logService.create(new Logdetails(getUser(), "增加回访", model.getClientIp(),
-                new Timestamp(System.currentTimeMillis())
-        , tipType, "增加回访名称为  "+ model.getName() + " " + tipMsg + "！", "增加回访" + tipMsg));
-		Log.infoFileSync("==================结束调用增加回访方法create()===================");
-	}
-	
-	/**
-	 * 删除回访
-	 * @return
-	 */
-	public String delete()
-	{
-	    Log.infoFileSync("====================开始调用删除回访信息方法delete()================");
-	    try 
-	    {
-	    	visitAccountService.delete(model.getVisitAccountID());
-            tipMsg = "成功";
-            tipType = 0;
-        } 
-	    catch (DataAccessException e) 
-	    {
-	        Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getVisitAccountID() + "  的回访异常", e);
-	        tipMsg = "失败";
-            tipType = 1;
-        }
-	    model.getShowModel().setMsgTip(tipMsg);
-	    logService.create(new Logdetails(getUser(), "删除回访", model.getClientIp(),
-	            new Timestamp(System.currentTimeMillis())
-	    , tipType, "删除回访ID为  "+ model.getVisitAccountID() + " " + tipMsg + "！", "删除回访" + tipMsg));
-	    Log.infoFileSync("====================结束调用删除回访信息方法delete()================");
-	    return SUCCESS;
-	}
-	
-	/**
-	 * 更新回访
-	 * @return
-	 */
-	public void update()
-	{
-	    Boolean flag = false;
-        try
-        {
-        	VisitAccount visitAccount = visitAccountService.get(model.getVisitAccountID());
-        	visitAccount.setDepot(new Depot(model.getProjectId()));
-        	
-			visitAccount.setLouHao(model.getLouHao());
-			visitAccount.setHuHao(model.getHuHao());
-			visitAccount.setHuiFang(model.getHuiFang());
-			visitAccount.setLuoShi(model.getLuoShi());
-			visitAccount.setName(model.getName());
-			visitAccount.setTel(model.getTel());
-			visitAccount.setAddTime(new Timestamp(new Date().getTime()));
-        	visitAccountService.update(visitAccount);
-            
-            flag = true;
-            tipMsg = "成功";
-            tipType = 0;
-        } 
-        catch (DataAccessException e) 
-        {
-            Log.errorFileSync(">>>>>>>>>>>>>修改回访ID为 ： " + model.getVisitAccountID() + "信息失败", e);
-            flag = false;
-            tipMsg = "失败";
-            tipType = 1;
-        }
-        finally
-        {
-            try 
-            {
-                toClient(flag.toString());
-            } 
-            catch (IOException e) 
-            {
-                Log.errorFileSync(">>>>>>>>>>>>修改回访回写客户端结果异常", e);
-            }
-        }
-        logService.create(new Logdetails(getUser(), "更新回访", model.getClientIp(),
-                new Timestamp(System.currentTimeMillis())
-        , tipType, "更新回访ID为  "+ model.getVisitAccountID() + " " + tipMsg + "！", "更新回访" + tipMsg));
-	}
-	
-	/**
-	 * 批量删除指定ID回访
-	 * @return
-	 */
-	public String batchDelete()
-	{
-	    try
-	    {
-	    	visitAccountService.batchDelete(model.getVisitAccountIDs());
-            model.getShowModel().setMsgTip("成功");
-            //记录操作日志使用
-            tipMsg = "成功";
-            tipType = 0;
-        } 
-	    catch (DataAccessException e) 
-	    {
-	        Log.errorFileSync(">>>>>>>>>>>批量删除回访ID为：" + model.getVisitAccountIDs() + "信息异常", e);
-	        tipMsg = "失败";
-            tipType = 1;
-        }
-	    
-	    logService.create(new Logdetails(getUser(), "批量删除回访", model.getClientIp(),
-                new Timestamp(System.currentTimeMillis())
-        , tipType, "批量删除回访ID为  "+ model.getVisitAccountIDs() + " " + tipMsg + "！", "批量删除回访" + tipMsg));
-	    return SUCCESS;
-	}
-	
-	/**
-	 * 查找回访信息
-	 * @return
-	 */
-    public void findBy()
-	{
-	    try 
-	    {
-	        PageUtil<VisitAccount> pageUtil = new  PageUtil<VisitAccount>();
-            pageUtil.setPageSize(model.getPageSize());
-            pageUtil.setCurPage(model.getPageNo());
-            pageUtil.setAdvSearch(getCondition());
-            visitAccountService.find(pageUtil);
-            List<VisitAccount> dataList = pageUtil.getPageList();
-            
-            //开始拼接json数据
-//            {"total":28,"rows":[
-//                {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"}
-//            ]}
-            JSONObject outer = new JSONObject();
-            outer.put("total", pageUtil.getTotalCount());
-            //存放数据json数组
-            JSONArray dataArray = new JSONArray();
-            if(null != dataList)
-            {
-                for(VisitAccount visitAccount:dataList)
-                {
-                    JSONObject item = new JSONObject();
-                    item.put("Id", visitAccount.getId());
-                    item.put("ProjectId", visitAccount.getDepot().getId());
-                    item.put("ProjectName", visitAccount.getDepot().getName());
-                    item.put("LouHao", visitAccount.getLouHao());
-                    item.put("HuHao", visitAccount.getHuHao());
-                    item.put("HuiFang", visitAccount.getHuiFang());
-                    item.put("LuoShi", visitAccount.getLuoShi());
-                    item.put("Name", visitAccount.getName());
-                    item.put("Tel", visitAccount.getTel());
-                    item.put("AddTime", visitAccount.getAddTime());
-                    item.put("op", 1);
-                    dataArray.add(item);
-                }
-            }
-            outer.put("rows", dataArray);
-            //回写查询结果
-            toClient(outer.toString());
-        } 
-	    catch (DataAccessException e) 
-	    {
-	        Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找回访信息异常", e);
-        } 
-	    catch (IOException e) 
-	    {
-            Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询回访信息结果异常", e);
-        }
-	}
-    
-	/**
-	 * 拼接搜索条件
-	 * @return
-	 */
-	private Map<String,Object> getCondition()
-    {
-        /**
-         * 拼接搜索条件
-         */
-        Map<String,Object> condition = new HashMap<String,Object>();
-        condition.put("ProjectId_n_eq", model.getProjectId());
-        condition.put("LouHao_s_like", model.getLouHao());
-        condition.put("AddTime_s_order", "desc");
-        return condition;
-    }
-	
-	//=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
-	@Override
-	public VisitAccountModel getModel()
-	{
-		return model;
-	}
-	public void setVisitAccountService(VisitAccountIService visitAccountService)
-    {
-        this.visitAccountService = visitAccountService;
-    }
-}

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

@@ -29,12 +29,12 @@ public class MaterialAction extends BaseAction<MaterialModel>
     private MaterialModel model = new MaterialModel();
     
 	/**
-	 * 增加物料
+	 * 增加商品
 	 * @return
 	 */
 	public void create()
 	{
-	    Log.infoFileSync("==================开始调用增加物料信息方法create()===================");
+	    Log.infoFileSync("==================开始调用增加商品信息方法create()===================");
 	    Boolean flag = false;
 		try
 		{
@@ -45,6 +45,10 @@ public class MaterialAction extends BaseAction<MaterialModel>
 			material.setModel(model.getModel());
 			material.setColor(model.getColor());
 			material.setUnit(model.getUnit());
+            material.setRetailPrice(model.getRetailPrice());
+            material.setLowPrice(model.getLowPrice());
+            material.setPresetPriceOne(model.getPresetPriceOne());
+            material.setPresetPriceTwo(model.getPresetPriceTwo());
 			material.setRemark(model.getRemark());
 			materialService.create(material);
 			
@@ -56,7 +60,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
 		}
 		catch (DataAccessException e)
 		{
-			Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加物料信息异常", e);
+			Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加商品信息异常", e);
 			flag = false;
 			tipMsg = "失败";
             tipType = 1;
@@ -69,23 +73,23 @@ public class MaterialAction extends BaseAction<MaterialModel>
             } 
 		    catch (IOException e) 
 		    {
-                Log.errorFileSync(">>>>>>>>>>>>增加物料信息回写客户端结果异常", e);
+                Log.errorFileSync(">>>>>>>>>>>>增加商品信息回写客户端结果异常", e);
             }
 		}
 		
-		logService.create(new Logdetails(getUser(), "增加物料", model.getClientIp(),
+		logService.create(new Logdetails(getUser(), "增加商品", model.getClientIp(),
                 new Timestamp(System.currentTimeMillis())
-        , tipType, "增加物料名称为  "+ model.getName() + " " + tipMsg + "！", "增加物料" + tipMsg));
+        , tipType, "增加商品名称为  "+ model.getName() + " " + tipMsg + "！", "增加商品" + tipMsg));
-		Log.infoFileSync("==================结束调用增加物料方法create()===================");
+		Log.infoFileSync("==================结束调用增加商品方法create()===================");
 	}
 	
 	/**
-	 * 删除物料
+	 * 删除商品
 	 * @return
 	 */
 	public String delete()
 	{
-	    Log.infoFileSync("====================开始调用删除物料信息方法delete()================");
+	    Log.infoFileSync("====================开始调用删除商品信息方法delete()================");
 	    try 
 	    {
 	    	materialService.delete(model.getMaterialID());
@@ -94,20 +98,20 @@ public class MaterialAction extends BaseAction<MaterialModel>
         } 
 	    catch (DataAccessException e) 
 	    {
-	        Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialID() + "  的物料异常", e);
+	        Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialID() + "  的商品异常", e);
 	        tipMsg = "失败";
             tipType = 1;
         }
 	    model.getShowModel().setMsgTip(tipMsg);
-	    logService.create(new Logdetails(getUser(), "删除物料", model.getClientIp(),
+	    logService.create(new Logdetails(getUser(), "删除商品", model.getClientIp(),
 	            new Timestamp(System.currentTimeMillis())
-	    , tipType, "删除物料ID为  "+ model.getMaterialID() + " " + tipMsg + "！", "删除物料" + tipMsg));
+	    , tipType, "删除商品ID为  "+ model.getMaterialID() + " " + tipMsg + "！", "删除商品" + tipMsg));
-	    Log.infoFileSync("====================结束调用删除物料信息方法delete()================");
+	    Log.infoFileSync("====================结束调用删除商品信息方法delete()================");
 	    return SUCCESS;
 	}
 	
 	/**
-	 * 更新物料
+	 * 更新商品
 	 * @return
 	 */
 	public void update()
@@ -122,6 +126,10 @@ public class MaterialAction extends BaseAction<MaterialModel>
 			material.setModel(model.getModel());
 			material.setColor(model.getColor());
 			material.setUnit(model.getUnit());
+            material.setRetailPrice(model.getRetailPrice());
+            material.setLowPrice(model.getLowPrice());
+            material.setPresetPriceOne(model.getPresetPriceOne());
+            material.setPresetPriceTwo(model.getPresetPriceTwo());
 			material.setRemark(model.getRemark());
 			material.setName(model.getName());
         	materialService.update(material);
@@ -132,7 +140,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
         } 
         catch (DataAccessException e) 
         {
-            Log.errorFileSync(">>>>>>>>>>>>>修改物料ID为 ： " + model.getMaterialID() + "信息失败", e);
+            Log.errorFileSync(">>>>>>>>>>>>>修改商品ID为 ： " + model.getMaterialID() + "信息失败", e);
             flag = false;
             tipMsg = "失败";
             tipType = 1;
@@ -145,16 +153,16 @@ public class MaterialAction extends BaseAction<MaterialModel>
             } 
             catch (IOException e) 
             {
-                Log.errorFileSync(">>>>>>>>>>>>修改物料回写客户端结果异常", e);
+                Log.errorFileSync(">>>>>>>>>>>>修改商品回写客户端结果异常", e);
             }
         }
-        logService.create(new Logdetails(getUser(), "更新物料", model.getClientIp(),
+        logService.create(new Logdetails(getUser(), "更新商品", model.getClientIp(),
                 new Timestamp(System.currentTimeMillis())
-        , tipType, "更新物料ID为  "+ model.getMaterialID() + " " + tipMsg + "！", "更新物料" + tipMsg));
+        , tipType, "更新商品ID为  "+ model.getMaterialID() + " " + tipMsg + "！", "更新商品" + tipMsg));
 	}
 	
 	/**
-	 * 批量删除指定ID物料
+	 * 批量删除指定ID商品
 	 * @return
 	 */
 	public String batchDelete()
@@ -169,19 +177,19 @@ public class MaterialAction extends BaseAction<MaterialModel>
         } 
 	    catch (DataAccessException e) 
 	    {
-	        Log.errorFileSync(">>>>>>>>>>>批量删除物料ID为：" + model.getMaterialIDs() + "信息异常", e);
+	        Log.errorFileSync(">>>>>>>>>>>批量删除商品ID为：" + model.getMaterialIDs() + "信息异常", e);
 	        tipMsg = "失败";
             tipType = 1;
         }
 	    
-	    logService.create(new Logdetails(getUser(), "批量删除物料", model.getClientIp(),
+	    logService.create(new Logdetails(getUser(), "批量删除商品", model.getClientIp(),
                 new Timestamp(System.currentTimeMillis())
-        , tipType, "批量删除物料ID为  "+ model.getMaterialIDs() + " " + tipMsg + "！", "批量删除物料" + tipMsg));
+        , tipType, "批量删除商品ID为  "+ model.getMaterialIDs() + " " + tipMsg + "！", "批量删除商品" + tipMsg));
 	    return SUCCESS;
 	}
 	
 	/**
-	 * 查找物料信息
+	 * 查找商品信息
 	 * @return
 	 */
     public void findBy()
@@ -203,10 +211,6 @@ public class MaterialAction extends BaseAction<MaterialModel>
             materialService.find(pageUtil);
             List<Material> dataList = pageUtil.getPageList();
             
-            //开始拼接json数据
-//            {"total":28,"rows":[
-//                {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"}
-//            ]}
             JSONObject outer = new JSONObject();
             outer.put("total", pageUtil.getTotalCount());
             //存放数据json数组
@@ -221,6 +225,10 @@ public class MaterialAction extends BaseAction<MaterialModel>
                     item.put("Model", material.getModel());
                     item.put("Color", material.getColor());
                     item.put("Unit", material.getUnit());
+                    item.put("RetailPrice", material.getRetailPrice());
+                    item.put("LowPrice", material.getLowPrice());
+                    item.put("PresetPriceOne", material.getPresetPriceOne());
+                    item.put("PresetPriceTwo", material.getPresetPriceTwo());
                     item.put("Remark", material.getRemark());
                     item.put("op", 1);
                     dataArray.add(item);
@@ -232,16 +240,16 @@ public class MaterialAction extends BaseAction<MaterialModel>
         } 
 	    catch (DataAccessException e) 
 	    {
-	        Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找物料信息异常", e);
+	        Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品信息异常", e);
         } 
 	    catch (IOException e) 
 	    {
-            Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询物料信息结果异常", e);
+            Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品信息结果异常", e);
         }
 	}
     
 	/**
-	 * 查找物料信息-下拉框
+	 * 查找商品信息-下拉框
 	 * @return
 	 */
     public void findBySelect()
@@ -262,7 +270,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
                 {
                     JSONObject item = new JSONObject();
                     item.put("Id", material.getId());
-                    //供应商名称
+                    //名称
                     item.put("MaterialName", ((material.getModel().equals(""))?"":""+material.getModel()) +" "+ material.getName() + ((material.getColor() == null)?"":"("+material.getColor() + ")"));
                     dataArray.add(item);
                 }
@@ -281,7 +289,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
 	}
     
 	/**
-	 * 查找物料信息-统计排序
+	 * 查找商品信息-统计排序
 	 * @return
 	 */
     public void findByOrder()

src/com/jsh/action/materials/MaterialCategoryAction.java

@@ -44,19 +44,19 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
         }
         catch (Exception e)
         {
-            Log.errorFileSync(">>>>>>>>>>>>>查找物料类别信息异常", e);
+            Log.errorFileSync(">>>>>>>>>>>>>查找商品类别信息异常", e);
             model.getShowModel().setMsgTip("exceptoin");
         }
         return SUCCESS;
     }
     
 	/**
-	 * 增加物料类别
+	 * 增加商品类别
 	 * @return
 	 */
 	public void create()
 	{
-	    Log.infoFileSync("==================开始调用增加物料类别信息方法create()===================");
+	    Log.infoFileSync("==================开始调用增加商品类别信息方法create()===================");
 	    Boolean flag = false;
 		try
 		{
@@ -75,7 +75,7 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
 		}
 		catch (DataAccessException e)
 		{
-			Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加物料类别信息异常", e);
+			Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加商品类别信息异常", e);
 			flag = false;
 			tipMsg = "失败";
             tipType = 1;
@@ -88,23 +88,23 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
             } 
 		    catch (IOException e) 
 		    {
-                Log.errorFileSync(">>>>>>>>>>>>增加物料类别信息回写客户端结果异常", e);
+                Log.errorFileSync(">>>>>>>>>>>>增加商品类别信息回写客户端结果异常", e);
             }
 		}
 		
-		logService.create(new Logdetails(getUser(), "增加物料类别", model.getClientIp(),
+		logService.create(new Logdetails(getUser(), "增加商品类别", model.getClientIp(),
                 new Timestamp(System.currentTimeMillis())
-        , tipType, "增加物料类别名称为  "+ model.getName() + " " + tipMsg + "！", "增加物料类别" + tipMsg));
+        , tipType, "增加商品类别名称为  "+ model.getName() + " " + tipMsg + "！", "增加商品类别" + tipMsg));
-		Log.infoFileSync("==================结束调用增加物料类别方法create()===================");
+		Log.infoFileSync("==================结束调用增加商品类别方法create()===================");
 	}
 	
 	/**
-	 * 删除物料类别
+	 * 删除商品类别
 	 * @return
 	 */
 	public String delete()
 	{
-	    Log.infoFileSync("====================开始调用删除物料类别信息方法delete()================");
+	    Log.infoFileSync("====================开始调用删除商品类别信息方法delete()================");
 	    try 
 	    {
 	    	materialCategoryService.delete(model.getMaterialCategoryID());
@@ -113,20 +113,20 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
         } 
 	    catch (DataAccessException e) 
 	    {
-	        Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialCategoryID() + "  的物料类别异常", e);
+	        Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialCategoryID() + "  的商品类别异常", e);
 	        tipMsg = "失败";
             tipType = 1;
         }
 	    model.getShowModel().setMsgTip(tipMsg);
-	    logService.create(new Logdetails(getUser(), "删除物料类别", model.getClientIp(),
+	    logService.create(new Logdetails(getUser(), "删除商品类别", model.getClientIp(),
 	            new Timestamp(System.currentTimeMillis())
-	    , tipType, "删除物料类别ID为  "+ model.getMaterialCategoryID() + " " + tipMsg + "！", "删除物料类别" + tipMsg));
+	    , tipType, "删除商品类别ID为  "+ model.getMaterialCategoryID() + " " + tipMsg + "！", "删除商品类别" + tipMsg));
-	    Log.infoFileSync("====================结束调用删除物料类别信息方法delete()================");
+	    Log.infoFileSync("====================结束调用删除商品类别信息方法delete()================");
 	    return SUCCESS;
 	}
 	
 	/**
-	 * 更新物料类别
+	 * 更新商品类别
 	 * @return
 	 */
 	public void update()
@@ -147,7 +147,7 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
         } 
         catch (DataAccessException e) 
         {
-            Log.errorFileSync(">>>>>>>>>>>>>修改物料类别ID为 ： " + model.getMaterialCategoryID() + "信息失败", e);
+            Log.errorFileSync(">>>>>>>>>>>>>修改商品类别ID为 ： " + model.getMaterialCategoryID() + "信息失败", e);
             flag = false;
             tipMsg = "失败";
             tipType = 1;
@@ -160,16 +160,16 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
             } 
             catch (IOException e) 
             {
-                Log.errorFileSync(">>>>>>>>>>>>修改物料类别回写客户端结果异常", e);
+                Log.errorFileSync(">>>>>>>>>>>>修改商品类别回写客户端结果异常", e);
             }
         }
-        logService.create(new Logdetails(getUser(), "更新物料类别", model.getClientIp(),
+        logService.create(new Logdetails(getUser(), "更新商品类别", model.getClientIp(),
                 new Timestamp(System.currentTimeMillis())
-        , tipType, "更新物料类别ID为  "+ model.getMaterialCategoryID() + " " + tipMsg + "！", "更新物料类别" + tipMsg));
+        , tipType, "更新商品类别ID为  "+ model.getMaterialCategoryID() + " " + tipMsg + "！", "更新商品类别" + tipMsg));
 	}
 	
 	/**
-	 * 批量删除指定ID物料类别
+	 * 批量删除指定ID商品类别
 	 * @return
 	 */
 	public String batchDelete()
@@ -184,19 +184,19 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
         } 
 	    catch (DataAccessException e) 
 	    {
-	        Log.errorFileSync(">>>>>>>>>>>批量删除物料类别ID为：" + model.getMaterialCategoryIDs() + "信息异常", e);
+	        Log.errorFileSync(">>>>>>>>>>>批量删除商品类别ID为：" + model.getMaterialCategoryIDs() + "信息异常", e);
 	        tipMsg = "失败";
             tipType = 1;
         }
 	    
-	    logService.create(new Logdetails(getUser(), "批量删除物料类别", model.getClientIp(),
+	    logService.create(new Logdetails(getUser(), "批量删除商品类别", model.getClientIp(),
                 new Timestamp(System.currentTimeMillis())
-        , tipType, "批量删除物料类别ID为  "+ model.getMaterialCategoryIDs() + " " + tipMsg + "！", "批量删除物料类别" + tipMsg));
+        , tipType, "批量删除商品类别ID为  "+ model.getMaterialCategoryIDs() + " " + tipMsg + "！", "批量删除商品类别" + tipMsg));
 	    return SUCCESS;
 	}
 	
 	/**
-	 * 查找物料类别信息
+	 * 查找商品类别信息
 	 * @return
 	 */
     public void findBy()
@@ -238,11 +238,11 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
         } 
 	    catch (DataAccessException e) 
 	    {
-	        Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找物料类别信息异常", e);
+	        Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品类别信息异常", e);
         } 
 	    catch (IOException e) 
 	    {
-            Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询物料类别信息结果异常", e);
+            Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品类别信息结果异常", e);
         }
 	}
     

src/com/jsh/base/BaseDAO.java

@@ -10,7 +10,10 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 import com.jsh.util.common.PageUtil;
 import com.jsh.util.common.SearchConditionUtil;
-
+/**
+ * 基础dao
+ * @author ji_sheng_hua
+ */
 public class BaseDAO<T> extends HibernateDaoSupport implements BaseIDAO<T>
 {
 	protected Class<T> entityClass;

src/com/jsh/base/BaseIDAO.java

@@ -10,7 +10,7 @@ import com.jsh.util.common.PageUtil;
 
 /**
  * 常用增删改查操作
- * @author jishenghua 
+ * @author ji-sheng-hua 
  * @param <T>
  */
 public interface BaseIDAO<T>

src/com/jsh/base/Log.java

@@ -4,7 +4,7 @@ import org.apache.log4j.Logger;
 
 /**
  * 封装log4j日志信息，打印日志信息类
- * @author jishenghua
+ * @author ji/sheng/hua
  * @since 2014-01-22
  */
 public class Log

src/com/jsh/dao/basic/VisitAccountDAO.java

@@ -1,17 +0,0 @@
-package com.jsh.dao.basic;
-
-import com.jsh.base.BaseDAO;
-import com.jsh.model.po.VisitAccount;
-
-public class VisitAccountDAO extends BaseDAO<VisitAccount> implements VisitAccountIDAO
-{
-	/**
-     * 设置dao映射基类
-     * @return
-     */
-	@Override
-    public Class<VisitAccount> getEntityClass()
-    {
-        return VisitAccount.class;
-    }
-}

src/com/jsh/dao/basic/VisitAccountIDAO.java

@@ -1,9 +0,0 @@
-package com.jsh.dao.basic;
-
-import com.jsh.base.BaseIDAO;
-import com.jsh.model.po.VisitAccount;
-
-public interface VisitAccountIDAO extends BaseIDAO<VisitAccount>
-{
-	
-}

src/com/jsh/model/po/Material.hbm.xml

@@ -30,6 +30,26 @@
                 <comment>单位</comment>
             </column>
         </property>
+        <property generated="never" lazy="false" name="RetailPrice" type="java.lang.Double">
+            <column name="RetailPrice" precision="22" scale="3">
+                <comment>零售价</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="LowPrice" type="java.lang.Double">
+            <column name="LowPrice" precision="22" scale="3">
+                <comment>最低售价</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="PresetPriceOne" type="java.lang.Double">
+            <column name="PresetPriceOne" precision="22" scale="3">
+                <comment>预设售价一</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="PresetPriceTwo" type="java.lang.Double">
+            <column name="PresetPriceTwo" precision="22" scale="3">
+                <comment>预设售价二</comment>
+            </column>
+        </property>
         <property generated="never" lazy="false" name="Remark" type="java.lang.String">
             <column length="100" name="Remark">
                 <comment>备注</comment>

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

@@ -9,6 +9,10 @@ public class Material implements java.io.Serializable
 	private String Model;
 	private String Color;
 	private String Unit;
+    private Double RetailPrice;
+    private Double LowPrice;
+    private Double PresetPriceOne;
+    private Double PresetPriceTwo;
 	private String Remark;
 
 	public Material()
@@ -22,69 +26,129 @@ public class Material implements java.io.Serializable
 	}
 
 	public Material(MaterialCategory materialCategory, String name,
-			String model, String color, String unit, String remark) {
+                    String model, String color, String unit, String remark,
+                    Double retailPrice, Double lowPrice, Double presetPriceOne, Double presetPriceTwo)
+    {
 		super();
 		this.materialCategory = materialCategory;
 		Name = name;
 		Model = model;
 		Color = color;
 		Unit = unit;
+        RetailPrice = retailPrice;
+        LowPrice = lowPrice;
+        PresetPriceOne = presetPriceOne;
+        PresetPriceTwo = presetPriceTwo;
 		Remark = remark;
 	}
 
-	public Long getId() {
+	public Long getId()
+    {
 		return Id;
 	}
 
-	public void setId(Long id) {
+	public void setId(Long id)
+    {
 		Id = id;
 	}
 
-	public MaterialCategory getMaterialCategory() {
+	public MaterialCategory getMaterialCategory()
+    {
 		return materialCategory;
 	}
 
-	public void setMaterialCategory(MaterialCategory materialCategory) {
+	public void setMaterialCategory(MaterialCategory materialCategory)
+    {
 		this.materialCategory = materialCategory;
 	}
 
-	public String getName() {
+	public String getName()
+    {
 		return Name;
 	}
 
-	public void setName(String name) {
+	public void setName(String name)
+    {
 		Name = name;
 	}
 
-	public String getModel() {
+	public String getModel()
+    {
 		return Model;
 	}
 
-	public void setModel(String model) {
+	public void setModel(String model)
+    {
 		Model = model;
 	}
 
-	public String getColor() {
+	public String getColor()
+    {
 		return Color;
 	}
 
-	public void setColor(String color) {
+	public void setColor(String color)
+    {
 		Color = color;
 	}
 
-	public String getUnit() {
+	public String getUnit()
+    {
 		return Unit;
 	}
 
-	public void setUnit(String unit) {
+	public void setUnit(String unit)
+    {
 		Unit = unit;
 	}
     
-	public String getRemark() {
+    public void setRetailPrice(Double retailPrice)
+    {
+        RetailPrice = retailPrice;
+    }
+
+    public Double getRetailPrice()
+    {
+        return RetailPrice;
+    }
+
+    public void setLowPrice(Double lowPrice)
+    {
+        LowPrice = lowPrice;
+    }
+
+    public Double getLowPrice()
+    {
+        return LowPrice;
+    }
+
+    public void setPresetPriceOne(Double presetPriceOne)
+    {
+        PresetPriceOne = presetPriceOne;
+    }
+
+    public Double getPresetPriceOne()
+    {
+        return PresetPriceOne;
+    }
+
+    public void setPresetPriceTwo(Double presetPriceTwo)
+    {
+        PresetPriceTwo = presetPriceTwo;
+    }
+
+    public Double getPresetPriceTwo()
+    {
+        return PresetPriceTwo;
+    }
+
+	public String getRemark()
+    {
 		return Remark;
 	}
 
-	public void setRemark(String remark) {
+	public void setRemark(String remark)
+    {
 		Remark = remark;
 	}
 

src/com/jsh/model/po/Supplier.hbm.xml

@@ -32,6 +32,26 @@
                 <comment>电子邮箱</comment>
             </column>
         </property>
+        <property generated="never" lazy="false" name="BeginNeedGet" type="java.lang.Double">
+            <column name="BeginNeedGet" precision="22" scale="3">
+                <comment>期初应收</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="BeginNeedPay" type="java.lang.Double">
+            <column name="BeginNeedPay" precision="22" scale="3">
+                <comment>期初应付</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="AllNeedGet" type="java.lang.Double">
+            <column name="AllNeedGet" precision="22" scale="3">
+                <comment>累计应收</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="AllNeedPay" type="java.lang.Double">
+            <column name="AllNeedPay" precision="22" scale="3">
+                <comment>累计应付</comment>
+            </column>
+        </property>
         <property name="description" type="java.lang.String">
             <column name="description" length="500" />
         </property>

src/com/jsh/model/po/Supplier.java

@@ -9,6 +9,10 @@ public class Supplier implements java.io.Serializable
 	private String contacts;
 	private String phonenum;
 	private String email;
+    private Double BeginNeedGet;
+    private Double BeginNeedPay;
+    private Double AllNeedGet;
+    private Double AllNeedPay;
 	private Short isystem;
 	private String description;
 	private Boolean enabled;
@@ -23,29 +27,36 @@ public class Supplier implements java.io.Serializable
 	    this.id = id;
 	}
 
-	public Supplier(String supplier, String type, String contacts,
+	public Supplier(String supplier, String type, String contacts, String phonenum, 
-			String phonenum, String email, Short isystem, String description,
+    String email, Short isystem, String description, Boolean enabled,
-			Boolean enabled) {
+                    Double beginNeedGet,Double beginNeedPay,Double allNeedGet,Double allNeedPay) {
 		super();
 		this.supplier = supplier;
 		this.type = type;
 		this.contacts = contacts;
 		this.phonenum = phonenum;
 		this.email = email;
+        this.BeginNeedGet = beginNeedGet;
+        this.BeginNeedPay = beginNeedPay;
+        this.AllNeedGet = allNeedGet;
+        this.AllNeedPay = allNeedPay; 
 		this.isystem = isystem;
 		this.description = description;
 		this.enabled = enabled;
 	}
 
-	public Long getId() {
+	public Long getId()
+    {
 		return id;
 	}
 
-	public void setId(Long id) {
+	public void setId(Long id)
+    {
 		this.id = id;
 	}
 
-	public String getSupplier() {
+	public String getSupplier()
+    {
 		return supplier;
 	}
 
@@ -85,6 +96,46 @@ public class Supplier implements java.io.Serializable
 		this.email = email;
 	}
     
+    public void setBeginNeedGet(Double beginNeedGet)
+    {
+        BeginNeedGet = beginNeedGet;
+    }
+
+    public Double getBeginNeedGet()
+    {
+        return BeginNeedGet;
+    }
+
+    public void setBeginNeedPay(Double beginNeedPay)
+    {
+        BeginNeedPay = beginNeedPay;
+    }
+
+    public Double getBeginNeedPay()
+    {
+        return BeginNeedPay;
+    }
+
+    public void setAllNeedGet(Double allNeedGet)
+    {
+        AllNeedGet = allNeedGet;
+    }
+
+    public Double getAllNeedGet()
+    {
+        return AllNeedGet;
+    }
+
+    public void setAllNeedPay(Double allNeedPay)
+    {
+        AllNeedPay = allNeedPay;
+    }
+
+    public Double getAllNeedPay()
+    {
+        return AllNeedPay;
+    }
+
 	public Short getIsystem() {
 		return isystem;
 	}
@@ -109,6 +160,4 @@ public class Supplier implements java.io.Serializable
 		this.enabled = enabled;
 	}	
     
-
-	
 }

src/com/jsh/model/po/VisitAccount.hbm.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-                                   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
- <class name="com.jsh.model.po.VisitAccount" table="jsh_visitaccount">
-  <id name="Id" type="java.lang.Long">
-   <column name="Id"/>
-   <generator class="native"/>
-  </id>
-  <many-to-one name="depot" class="com.jsh.model.po.Depot" lazy="false">
-    <column name="ProjectId" not-null="true" />
-  </many-to-one>
-  <property generated="never" lazy="false" name="LouHao" type="java.lang.String">
-   <column length="50" name="LouHao">
-    <comment>楼号</comment>
-   </column>
-  </property>
-  <property generated="never" lazy="false" name="HuHao" type="java.lang.String">
-   <column length="50" name="HuHao">
-    <comment>户号</comment>
-   </column>
-  </property>
-  <property generated="never" lazy="false" name="HuiFang" type="java.lang.String">
-   <column length="50" name="HuiFang">
-    <comment>回访情况</comment>
-   </column>
-  </property>
-  <property generated="never" lazy="false" name="LuoShi" type="java.lang.String">
-   <column length="50" name="LuoShi">
-    <comment>落实情况</comment>
-   </column>
-  </property>
-   <property generated="never" lazy="false" name="Name" type="java.lang.String">
-   <column length="50" name="Name">
-    <comment>住户姓名</comment>
-   </column>
-  </property>
-   <property generated="never" lazy="false" name="Tel" type="java.lang.String">
-   <column length="50" name="Tel">
-    <comment>电话 </comment>
-   </column>
-  </property>
-  <property name="AddTime" type="java.sql.Timestamp">
-    <column length="19" name="AddTime">
-    <comment>时间 </comment>
-    </column>
-  </property>
- </class>
-</hibernate-mapping>

src/com/jsh/model/po/VisitAccount.java

@@ -1,114 +0,0 @@
-package com.jsh.model.po;
-
-import java.sql.Timestamp;
-
-@SuppressWarnings("serial")
-public class VisitAccount implements java.io.Serializable
-{
-	private Long Id;
-	private Depot depot;
-	private String LouHao;
-	private String HuHao;
-	private String HuiFang;
-	private String LuoShi;
-	private String Name;
-	private String Tel;
-	private Timestamp AddTime;
-
-	public VisitAccount()
-	{
-		
-	}
-	
-	public VisitAccount(Long Id)
-	{
-		this.Id = Id;
-	}
-
-	public VisitAccount(Depot depot, String LouHao, String HuHao,
-			String HuiFang,String LuoShi,String Name,String Tel,Timestamp AddTime)
-	{
-		this.depot = depot;
-		this.LouHao = LouHao;
-		this.HuHao = HuHao;
-		this.HuiFang = HuiFang;
-		this.LuoShi = LuoShi;
-		this.Name = Name;
-		this.Tel = Tel;
-		this.AddTime = AddTime;
-	}
-
-	public Long getId() {
-		return Id;
-	}
-
-	public void setId(Long id) {
-		Id = id;
-	}
-
-	public Depot getDepot() {
-		return depot;
-	}
-
-	public void setDepot(Depot depot) {
-		this.depot = depot;
-	}
-
-	public String getLouHao() {
-		return LouHao;
-	}
-
-	public void setLouHao(String louHao) {
-		LouHao = louHao;
-	}
-
-	public String getHuHao() {
-		return HuHao;
-	}
-
-	public void setHuHao(String huHao) {
-		HuHao = huHao;
-	}
-
-	public String getHuiFang() {
-		return HuiFang;
-	}
-
-	public void setHuiFang(String huiFang) {
-		HuiFang = huiFang;
-	}
-
-	public String getLuoShi() {
-		return LuoShi;
-	}
-
-	public void setLuoShi(String luoShi) {
-		LuoShi = luoShi;
-	}
-
-	public String getName() {
-		return Name;
-	}
-
-	public void setName(String name) {
-		Name = name;
-	}
-
-	public String getTel() {
-		return Tel;
-	}
-
-	public void setTel(String tel) {
-		Tel = tel;
-	}
-
-	public Timestamp getAddTime() {
-		return AddTime;
-	}
-
-	public void setAddTime(Timestamp addTime) {
-		AddTime = addTime;
-	}
-
-	
-}

src/com/jsh/model/vo/basic/SupplierModel.java

@@ -33,6 +33,26 @@ public class SupplierModel implements Serializable
 	 */
 	private String email = "";    
     
+    /**
+     * 期初应收
+	 */
+    private Double BeginNeedGet;
+    
+    /**
+     * 期初应付
+	 */
+    private Double BeginNeedPay;
+     
+    /**
+     * 累计应收
+	 */
+    private Double AllNeedGet;
+     
+    /**
+     * 累计应付
+	 */    
+    private Double AllNeedPay;
+	
 	/**
 	 * 描述信息
 	 */
@@ -116,6 +136,46 @@ public class SupplierModel implements Serializable
 		this.email = email;
 	}
     
+    public void setBeginNeedGet(Double beginNeedGet)
+    {
+        BeginNeedGet = beginNeedGet;
+    }
+
+    public Double getBeginNeedGet()
+    {
+        return BeginNeedGet;
+    }
+
+    public void setBeginNeedPay(Double beginNeedPay)
+    {
+        BeginNeedPay = beginNeedPay;
+    }
+
+    public Double getBeginNeedPay()
+    {
+        return BeginNeedPay;
+    }
+
+    public void setAllNeedGet(Double allNeedGet)
+    {
+        AllNeedGet = allNeedGet;
+    }
+
+    public Double getAllNeedGet()
+    {
+        return AllNeedGet;
+    }
+
+    public void setAllNeedPay(Double allNeedPay)
+    {
+        AllNeedPay = allNeedPay;
+    }
+
+    public Double getAllNeedPay()
+    {
+        return AllNeedPay;
+    }    
+
 	public String getDescription() {
 		return description;
 	}

src/com/jsh/model/vo/basic/VisitAccountModel.java

@@ -1,184 +0,0 @@
-package com.jsh.model.vo.basic;
-
-import java.io.Serializable;
-
-@SuppressWarnings("serial")
-public class VisitAccountModel implements Serializable
-{
-    private VisitAccountShowModel showModel = new VisitAccountShowModel();
-
-    /**======开始接受页面参数=================**/
-    /**
-     * ProjectId
-     */
-    private Long ProjectId;
-    /**
-     * 楼号
-     */
-    private String LouHao = "";
-    /**
-     * 户号
-     */
-    private String HuHao = "";
-    /**
-     * 回访情况
-     */
-    private String HuiFang = "";
-    /**
-     * 落实情况
-     */
-    private String LuoShi = "";
-    /**
-     * 住户姓名
-     */
-    private String Name = "";
-    /**
-     * 电话
-     */
-    private String Tel = "";
-    /**
-     * 时间
-     */
-    private String AddTime = "";
-    
-    /**
-     * 分类ID
-     */
-    private Long visitAccountID = 0l;
-    
-    /**
-     * 分类IDs 批量操作使用
-     */
-    private String visitAccountIDs = "";
-    
-    /**
-     * 每页显示的个数
-     */
-    private int pageSize = 10;
-    
-    /**
-     * 当前页码
-     */
-    private int pageNo = 1;
-    
-    /**
-     * 用户IP，用户记录操作日志
-     */
-    private String clientIp = "";
-
-
-	public VisitAccountShowModel getShowModel() {
-		return showModel;
-	}
-
-	public void setShowModel(VisitAccountShowModel showModel) {
-		this.showModel = showModel;
-	}
-
-	public Long getProjectId() {
-		return ProjectId;
-	}
-
-	public void setProjectId(Long projectId) {
-		ProjectId = projectId;
-	}
-
-	public String getLouHao() {
-		return LouHao;
-	}
-
-	public void setLouHao(String louHao) {
-		LouHao = louHao;
-	}
-
-	public String getHuHao() {
-		return HuHao;
-	}
-
-	public void setHuHao(String huHao) {
-		HuHao = huHao;
-	}
-
-	public String getHuiFang() {
-		return HuiFang;
-	}
-
-	public void setHuiFang(String huiFang) {
-		HuiFang = huiFang;
-	}
-
-	public String getLuoShi() {
-		return LuoShi;
-	}
-
-	public void setLuoShi(String luoShi) {
-		LuoShi = luoShi;
-	}
-
-	public String getName() {
-		return Name;
-	}
-
-	public void setName(String name) {
-		Name = name;
-	}
-
-	public String getTel() {
-		return Tel;
-	}
-
-	public void setTel(String tel) {
-		Tel = tel;
-	}
-
-	public String getAddTime() {
-		return AddTime;
-	}
-
-	public void setAddTime(String addTime) {
-		AddTime = addTime;
-	}
-
-	public Long getVisitAccountID() {
-		return visitAccountID;
-	}
-
-	public void setVisitAccountID(Long visitAccountID) {
-		this.visitAccountID = visitAccountID;
-	}
-
-	public String getVisitAccountIDs() {
-		return visitAccountIDs;
-	}
-
-	public void setVisitAccountIDs(String visitAccountIDs) {
-		this.visitAccountIDs = visitAccountIDs;
-	}
-
-	public int getPageSize() {
-		return pageSize;
-	}
-
-	public void setPageSize(int pageSize) {
-		this.pageSize = pageSize;
-	}
-
-	public int getPageNo() {
-		return pageNo;
-	}
-
-	public void setPageNo(int pageNo) {
-		this.pageNo = pageNo;
-	}
-
-	public String getClientIp() {
-		return clientIp;
-	}
-
-	public void setClientIp(String clientIp) {
-		this.clientIp = clientIp;
-	}
-
-
-	
-}

src/com/jsh/model/vo/basic/VisitAccountShowModel.java

@@ -1,22 +0,0 @@
-package com.jsh.model.vo.basic;
-
-import java.io.Serializable;
-
-@SuppressWarnings("serial")
-public class VisitAccountShowModel implements Serializable
-{
-    /**
-     * 提示信息
-     */
-    private String msgTip = "";
-
-    public String getMsgTip() 
-    {
-        return msgTip;
-    }
-
-    public void setMsgTip(String msgTip) 
-    {
-        this.msgTip = msgTip;
-    }
-}

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

@@ -28,6 +28,26 @@ public class MaterialModel implements Serializable
      */
     private String Unit = "";    
         
+    /**
+     * 零售价
+     */
+    private Double RetailPrice;
+    
+    /**
+     * 最低售价
+     */
+    private Double LowPrice;
+     
+    /**
+     * 预设售价一
+     */
+    private Double PresetPriceOne;
+     
+    /**
+     * 预设售价二
+     */ 
+    private Double PresetPriceTwo;
+    
     /**
      * 备注
      */
@@ -108,6 +128,46 @@ public class MaterialModel implements Serializable
 		Unit = unit;
 	}
     
+    public void setRetailPrice(Double retailPrice)
+    {
+        RetailPrice = retailPrice;
+    }
+
+    public Double getRetailPrice()
+    {
+        return RetailPrice;
+    }
+
+    public void setLowPrice(Double lowPrice)
+    {
+        LowPrice = lowPrice;
+    }
+
+    public Double getLowPrice()
+    {
+        return LowPrice;
+    }
+
+    public void setPresetPriceOne(Double presetPriceOne)
+    {
+        PresetPriceOne = presetPriceOne;
+    }
+
+    public Double getPresetPriceOne()
+    {
+        return PresetPriceOne;
+    }
+
+    public void setPresetPriceTwo(Double presetPriceTwo)
+    {
+        PresetPriceTwo = presetPriceTwo;
+    }
+
+    public Double getPresetPriceTwo()
+    {
+        return PresetPriceTwo;
+    }
+
 	public String getRemark() {
 		return Remark;
 	}

src/com/jsh/service/basic/VisitAccountIService.java

@@ -1,9 +0,0 @@
-package com.jsh.service.basic;
-
-import com.jsh.base.BaseIService;
-import com.jsh.model.po.VisitAccount;
-
-public interface VisitAccountIService extends BaseIService<VisitAccount>
-{
-	
-}

src/com/jsh/service/basic/VisitAccountService.java

@@ -1,24 +0,0 @@
-package com.jsh.service.basic;
-
-import com.jsh.base.BaseService;
-import com.jsh.dao.basic.VisitAccountIDAO;
-import com.jsh.model.po.VisitAccount;
-
-public class VisitAccountService extends BaseService<VisitAccount> implements VisitAccountIService
-{
-	@SuppressWarnings("unused")
-	private VisitAccountIDAO visitAccountDao;
-
-	
-	public void setVisitAccountDao(VisitAccountIDAO visitAccountDao) {
-		this.visitAccountDao = visitAccountDao;
-	}
-
-
-	@Override
-	protected Class<VisitAccount> getEntityClass()
-	{
-		return VisitAccount.class;
-	}
-    
-}