no commit message

src/com/jsh/action/asset/AssetAction.java

@@ -17,8 +17,8 @@ import org.springframework.dao.DataAccessException;
 
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
-import com.jsh.constants.asset.AssetConstants;
+import com.jsh.util.AssetConstants;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
 import com.jsh.model.po.Assetname;
 import com.jsh.model.po.Basicuser;
@@ -30,8 +30,8 @@ import com.jsh.service.basic.AssetNameIService;
 import com.jsh.service.basic.CategoryIService;
 import com.jsh.service.basic.SupplierIService;
 import com.jsh.service.basic.UserIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.Tools;
+import com.jsh.util.Tools;
 
 @SuppressWarnings("serial")
 public class AssetAction extends BaseAction<AssetModel>

src/com/jsh/action/asset/ReportAction.java

@@ -5,11 +5,11 @@ import java.util.Map;
 
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
 import com.jsh.model.vo.asset.ReportModel;
 import com.jsh.service.asset.ReportIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 @SuppressWarnings("serial")
 public class ReportAction extends BaseAction<ReportModel>

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

@@ -5,22 +5,19 @@ import java.sql.Timestamp;
 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.Logdetails;
 import com.jsh.model.po.Account;
 import com.jsh.model.vo.basic.AccountModel;
 import com.jsh.service.basic.AccountIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 /**
  * 结算账户
- * @author ji sheng hua
+ * @author ji sheng hua qq752718920
  */
 @SuppressWarnings("serial")
 public class AccountAction extends BaseAction<AccountModel>
@@ -28,6 +25,28 @@ public class AccountAction extends BaseAction<AccountModel>
     private AccountIService accountService;
     private AccountModel model = new AccountModel();
 
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public String getAccount()
+    {
+        Map<String,List> mapData = model.getShowModel().getMap();
+        PageUtil pageUtil = new  PageUtil();
+        pageUtil.setPageSize(0);
+        pageUtil.setCurPage(0);
+        try
+        {
+            Map<String,Object> condition = pageUtil.getAdvSearch();
+            condition.put("Id_s_order", "asc");
+            accountService.find(pageUtil);
+            mapData.put("accountList", pageUtil.getPageList());
+        }
+        catch (Exception e)
+        {
+            Log.errorFileSync(">>>>>>>>>>>>>查找账户信息异常", e);
+            model.getShowModel().setMsgTip("exception");
+        }
+        return SUCCESS;
+    }
+	
     /**
      * 增加结算账户
      * @return

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

@@ -1,4 +1,5 @@
 package com.jsh.action.basic;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -6,30 +7,26 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
 import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-
 import org.apache.struts2.ServletActionContext;
 import org.springframework.dao.DataAccessException;
-
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.App;
 import com.jsh.model.po.Logdetails;
 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.jsh.util.PageUtil;
 /**
  * 应用
- * @author ji_sheng_hua
+ * @author ji_sheng_hua  qq752 718 920
  */
 @SuppressWarnings("serial")
 public class AppAction extends BaseAction<AppModel>

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

@@ -5,12 +5,9 @@ import java.sql.Timestamp;
 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.Assetname;
@@ -18,7 +15,7 @@ import com.jsh.model.po.Category;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.vo.basic.AssetNameModel;
 import com.jsh.service.basic.AssetNameIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 @SuppressWarnings("serial")
 public class AssetNameAction extends BaseAction<AssetNameModel>

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

@@ -5,20 +5,19 @@ import java.sql.Timestamp;
 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.Logdetails;
 import com.jsh.model.vo.basic.CategoryModel;
 import com.jsh.service.basic.CategoryIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-
+/*
+ * @author jishenghua  qq:7-5-2-7-1-8-9-2-0
+*/
 @SuppressWarnings("serial")
 public class CategoryAction extends BaseAction<CategoryModel>
 {

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

@@ -5,25 +5,22 @@ import java.sql.Timestamp;
 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.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Depot;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.po.Role;
 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;
+import com.jsh.util.PageUtil;
 /**
- * 仓库
+ * 仓库管理
- * @author ji sheng hua
+ * @author jishenghua  qq:7-5-2-7-1-8-9-2-0
  */
 @SuppressWarnings("serial")
 public class DepotAction extends BaseAction<DepotModel>

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

@@ -5,23 +5,23 @@ import java.sql.Timestamp;
 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.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.App;
 import com.jsh.model.po.Functions;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.vo.basic.FunctionsModel;
 import com.jsh.service.basic.FunctionsIService;
 import com.jsh.service.basic.UserBusinessIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-
+/*
+* 功能管理
+* @author jishenghua  qq:7-5-2-7-1-8-9-2-0
+*/
 @SuppressWarnings("serial")
 public class FunctionsAction extends BaseAction<FunctionsModel>
 {

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

@@ -5,22 +5,19 @@ import java.sql.Timestamp;
 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.Logdetails;
 import com.jsh.model.po.InOutItem;
 import com.jsh.model.vo.basic.InOutItemModel;
 import com.jsh.service.basic.InOutItemIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 /**
  * 收支项目
- * @author ji*sheng*hua
+ * @author ji*sheng*hua  qq 7.5.2.7.1.8.9.2.0
  */
 @SuppressWarnings("serial")
 public class InOutItemAction extends BaseAction<InOutItemModel>
@@ -266,9 +263,9 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
                 for(InOutItem inOutItem:dataList)
                 {
                     JSONObject item = new JSONObject();
-                    item.put("id", inOutItem.getId());
+                    item.put("Id", inOutItem.getId());
                     //收支项目名称
-                    item.put("name", inOutItem.getName());
+                    item.put("InOutItemName", inOutItem.getName());
                     dataArray.add(item);
                 }
             }

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

@@ -5,20 +5,21 @@ import java.sql.Timestamp;
 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.Logdetails;
 import com.jsh.model.vo.basic.LogModel;
 import com.jsh.service.basic.UserIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.Tools;
+import com.jsh.util.Tools;
 
+/*
+ *日志管理
+ * @author jishenghua  qq:7-5-2-7-1-8-9-2-0
+*/
 @SuppressWarnings("serial")
 public class LogAction extends BaseAction<LogModel>
 {

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

@@ -5,23 +5,23 @@ import java.sql.Timestamp;
 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.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.App;
 import com.jsh.model.po.Role;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.vo.basic.RoleModel;
 import com.jsh.service.basic.RoleIService;
 import com.jsh.service.basic.UserBusinessIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-
+/*
+ * 角色管理
+ * @author jishenghua  qq:7-5-2-7-1-8-9-2-0
+*/
 @SuppressWarnings("serial")
 public class RoleAction extends BaseAction<RoleModel>
 {

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

@@ -5,20 +5,20 @@ import java.sql.Timestamp;
 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.Logdetails;
 import com.jsh.model.po.Supplier;
 import com.jsh.model.vo.basic.SupplierModel;
 import com.jsh.service.basic.SupplierIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-
+/*
+ * 单位管理
+ * @author jishenghua  qq:752718920
+*/
 @SuppressWarnings("serial")
 public class SupplierAction extends BaseAction<SupplierModel>
 {

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

@@ -6,22 +6,22 @@ import java.sql.Timestamp;
 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.constants.common.ExceptionCodeConstants;
+import com.jsh.util.ExceptionCodeConstants;
 import com.jsh.model.po.Basicuser;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.vo.basic.UserModel;
 import com.jsh.service.basic.UserIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.Tools;
+import com.jsh.util.Tools;
-
+/*
+ * 用户管理
+ * @author jishenghua  qq:752718920
+*/
 @SuppressWarnings("serial")
 public class UserAction extends BaseAction<UserModel> 
 {

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

@@ -5,18 +5,18 @@ import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-
 import org.springframework.dao.DataAccessException;
-
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
 import com.jsh.model.po.UserBusiness;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.vo.basic.UserBusinessModel;
 import com.jsh.service.basic.UserBusinessIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-
+/*
+ * 权限关系管理
+ * @author jishenghua  qq:752718920
+*/
 @SuppressWarnings("serial")
 public class UserBusinessAction extends BaseAction<UserBusinessModel>
 {

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

@@ -0,0 +1,306 @@
+package com.jsh.action.materials;
+
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.text.ParseException;
+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.Building;
+import com.jsh.model.po.Account;
+import com.jsh.model.po.AccountHead;
+import com.jsh.model.po.Logdetails;
+import com.jsh.model.po.Person;
+import com.jsh.model.po.Supplier;
+import com.jsh.model.vo.materials.AccountHeadModel;
+import com.jsh.service.materials.AccountHeadIService;
+import com.jsh.util.PageUtil;
+import com.jsh.util.Tools;
+/*
+ * 财务表头管理
+ * @author jishenghua  qq:752718920
+ */
+@SuppressWarnings("serial")
+public class AccountHeadAction extends BaseAction<AccountHeadModel>
+{
+    private AccountHeadIService accountHeadService;
+    private AccountHeadModel model = new AccountHeadModel();
+
+    /*
+     * 获取MaxId
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public String getMaxId()  
+    {
+        Map<String,List> mapData = model.getShowModel().getMap();
+        PageUtil pageUtil = new  PageUtil();
+        pageUtil.setPageSize(0);
+        pageUtil.setCurPage(0);
+        try
+        {
+            accountHeadService.find(pageUtil,"maxId");
+            mapData.put("accountHeadMax", pageUtil.getPageList());
+        }
+        catch (Exception e)
+        {
+            Log.errorFileSync(">>>>>>>>>>>>>查找最大的Id信息异常", e);
+            model.getShowModel().setMsgTip("exceptoin");
+        }
+        return SUCCESS;
+    }
+
+    /**
+     * 增加财务
+     * @return
+     */
+    public void create()
+    {
+        Log.infoFileSync("==================开始调用增加财务信息方法create()===================");
+        Boolean flag = false;
+        try
+        {
+            AccountHead accountHead = new AccountHead();
+            accountHead.setType(model.getType());
+            if(model.getOrganId()!=null){accountHead.setOrganId(new Supplier(model.getOrganId()));} 
+            if(model.getHandsPersonId()!=null){accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));}     
+            accountHead.setChangeAmount(model.getChangeAmount());
+            if(model.getAccountId()!=null){accountHead.setAccountId(new Account(model.getAccountId()));}
+            accountHead.setBillNo(model.getBillNo());
+            try
+            {
+                accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd").getTime()));
+            }
+            catch (ParseException e)
+            {
+                Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
+            } 
+            accountHead.setRemark(model.getRemark());
+            accountHeadService.create(accountHead);
+
+            //========标识位===========
+            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.getBillNo() + " " + tipMsg + "！", "增加财务" + tipMsg));
+        Log.infoFileSync("==================结束调用增加财务方法create()===================");
+    }
+
+    /**
+     * 删除财务
+     * @return
+     */
+    public String delete()
+    {
+        Log.infoFileSync("====================开始调用删除财务信息方法delete()================");
+        try 
+        {
+            accountHeadService.delete(model.getAccountHeadID());
+            tipMsg = "成功";
+            tipType = 0;
+        } 
+        catch (DataAccessException e) 
+        {
+            Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAccountHeadID() + "  的财务异常", e);
+            tipMsg = "失败";
+            tipType = 1;
+        }
+        model.getShowModel().setMsgTip(tipMsg);
+        logService.create(new Logdetails(getUser(), "删除财务", model.getClientIp(),
+             new Timestamp(System.currentTimeMillis())
+          , tipType, "删除财务ID为  "+ model.getAccountHeadID() + " " + tipMsg + "！", "删除财务" + tipMsg));
+        Log.infoFileSync("====================结束调用删除财务信息方法delete()================");
+        return SUCCESS;
+    }
+
+    /**
+     * 更新财务
+     * @return
+     */
+    public void update()
+    {
+        Boolean flag = false;
+        try
+        {
+            AccountHead accountHead = accountHeadService.get(model.getAccountHeadID());
+            accountHead.setType(model.getType());
+            if(model.getOrganId()!=null){accountHead.setOrganId(new Supplier(model.getOrganId()));} 
+            if(model.getHandsPersonId()!=null){accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));}     
+            accountHead.setChangeAmount(model.getChangeAmount());
+            if(model.getAccountId()!=null){accountHead.setAccountId(new Account(model.getAccountId()));}
+            accountHead.setBillNo(model.getBillNo());
+            try
+            {
+                accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd").getTime()));
+            }
+            catch (ParseException e)
+            {
+                Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
+            } 
+            accountHead.setRemark(model.getRemark());
+            accountHeadService.update(accountHead);
+
+            flag = true;
+            tipMsg = "成功";
+            tipType = 0;
+        } 
+        catch (DataAccessException e) 
+        {
+            Log.errorFileSync(">>>>>>>>>>>>>修改财务ID为 ： " + model.getAccountHeadID() + "信息失败", 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.getAccountHeadID() + " " + tipMsg + "！", "更新财务" + tipMsg));
+    }
+
+    /**
+     * 批量删除指定ID财务
+     * @return
+     */
+    public String batchDelete()
+    {
+        try
+        {
+            accountHeadService.batchDelete(model.getAccountHeadIDs());
+            model.getShowModel().setMsgTip("成功");
+            //记录操作日志使用
+            tipMsg = "成功";
+            tipType = 0;
+        } 
+        catch (DataAccessException e) 
+        {
+            Log.errorFileSync(">>>>>>>>>>>批量删除财务ID为：" + model.getAccountHeadIDs() + "信息异常", e);
+            tipMsg = "失败";
+            tipType = 1;
+        }
+
+        logService.create(new Logdetails(getUser(), "批量删除财务", model.getClientIp(),
+                   new Timestamp(System.currentTimeMillis())
+        , tipType, "批量删除财务ID为  "+ model.getAccountHeadIDs() + " " + tipMsg + "！", "批量删除财务" + tipMsg));
+        return SUCCESS;
+    }
+
+    /**
+     * 查找财务信息
+     * @return
+     */
+    public void findBy()
+    {
+        try 
+        {
+            PageUtil<AccountHead> pageUtil = new  PageUtil<AccountHead>();
+            pageUtil.setPageSize(model.getPageSize());
+            pageUtil.setCurPage(model.getPageNo());
+            pageUtil.setAdvSearch(getCondition());
+            accountHeadService.find(pageUtil);
+            List<AccountHead> dataList = pageUtil.getPageList();
+
+            JSONObject outer = new JSONObject();
+            outer.put("total", pageUtil.getTotalCount());
+            //存放数据json数组
+            JSONArray dataArray = new JSONArray();
+            if(null != dataList)
+            {
+                for(AccountHead accountHead:dataList)
+                {
+                    JSONObject item = new JSONObject();
+                    item.put("Id", accountHead.getId());                  
+                    item.put("OrganId", accountHead.getOrganId()==null?"":accountHead.getOrganId().getId());
+                    item.put("OrganName", accountHead.getOrganId()==null?"":accountHead.getOrganId().getSupplier());
+                    item.put("HandsPersonId", accountHead.getHandsPersonId()==null?"":accountHead.getHandsPersonId().getId());
+                    item.put("HandsPersonName", accountHead.getHandsPersonId()==null?"":accountHead.getHandsPersonId().getName());
+                    item.put("AccountId", accountHead.getAccountId()==null?"":accountHead.getAccountId().getId());
+                    item.put("AccountName", accountHead.getAccountId()==null?"":accountHead.getAccountId().getName());
+                    item.put("BillNo", accountHead.getBillNo());
+                    item.put("BillTime", Tools.getCurrentMonth(accountHead.getBillTime()));
+                    item.put("ChangeAmount", accountHead.getChangeAmount());
+                    item.put("Remark", accountHead.getRemark());
+                    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("BillNo_s_like", model.getBillNo());}
+        condition.put("Type_s_eq",model.getType());
+        condition.put("BillTime_s_gteq",model.getBeginTime());
+        condition.put("BillTime_s_lteq",model.getEndTime());
+        condition.put("Id_s_order","desc");
+        return condition;
+    }
+
+    //=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
+    @Override
+    public AccountHeadModel getModel()
+    {
+        return model;
+    }
+    public void setAccountHeadService(AccountHeadIService accountHeadService)
+    {
+        this.accountHeadService = accountHeadService;
+    }
+}

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

@@ -0,0 +1,199 @@
+package com.jsh.action.materials;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+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.util.AssetConstants;
+import com.jsh.util.JshException;
+import com.jsh.model.po.Asset;
+import com.jsh.model.po.AccountHead;
+import com.jsh.model.po.AccountItem;
+import com.jsh.model.po.Logdetails;
+import com.jsh.model.po.Account;
+import com.jsh.model.po.InOutItem;
+import com.jsh.model.vo.materials.AccountItemModel;
+import com.jsh.service.materials.AccountHeadIService;
+import com.jsh.service.materials.AccountItemIService;
+import com.jsh.util.PageUtil;
+import com.jsh.util.Tools;
+/*
+ * 财务明细管理(收支|收付款|转账)
+ * @author jishenghua  qq:752718920
+ */
+@SuppressWarnings("serial")
+public class AccountItemAction extends BaseAction<AccountItemModel>
+{
+    private AccountItemIService accountItemService;
+    private AccountItemModel model = new AccountItemModel();
+
+    /**
+     * 保存明细
+     * @return
+     */
+    public void saveDetials()
+    {
+        Log.infoFileSync("==================开始调用保存财务明细信息方法saveDetials()===================");
+        Boolean flag = false;
+        try
+        {
+            Long headerId=model.getHeaderId();
+            String inserted=model.getInserted();
+            String deleted=model.getDeleted();
+            String updated=model.getUpdated();
+            //转为json
+            JSONArray insertedJson = JSONArray.fromObject(inserted);
+            JSONArray deletedJson = JSONArray.fromObject(deleted);
+            JSONArray updatedJson = JSONArray.fromObject(updated);
+            if(null != insertedJson)
+            {
+                for(int i = 0;i < insertedJson.size(); i++)
+                {
+                    AccountItem accountItem = new AccountItem();
+                    JSONObject tempInsertedJson = JSONObject.fromObject(insertedJson.get(i));
+                    accountItem.setHeaderId(new AccountHead(headerId));
+                    if(tempInsertedJson.get("AccountId")!=null&&!tempInsertedJson.get("AccountId").equals("")){accountItem.setAccountId(new Account(tempInsertedJson.getLong("AccountId")));}
+                    if(tempInsertedJson.get("InOutItemId")!=null&&!tempInsertedJson.get("InOutItemId").equals("")){accountItem.setInOutItemId(new InOutItem(tempInsertedJson.getLong("InOutItemId")));}
+                    if(tempInsertedJson.get("EachAmount")!=null){accountItem.setEachAmount(tempInsertedJson.getDouble("EachAmount"));}
+                    accountItem.setRemark(tempInsertedJson.getString("Remark"));                    
+                    accountItemService.create(accountItem);
+                }
+            }
+            if(null != deletedJson)
+            {
+                for(int i = 0;i < deletedJson.size(); i++)
+                {
+                    JSONObject tempDeletedJson = JSONObject.fromObject(deletedJson.get(i));
+                    accountItemService.delete(tempDeletedJson.getLong("Id"));
+                }
+            }
+            if(null != updatedJson)
+            {
+                for(int i = 0;i < updatedJson.size(); i++)
+                {
+                    JSONObject tempUpdatedJson = JSONObject.fromObject(updatedJson.get(i));                    
+                    AccountItem accountItem = accountItemService.get(tempUpdatedJson.getLong("Id")); 
+                    accountItem.setHeaderId(new AccountHead(headerId));                    
+                    if(tempUpdatedJson.get("AccountId")!=null&&!tempUpdatedJson.get("AccountId").equals("")){accountItem.setAccountId(new Account(tempUpdatedJson.getLong("AccountId")));}
+                    if(tempUpdatedJson.get("InOutItemId")!=null&&!tempUpdatedJson.get("InOutItemId").equals("")){accountItem.setInOutItemId(new InOutItem(tempUpdatedJson.getLong("InOutItemId")));}
+                    if(tempUpdatedJson.get("EachAmount")!=null){accountItem.setEachAmount(tempUpdatedJson.getDouble("EachAmount"));}
+                    accountItem.setRemark(tempUpdatedJson.getString("Remark"));      
+                    accountItemService.create(accountItem);
+                }
+            }
+
+            //========标识位===========
+            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.getHeaderId() + " " + tipMsg + "！", "保存财务明细" + tipMsg));
+        Log.infoFileSync("==================结束调用保存财务明细方法saveDetials()===================");
+    }
+
+
+	/**
+     * 查找财务信息
+     * @return
+     */
+    public void findBy()
+    {
+        try 
+        {
+            PageUtil<AccountItem> pageUtil = new  PageUtil<AccountItem>();
+            pageUtil.setPageSize(model.getPageSize());
+            pageUtil.setCurPage(model.getPageNo());
+            pageUtil.setAdvSearch(getCondition());
+            accountItemService.find(pageUtil);
+            List<AccountItem> dataList = pageUtil.getPageList();
+
+            JSONObject outer = new JSONObject();
+            outer.put("total", pageUtil.getTotalCount());
+            //存放数据json数组
+            JSONArray dataArray = new JSONArray();
+            if(null != dataList)
+            {
+                for(AccountItem accountItem:dataList)
+                {
+                    JSONObject item = new JSONObject();
+                    item.put("Id", accountItem.getId());
+                    item.put("AccountId", accountItem.getAccountId()==null?"":accountItem.getAccountId().getId());
+                    item.put("AccountName", accountItem.getAccountId()==null?"":accountItem.getAccountId().getName());
+                    item.put("InOutItemId", accountItem.getInOutItemId()==null?"":accountItem.getInOutItemId().getId());
+                    item.put("InOutItemName", accountItem.getInOutItemId()==null?"":accountItem.getInOutItemId().getName());
+                    item.put("EachAmount", accountItem.getEachAmount());
+                    item.put("Remark", accountItem.getRemark());
+                    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("HeaderId_n_eq", model.getHeaderId());
+        condition.put("Id_s_order","asc");
+        return condition;
+    }
+
+    //=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
+    @Override
+    public AccountItemModel getModel()
+    {
+        return model;
+    }
+    public void setAccountItemService(AccountItemIService accountItemService)
+    {
+        this.accountItemService = accountItemService;
+    }
+}

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

@@ -5,12 +5,9 @@ import java.sql.Timestamp;
 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.Depot;
@@ -18,7 +15,7 @@ import com.jsh.model.po.Building;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.vo.materials.BuildingModel;
 import com.jsh.service.materials.BuildingIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 @SuppressWarnings("serial")
 public class BuildingAction extends BaseAction<BuildingModel>

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

@@ -7,12 +7,9 @@ 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.Building;
@@ -23,9 +20,12 @@ import com.jsh.model.po.Person;
 import com.jsh.model.po.Supplier;
 import com.jsh.model.vo.materials.DepotHeadModel;
 import com.jsh.service.materials.DepotHeadIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.Tools;
+import com.jsh.util.Tools;
-
+/*
+ * 单据表头管理
+ * @author jishenghua  qq:752718920
+*/
 @SuppressWarnings("serial")
 public class DepotHeadAction extends BaseAction<DepotHeadModel>
 {

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

@@ -6,18 +6,14 @@ import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletResponse;
-
 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.constants.asset.AssetConstants;
+import com.jsh.util.AssetConstants;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
 import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.DepotItem;
@@ -26,9 +22,12 @@ import com.jsh.model.po.Material;
 import com.jsh.model.vo.materials.DepotItemModel;
 import com.jsh.service.materials.DepotHeadIService;
 import com.jsh.service.materials.DepotItemIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.Tools;
+import com.jsh.util.Tools;
-
+/*
+ * 单据明细管理
+ * @author jishenghua  qq:752718920
+*/
 @SuppressWarnings("serial")
 public class DepotItemAction extends BaseAction<DepotItemModel>
 {

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

@@ -5,12 +5,9 @@ import java.sql.Timestamp;
 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.DepotHead;
@@ -20,8 +17,11 @@ import com.jsh.model.po.MaterialCategory;
 import com.jsh.model.po.Supplier;
 import com.jsh.model.vo.materials.MaterialModel;
 import com.jsh.service.materials.MaterialIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-
+/*
+ * 商品管理
+ * @author jishenghua  qq:752718920 
+*/
 @SuppressWarnings("serial")
 public class MaterialAction extends BaseAction<MaterialModel>
 {

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

@@ -5,20 +5,20 @@ import java.sql.Timestamp;
 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.MaterialCategory;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.vo.materials.MaterialCategoryModel;
 import com.jsh.service.materials.MaterialCategoryIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-
+/*
+ * 商品类型管理
+ * @author jishenghua  qq:752718920
+*/
 @SuppressWarnings("serial")
 public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
 {

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

@@ -5,12 +5,9 @@ import java.sql.Timestamp;
 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.Depot;
@@ -18,8 +15,11 @@ import com.jsh.model.po.Person;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.vo.materials.PersonModel;
 import com.jsh.service.materials.PersonIService;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-
+/*
+ * 经手人管理
+ * @author jishenghua  qq:752718920
+*/
 @SuppressWarnings("serial")
 public class PersonAction extends BaseAction<PersonModel>
 {
@@ -49,6 +49,29 @@ public class PersonAction extends BaseAction<PersonModel>
         return SUCCESS;
     }
 	
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public String getPersonByType()
+    {
+        Map<String,List> mapData = model.getShowModel().getMap();
+        PageUtil pageUtil = new  PageUtil();
+        pageUtil.setPageSize(0);
+        pageUtil.setCurPage(0);
+        try
+        {
+            Map<String,Object> condition = pageUtil.getAdvSearch();
+            condition.put("Type_s_eq", model.getType());
+            condition.put("Id_s_order", "asc");
+            personService.find(pageUtil);
+            mapData.put("personList", pageUtil.getPageList());
+        }
+        catch (Exception e)
+        {
+            Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
+            model.getShowModel().setMsgTip("exceptoin");
+        }
+        return SUCCESS;
+    }
+	
 	/**
 	 * 增加经手人
 	 * @return

src/com/jsh/base/BaseAction.java

@@ -15,7 +15,7 @@ import com.jsh.model.po.Basicuser;
 import com.jsh.service.basic.LogIService;
 /**
  * struts2工具类
- * @author jishenghua
+ * @author jishenghua qq752718920
  * struts2 base action 一些常用方法获取
  */
 @SuppressWarnings("serial")

src/com/jsh/base/BaseDAO.java

@@ -8,11 +8,11 @@ import org.hibernate.Query;
 import org.springframework.dao.DataAccessException;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.SearchConditionUtil;
+import com.jsh.util.SearchConditionUtil;
 /**
  * 基础dao
- * @author ji_sheng_hua
+ * @author ji_sheng_hua qq:752718920
  */
 public class BaseDAO<T> extends HibernateDaoSupport implements BaseIDAO<T>
 {

src/com/jsh/base/BaseIDAO.java

@@ -6,11 +6,11 @@ import java.util.Map;
 
 import org.springframework.dao.DataAccessException;
 
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 /**
  * 常用增删改查操作
- * @author ji-sheng-hua 
+ * @author ji-sheng-hua qq752718920
  * @param <T>
  */
 public interface BaseIDAO<T>

src/com/jsh/base/BaseIService.java

@@ -4,8 +4,12 @@ import java.io.Serializable;
 
 import org.springframework.dao.DataAccessException;
 
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-
+/**
+ * 服务层底层接口
+ * @author ji-sheng-hua qq752718920
+ * @param <T>
+ */
 public interface BaseIService<T>
 {
 	/**

src/com/jsh/base/BaseService.java

@@ -7,10 +7,14 @@ import java.util.Map;
 
 import org.springframework.dao.DataAccessException;
 
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Basicuser;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-
+/**
+ * 底层服务层
+ * @author ji-sheng-hua qq752718920
+ * @param <T>
+ */
 public abstract class BaseService<T> implements BaseIService<T>
 {
 	/**

src/com/jsh/base/Log.java

@@ -4,7 +4,7 @@ import org.apache.log4j.Logger;
 
 /**
  * 封装log4j日志信息，打印日志信息类
- * @author ji/sheng/hua
+ * @author ji/sheng/hua  qq_752718920
  * @since 2014-01-22
  */
 public class Log
@@ -17,7 +17,7 @@ public class Log
 	/**
 	 * 获取Log4j实例
 	 */
-	private static final  Logger log = Logger.getLogger("ams");
+	private static final  Logger log = Logger.getLogger("jsh");
 	
 	/**
 	 * Info级别日志前缀

src/com/jsh/constants/asset/AssetConstants.java

@@ -1,119 +0,0 @@
-package com.jsh.constants.asset;
-
-/**
- * 定义资产管理常量
- * @author jishenghua
- */
-public interface AssetConstants
-{
-	/**
-	 * 公共常量
-	 * @author jishenghua
-	 */
-	public class Common
-	{
-		
-	}
-	
-	/**
-	 * 资产常量--导入导出excel表格业务相关
-	 * @author jishenghua
-	 */
-	public class BusinessForExcel
-	{
-		/**
-		 * 资产名称常量
-		 */
-		public static final int EXCEL_ASSETNAME = 0;
-		
-		/**
-		 * 资产类型常量
-		 */
-		public static final int EXCEL_CATEGORY = 1;
-		
-		/**
-		 * 资产单价
-		 */
-		public static final int EXCEL_PRICE = 2;
-		
-		/**
-		 * 用户
-		 */
-		public static final int EXCEL_USER = 3;
-		
-		/**
-		 * 购买日期
-		 */
-		public static final int EXCEL_PURCHASE_DATE = 4;
-		
-		/**
-		 * 资产状态
-		 */
-		public static final int EXCEL_STATUS = 5;
-		
-		/**
-		 * 位置
-		 */
-		public static final int EXCEL_LOCATION = 6;
-		
-		/**
-		 * 资产编号
-		 */
-		public static final int EXCEL_NUM = 7;
-		
-		/**
-		 * 序列号
-		 */
-		public static final int EXCEL_SERIALNO = 8; 
-		
-		/**
-		 * 有效日期
-		 */
-		public static final int EXCEL_EXPIRATION_DATE = 9; 
-		
-		/**
-		 * 保修日期
-		 */
-		public static final int EXCEL_WARRANTY_DATE = 10; 
-		
-		/**
-		 * 供应商
-		 */
-		public static final int EXCEL_SUPPLIER = 11;
-		
-		/**
-		 * 标签
-		 */
-		public static final int EXCEL_LABLE = 12;
-		
-		/**
-		 * 描述
-		 */
-		public static final int EXCEL_DESC = 13;
-		
-		/**
-		 * 表头
-		 */
-		public static final int EXCEL_TABLE_HEAD = 0;
-		
-		/**
-		 * 状态 --在库
-		 */
-		public static final int EXCEl_STATUS_ZAIKU = 0;
-		
-		/**
-		 * 状态 --在用
-		 */
-		public static final int EXCEl_STATUS_INUSE = 1;
-		
-		/**
-		 * 状态 -- 消费
-		 */
-		public static final int EXCEl_STATUS_CONSUME = 2;
-		
-		/**
-		 * action返回excel结果
-		 */
-		public static final String EXCEL = "excel";
-	}
-}

src/com/jsh/constants/asset/ExcelConstantsCode.java

@@ -1,35 +0,0 @@
-package com.jsh.constants.asset;
-
-public interface ExcelConstantsCode
-{
-    /**
-     * 导入excel表格常量定义
-     */
-    public class ImportExcelCode
-    {
-        /**
-         * 表格正确
-         */
-        public static final String RIGHT = "right";
-        
-        /**
-         * 表格错误
-         */
-        public static final String WRONG = "wrong";
-        
-        /**
-         * 表格警告
-         */
-        public static final String WARN = "warn";
-    }
-    
-    /**
-     * 导出excel表格常量定义
-     * @author angel
-     *
-     */
-    public class ExportExcelCode
-    {
-        
-    }
-}

src/com/jsh/constants/common/AmsConstants.java

@@ -1,36 +0,0 @@
-package com.jsh.constants.common;
-
-public interface AmsConstants
-{
-	/**
-	 * 定义资产管理公共常量
-	 * @author jishenghua
-	 */
-	public class Common
-	{
-		/**
-		 * Info级别日志前缀
-		 */
-		public static final String LOG_INFO_PREFIX = "==========";
-		
-		/**
-		 * error级别日志前缀
-		 */
-		public static final String LOG_ERROR_PREFIX = ">>>>>>>>>>";
-		
-		/**
-		 *  debug级别日志前缀
-		 */
-		public static final String LOG_DEBUG_PREFIX = "-----------";
-		
-		/**
-		 *  fatal级别日志前缀
-		 */
-		public static final String LOG_FATAL_PREFIX = "$$$$$$$$$$";
-		
-		/**
-		 *  warn级别日志前缀
-		 */
-		public static final String LOG_WARN_PREFIX = "##########";
-	}
-}

src/com/jsh/constants/common/ExceptionCodeConstants.java

@@ -1,35 +0,0 @@
-package com.jsh.constants.common;
-
-public interface ExceptionCodeConstants
-{
-	/**
-	 * 用户错误码定义
-	 */
-	public class UserExceptionCode
-	{
-		/**
-		 * 用户不存在
-		 */
-		public static final int USER_NOT_EXIST = 1;
-		
-		/**
-		 * 用户密码错误
-		 */
-		public static final int USER_PASSWORD_ERROR = 2;
-		
-		/**
-		 * 被加入黑名单
-		 */
-		public static final int BLACK_USER = 3;
-		
-		/**
-		 * 可以登录
-		 */
-		public static final int USER_CONDITION_FIT = 4;
-		
-		/**
-		 * 访问数据库异常
-		 */
-		public static final int USER_ACCESS_EXCEPTION = 5;
-	}
-}

src/com/jsh/constants/common/LogModuleConstants.java

@@ -1,65 +0,0 @@
-package com.jsh.constants.common;
-
-public interface LogModuleConstants
-{
-	/**
-	 * 系统管理模块名称定义
-	 * @author jishenghua
-	 */
-	public class ManageModuleNameCode
-	{
-		/**
-		 * 管理模块资产名称
-		 */
-		public static final String MODULE_MANAGE_ASSETNAME = "资产名称";
-		
-		/**
-		 * 管理模块供应商
-		 */
-		public static final String MODULE_MANAGE_SUPPLIER = "供应商";
-		
-		/**
-		 * 管理模块资产类型
-		 */
-		public static final String MODULE_MANAGE_CATEGORY = "资产类型";
-		
-		/**
-		 * 管理模块用户管理
-		 */
-		public static final String MODULE_MANAGE_USER = "用户管理";
-	}
-	
-	/**
-	 * 资产管理模块名称定义
-	 * @author jishenghua
-	 */
-	public class AssetModuleNameCode
-	{
-		/**
-		 * 资产管理模块资产管理
-		 */
-		public static final String MODULE_ASSET_MANAGE = "资产管理";
-		
-		/**
-		 * 资产管理模块资产报表
-		 */
-		public static final String  MODULE_ASSET_REPORT = "资产报表";
-		
-		/**
-		 * 资产管理模块资产概况
-		 */
-		public static final String  MODULE_ASSET_GENERAL = "资产概况";
-	}
-	
-	/**
-	 * 日志管理模块名称定义
-	 * @author jishenghua
-	 */
-	public class LogModuleNameCode
-	{
-		/**
-		 * 日志管理模块日志管理
-		 */
-		public static final String MODULE_LOG_MANAGE = "日志管理";
-	}
-}

src/com/jsh/dao/asset/ReportDAO.java

@@ -3,10 +3,10 @@ package com.jsh.dao.asset;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.SearchConditionUtil;
+import com.jsh.util.SearchConditionUtil;
 
 public class ReportDAO extends HibernateDaoSupport implements ReportIDAO
 {

src/com/jsh/dao/asset/ReportIDAO.java

@@ -1,8 +1,8 @@
 package com.jsh.dao.asset;
 
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public interface ReportIDAO
 {

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

@@ -3,11 +3,11 @@ package com.jsh.dao.basic;
 import org.hibernate.Query;
 
 import com.jsh.base.BaseDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
 import com.jsh.model.po.UserBusiness;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.SearchConditionUtil;
+import com.jsh.util.SearchConditionUtil;
 
 public class UserBusinessDAO extends BaseDAO<UserBusiness> implements UserBusinessIDAO
 {

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

@@ -1,9 +1,9 @@
 package com.jsh.dao.basic;
 
 import com.jsh.base.BaseIDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.UserBusiness;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public interface UserBusinessIDAO extends BaseIDAO<UserBusiness>
 {

src/com/jsh/dao/materials/AccountHeadDAO.java

@@ -0,0 +1,32 @@
+package com.jsh.dao.materials;
+
+import org.hibernate.Query;
+
+import com.jsh.base.BaseDAO;
+import com.jsh.util.JshException;
+import com.jsh.model.po.AccountHead;
+import com.jsh.model.po.UserBusiness;
+import com.jsh.util.PageUtil;
+import com.jsh.util.SearchConditionUtil;
+
+public class AccountHeadDAO extends BaseDAO<AccountHead> implements AccountHeadIDAO
+{
+    /**
+     * 设置dao映射基类
+     * @return
+     */
+    @Override
+    public Class<AccountHead> getEntityClass()
+    {
+        return AccountHead.class;
+    }
+    
+    @SuppressWarnings("unchecked")
+    @Override
+    public void find(PageUtil<AccountHead> pageUtil,String maxid) throws JshException
+    {
+        Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select max(Id) as Id from AccountHead accountHead where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
+        pageUtil.setTotalCount(query.list().size());
+        pageUtil.setPageList(query.list());
+    }
+}

src/com/jsh/dao/materials/AccountHeadIDAO.java

@@ -0,0 +1,15 @@
+package com.jsh.dao.materials;
+
+import com.jsh.base.BaseIDAO;
+import com.jsh.util.JshException;
+import com.jsh.model.po.AccountHead;
+import com.jsh.model.po.UserBusiness;
+import com.jsh.util.PageUtil;
+
+public interface AccountHeadIDAO extends BaseIDAO<AccountHead>
+{
+    /*
+     * 获取MaxId
+     */
+    void find(PageUtil<AccountHead> pageUtil,String maxid) throws JshException;
+}

src/com/jsh/dao/materials/AccountItemDAO.java

@@ -0,0 +1,22 @@
+package com.jsh.dao.materials;
+
+import org.hibernate.Query;
+
+import com.jsh.base.BaseDAO;
+import com.jsh.util.JshException;
+import com.jsh.model.po.AccountItem;
+import com.jsh.util.PageUtil;
+import com.jsh.util.SearchConditionUtil;
+
+public class AccountItemDAO extends BaseDAO<AccountItem> implements AccountItemIDAO
+{
+    /**
+     * 设置dao映射基类
+     * @return
+     */
+    @Override
+    public Class<AccountItem> getEntityClass()
+    {
+        return AccountItem.class;
+    }
+}

src/com/jsh/dao/materials/AccountItemIDAO.java

@@ -0,0 +1,12 @@
+package com.jsh.dao.materials;
+
+import com.jsh.base.BaseIDAO;
+import com.jsh.util.JshException;
+import com.jsh.model.po.AccountItem;
+import com.jsh.util.PageUtil;
+
+public interface AccountItemIDAO extends BaseIDAO<AccountItem>
+{
+    
+}
+

src/com/jsh/dao/materials/DepotHeadDAO.java

@@ -3,11 +3,11 @@ package com.jsh.dao.materials;
 import org.hibernate.Query;
 
 import com.jsh.base.BaseDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.UserBusiness;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.SearchConditionUtil;
+import com.jsh.util.SearchConditionUtil;
 
 public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO
 {

src/com/jsh/dao/materials/DepotHeadIDAO.java

@@ -1,10 +1,10 @@
 package com.jsh.dao.materials;
 
 import com.jsh.base.BaseIDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.UserBusiness;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public interface DepotHeadIDAO extends BaseIDAO<DepotHead>
 {

src/com/jsh/dao/materials/DepotItemDAO.java

@@ -3,11 +3,11 @@ package com.jsh.dao.materials;
 import org.hibernate.Query;
 
 import com.jsh.base.BaseDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.DepotItem;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.SearchConditionUtil;
+import com.jsh.util.SearchConditionUtil;
 
 public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
 {

src/com/jsh/dao/materials/DepotItemIDAO.java

@@ -1,10 +1,10 @@
 package com.jsh.dao.materials;
 
 import com.jsh.base.BaseIDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.DepotItem;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public interface DepotItemIDAO extends BaseIDAO<DepotItem>
 {

src/com/jsh/exception/JshException.java

@@ -1,73 +0,0 @@
-package com.jsh.exception;
-
-/**
- * @title: 平台异常基类 
- * @description: 用于包装一些异常信息，打印日志等服务
- * @author jishenghua
- * @since: 2014-01-24
- */
-@SuppressWarnings("serial")
-public class JshException extends Exception 
-{
-	public long errorCode = -1;
-	
-	public String message ;
-	
-	public JshException()
-	{
-		super();
-	}
-
-	public JshException(String message)
-	{
-		super(message);
-		this.message = message;
-	}
-
-	public JshException(String message, Throwable cause)
-	{
-		super(message, cause);
-		this.message = message;
-	}
-
-	public JshException(Throwable cause)
-	{
-		super(cause);
-	}
-
-	public JshException(long errorCode)
-	{
-		super();
-		this.errorCode = errorCode;
-	}
-
-	public JshException(String message, long errorCode)
-	{
-		super(message);
-		this.errorCode = errorCode;
-		this.message = message;
-	}
-
-	public JshException(String message, long errorCode, Throwable cause)
-	{
-		super(message, cause);
-		this.errorCode = errorCode;
-		this.message = message;
-	}
-
-	public JshException(long errorCode, Throwable cause)
-	{
-		super(cause);
-		this.errorCode = errorCode;
-	}
-
-	public long getErrorCode()
-	{
-		return errorCode;
-	}
-
-	public String getMessage()
-	{
-		return message;
-	}
-}

src/com/jsh/filter/common/OpenSessionInViewFilterExtend.java

@@ -1,24 +0,0 @@
-package com.jsh.filter.common;
-
-import org.hibernate.FlushMode;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.orm.hibernate3.support.OpenSessionInViewFilter;
-
-public class OpenSessionInViewFilterExtend extends OpenSessionInViewFilter
-{
-	@Override
-	protected Session getSession(SessionFactory sessionFactory)
-			throws DataAccessResourceFailureException
-	{
-		this.setFlushMode(FlushMode.AUTO);
-		return super.getSession(sessionFactory);
-	}
-	@Override
-	protected void closeSession(Session session, SessionFactory sessionFactory)
-	{
-		session.flush();
-		super.closeSession(session, sessionFactory);
-	}
-}

src/com/jsh/filter/user/UserFilter.java

@@ -1,83 +0,0 @@
-package com.jsh.filter.user;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-/**
- * 用户登录session处理类
- * 过滤session是否超时
- * @author  jishenghua
- * @version  [版本号, 2012-3-6]
- * @see  [相关类/方法]
- * @since  
- */
-public class UserFilter implements Filter
-{
-    /**
-     * 初始化过滤器  暂不处理
-     * 重载方法
-     * @param arg0
-     * @throws ServletException
-     */
-  
-    public void init(FilterConfig arg0)
-        throws ServletException
-    {
-        
-    }
-    /**
-     * 判断用户session是否存在 不存在则跳转到登录页面
-     * 重载方法
-     * @param srequest
-     * @param sresponse
-     * @param chain
-     * @throws IOException
-     * @throws ServletException
-     */
-    public void doFilter(ServletRequest srequest, ServletResponse sresponse, FilterChain chain)
-        throws IOException, ServletException
-    {
-        HttpServletRequest request = (HttpServletRequest) srequest;
-        HttpServletResponse response = (HttpServletResponse) sresponse;
-        HttpSession session = request.getSession();
-//        //定义登录页面不被过滤===后续考虑
-//        List<String> notFilterFile = new ArrayList<String>();
-//        notFilterFile.add("/login.jsp");
-//        notFilterFile.add("/logout.jsp");
-//        notFilterFile.add("/css/*");
-//        notFilterFile.add("/css/zTreeStyle/*");
-//        notFilterFile.add("/css/zTreeStyle/img/*");
-//        notFilterFile.add("/css/zTreeStyle/img/diy/*");
-        
-        //获取工程路径
-        String path = request.getContextPath();
-        String requestURl = request.getRequestURI();
-        
-        //提示用户没有权限操作
-//        response.setCharacterEncoding("utf-8");
-//        PrintWriter pw=response.getWriter();     
-//        pw.write("<script language='javascript'>alert('您没有权限进行此项操作！')</script>");
-        //session中有值则不进行处理
-        if(requestURl.contains("/pages") &&null != session.getAttribute("user"))
-            chain.doFilter(request, response);
-        else
-            response.sendRedirect(path + "/logout.jsp");
-    }
-    
-    /**
-     * 销毁过滤器
-     */  
-    public void destroy()
-    {
-    
-    }
-}

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

@@ -0,0 +1,51 @@
+<?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.AccountHead" table="jsh_accounthead">
+        <id name="Id" type="java.lang.Long">
+            <column name="Id"/>
+            <generator class="native"/>
+        </id>
+        <property generated="never" lazy="false" name="Type" type="java.lang.String">
+ 			<column length="50" name="Type">
+		    	<comment>类型(支出/收入/收款/付款/转账)</comment>
+		    </column>
+  		</property>
+        <many-to-one name="OrganId" class="com.jsh.model.po.Supplier" lazy="false">
+            <column name="OrganId">
+                <comment>单位Id(收款/付款单位)</comment>
+            </column>
+        </many-to-one>
+        <many-to-one name="HandsPersonId" class="com.jsh.model.po.Person" lazy="false">
+            <column name="HandsPersonId">
+                <comment>经手人Id</comment>
+            </column>
+        </many-to-one>
+        <property generated="never" lazy="false" name="ChangeAmount" type="java.lang.Double">
+            <column name="ChangeAmount" precision="22" scale="3">
+                <comment>变动金额(优惠/收款/付款/实付)</comment>
+            </column>
+        </property>
+        <many-to-one name="AccountId" class="com.jsh.model.po.Account" lazy="false">
+            <column name="AccountId">
+                <comment>账户(收款/付款)</comment>
+            </column>
+        </many-to-one>
+        <property generated="never" lazy="false" name="BillNo" type="java.lang.String">
+            <column length="50" name="BillNo">
+                <comment>单据编号</comment>
+            </column>
+        </property>
+        <property name="BillTime" type="java.sql.Timestamp">
+            <column length="19" name="BillTime">
+                <comment>单据日期</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="Remark" type="java.lang.String">
+            <column length="100" name="Remark">
+                <comment>备注</comment>
+            </column>
+        </property>
+    </class>
+</hibernate-mapping>

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

@@ -0,0 +1,133 @@
+package com.jsh.model.po;
+
+import java.sql.Timestamp;
+
+@SuppressWarnings("serial")
+public class AccountHead implements java.io.Serializable
+{
+    private Long Id;
+    private String Type;
+    private Supplier OrganId;
+    private Person HandsPersonId;    
+    private Double ChangeAmount;
+    private Account AccountId;
+    private String BillNo;
+    private Timestamp BillTime;  
+    private String Remark;
+
+    public AccountHead()
+    {
+
+    }
+
+    public AccountHead(Long Id)
+    {
+        this.Id = Id ;
+    }
+
+    public AccountHead(String type, Supplier organId,
+                       Person handsPersonId, Double changeAmount, Account accountId,
+                       String billNo, Timestamp billTime, String remark)
+    {
+        super();
+        Type = type;
+        OrganId = organId;
+        HandsPersonId = handsPersonId;
+        ChangeAmount = changeAmount;
+        AccountId = accountId;
+        BillNo = billNo;
+        BillTime = billTime;
+        Remark = remark;
+    }
+
+    public void setId(Long id)
+    {
+        Id = id;
+    }
+
+    public Long getId()
+    {
+        return Id;
+    }
+
+    public void setType(String type)
+    {
+        Type = type;
+    }
+
+    public String getType()
+    {
+        return Type;
+    }
+
+    public void setOrganId(Supplier organId)
+    {
+        OrganId = organId;
+    }
+
+    public Supplier getOrganId()
+    {
+        return OrganId;
+    }
+
+    public void setHandsPersonId(Person handsPersonId)
+    {
+        HandsPersonId = handsPersonId;
+    }
+
+    public Person getHandsPersonId()
+    {
+        return HandsPersonId;
+    }
+
+    public void setChangeAmount(Double changeAmount)
+    {
+        ChangeAmount = changeAmount;
+    }
+
+    public Double getChangeAmount()
+    {
+        return ChangeAmount;
+    }
+
+    public void setAccountId(Account accountId)
+    {
+        AccountId = accountId;
+    }
+
+    public Account getAccountId()
+    {
+        return AccountId;
+    }
+
+    public void setBillNo(String billNo)
+    {
+        BillNo = billNo;
+    }
+
+    public String getBillNo()
+    {
+        return BillNo;
+    }
+
+    public void setBillTime(Timestamp billTime)
+    {
+        BillTime = billTime;
+    }
+
+    public Timestamp getBillTime()
+    {
+        return BillTime;
+    }
+
+    public void setRemark(String remark)
+    {
+        Remark = remark;
+    }
+
+    public String getRemark()
+    {
+        return Remark;
+    }
+
+}

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

@@ -0,0 +1,36 @@
+<?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.AccountItem" table="jsh_accountitem">
+        <id name="Id" type="java.lang.Long">
+            <column name="Id"/>
+            <generator class="native"/>
+        </id>
+        <many-to-one name="HeaderId" class="com.jsh.model.po.AccountHead" lazy="false">
+            <column name="HeaderId" not-null="true">
+                <comment>表头Id</comment>
+            </column>
+        </many-to-one>
+		<many-to-one name="AccountId" class="com.jsh.model.po.Account" lazy="false">
+		  <column name="AccountId">
+		   <comment>账户Id</comment>
+		  </column>
+		</many-to-one>
+		<many-to-one name="InOutItemId" class="com.jsh.model.po.InOutItem" lazy="false">
+		  <column name="InOutItemId">
+		   <comment>收支项目Id</comment>
+		  </column>
+		</many-to-one>
+        <property generated="never" lazy="false" name="EachAmount" type="java.lang.Double">
+            <column name="EachAmount" 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>
+            </column>
+        </property>
+    </class>
+</hibernate-mapping>

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

@@ -0,0 +1,94 @@
+package com.jsh.model.po;
+
+@SuppressWarnings("serial")
+public class AccountItem implements java.io.Serializable
+{
+    private Long Id;
+    private AccountHead HeaderId;
+    private Account AccountId;
+    private InOutItem InOutItemId;
+    private Double EachAmount;
+    private String Remark;
+
+    public AccountItem()
+    {
+
+    }
+
+    public AccountItem(Long Id)
+    {
+        this.Id = Id ;
+    }
+
+    public AccountItem(AccountHead headerId, Account accountId,
+                       InOutItem inOutItemId, Double eachAmount, String remark)
+    {
+        super();
+        HeaderId = headerId;
+        AccountId = accountId;
+        InOutItemId = inOutItemId;
+        EachAmount = eachAmount;
+        Remark = remark;
+    }
+
+    public void setId(Long id)
+    {
+        Id = id;
+    }
+
+    public Long getId()
+    {
+        return Id;
+    }
+
+    public void setHeaderId(AccountHead headerId)
+    {
+        HeaderId = headerId;
+    }
+
+    public AccountHead getHeaderId()
+    {
+        return HeaderId;
+    }
+
+    public void setAccountId(Account accountId)
+    {
+        AccountId = accountId;
+    }
+
+    public Account getAccountId()
+    {
+        return AccountId;
+    }
+
+    public void setInOutItemId(InOutItem inOutItemId)
+    {
+        InOutItemId = inOutItemId;
+    }
+
+    public InOutItem getInOutItemId()
+    {
+        return InOutItemId;
+    }
+
+    public void setEachAmount(Double eachAmount)
+    {
+        EachAmount = eachAmount;
+    }
+
+    public Double getEachAmount()
+    {
+        return EachAmount;
+    }
+
+    public void setRemark(String remark)
+    {
+        Remark = remark;
+    }
+
+    public String getRemark()
+    {
+        return Remark;
+    }
+
+}

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

@@ -0,0 +1,216 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class AccountHeadModel implements Serializable
+{
+    private AccountHeadShowModel showModel = new AccountHeadShowModel();
+
+    /**======开始接受页面参数=================**/
+    private String Type;
+    private Long OrganId;
+    private Long HandsPersonId;    
+    private Double ChangeAmount;
+    private Long AccountId;
+    private String BillNo;
+    private String BillTime;  
+    private String Remark;
+    private String BeginTime; //查询开始时间
+    private String EndTime;  //查询结束时间
+    private String MonthTime;  //查询月份
+    /**
+     * 分类ID
+     */
+    private Long accountHeadID = 0l;
+
+    /**
+     * 分类IDs 批量操作使用
+     */
+    private String accountHeadIDs = "";
+
+    /**
+     * 每页显示的个数
+     */
+    private int pageSize = 10;
+
+    /**
+     * 当前页码
+     */
+    private int pageNo = 1;
+
+    /**
+     * 用户IP，用户记录操作日志
+     */
+    private String clientIp = "";
+
+    public void setShowModel(AccountHeadShowModel showModel)
+    {
+        this.showModel = showModel;
+    }
+
+    public AccountHeadShowModel getShowModel()
+    {
+        return showModel;
+    }
+
+    public void setType(String type)
+    {
+        Type = type;
+    }
+
+    public String getType()
+    {
+        return Type;
+    }
+
+    public void setOrganId(Long organId)
+    {
+        OrganId = organId;
+    }
+
+    public Long getOrganId()
+    {
+        return OrganId;
+    }
+
+    public void setHandsPersonId(Long handsPersonId)
+    {
+        HandsPersonId = handsPersonId;
+    }
+
+    public Long getHandsPersonId()
+    {
+        return HandsPersonId;
+    }
+
+    public void setChangeAmount(Double changeAmount)
+    {
+        ChangeAmount = changeAmount;
+    }
+
+    public Double getChangeAmount()
+    {
+        return ChangeAmount;
+    }
+
+    public void setAccountId(Long accountId)
+    {
+        AccountId = accountId;
+    }
+
+    public Long getAccountId()
+    {
+        return AccountId;
+    }
+
+    public void setBillNo(String billNo)
+    {
+        BillNo = billNo;
+    }
+
+    public String getBillNo()
+    {
+        return BillNo;
+    }
+
+    public void setBillTime(String billTime)
+    {
+        BillTime = billTime;
+    }
+
+    public String getBillTime()
+    {
+        return BillTime;
+    }
+
+    public void setRemark(String remark)
+    {
+        Remark = remark;
+    }
+
+    public String getRemark()
+    {
+        return Remark;
+    }
+
+    public void setBeginTime(String beginTime)
+    {
+        BeginTime = beginTime;
+    }
+
+    public String getBeginTime()
+    {
+        return BeginTime;
+    }
+
+    public void setEndTime(String endTime)
+    {
+        EndTime = endTime;
+    }
+
+    public String getEndTime()
+    {
+        return EndTime;
+    }
+
+    public void setMonthTime(String monthTime)
+    {
+        MonthTime = monthTime;
+    }
+
+    public String getMonthTime()
+    {
+        return MonthTime;
+    }
+
+    public void setAccountHeadID(Long accountHeadID)
+    {
+        this.accountHeadID = accountHeadID;
+    }
+
+    public Long getAccountHeadID()
+    {
+        return accountHeadID;
+    }
+
+    public void setAccountHeadIDs(String accountHeadIDs)
+    {
+        this.accountHeadIDs = accountHeadIDs;
+    }
+
+    public String getAccountHeadIDs()
+    {
+        return accountHeadIDs;
+    }
+
+    public void setPageSize(int pageSize)
+    {
+        this.pageSize = pageSize;
+    }
+
+    public int getPageSize()
+    {
+        return pageSize;
+    }
+
+    public void setPageNo(int pageNo)
+    {
+        this.pageNo = pageNo;
+    }
+
+    public int getPageNo()
+    {
+        return pageNo;
+    }
+
+
+    public void setClientIp(String clientIp)
+    {
+        this.clientIp = clientIp;
+    }
+
+    public String getClientIp()
+    {
+        return clientIp;
+    }}

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

@@ -0,0 +1,42 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("serial")
+public class AccountHeadShowModel implements Serializable
+{
+    /**
+     * 提示信息
+     */
+    private String msgTip = "";
+
+    /**
+     * 系统数据
+     */
+    @SuppressWarnings("rawtypes")
+    private Map<String,List> map = new HashMap<String,List>();
+
+    public String getMsgTip() 
+    {
+        return msgTip;
+    }
+
+    public void setMsgTip(String msgTip) 
+    {
+        this.msgTip = msgTip;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public Map<String, List> getMap() {
+        return map;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public void setMap(Map<String, List> map) {
+        this.map = map;
+    }
+
+}

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

@@ -0,0 +1,251 @@
+package com.jsh.model.vo.materials;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class AccountItemModel implements Serializable
+{
+    private AccountItemShowModel showModel = new AccountItemShowModel();
+
+    /**======开始接受页面参数=================**/
+    private Long HeaderId;
+    private Long AccountId;
+    private Long InOutItemId;
+    private Double EachAmount;
+    private String Remark = "";
+
+    private String Inserted = "";   //json插入记录
+    private String Deleted = "";    //json删除记录
+    private String Updated = "";    //json修改记录
+
+    private String HeadIds = "";    //表头集合列表
+    private String MonthTime = "";  //月份
+    private String browserType = "";
+    /**
+     * 文件名称
+     */
+    private String fileName = "";
+    /**
+     * 分类ID
+     */
+    private Long accountItemID = 0l;
+
+    /**
+     * 分类IDs 批量操作使用
+     */
+    private String accountItemIDs = "";
+
+    /**
+     * 每页显示的个数
+     */
+    private int pageSize = 800;
+
+    /**
+     * 当前页码
+     */
+    private int pageNo = 1;
+
+    /**
+     * 用户IP，用户记录操作日志
+     */
+    private String clientIp = "";
+
+
+    /**
+     * 输入流，导出excel文件
+     */
+    private InputStream excelStream;
+
+    public void setShowModel(AccountItemShowModel showModel)
+    {
+        this.showModel = showModel;
+    }
+
+    public AccountItemShowModel getShowModel()
+    {
+        return showModel;
+    }
+
+    public void setHeaderId(Long headerId)
+    {
+        HeaderId = headerId;
+    }
+
+    public Long getHeaderId()
+    {
+        return HeaderId;
+    }
+
+    public void setAccountId(Long accountId)
+    {
+        AccountId = accountId;
+    }
+
+    public Long getAccountId()
+    {
+        return AccountId;
+    }
+
+    public void setInOutItemId(Long inOutItemId)
+    {
+        InOutItemId = inOutItemId;
+    }
+
+    public Long getInOutItemId()
+    {
+        return InOutItemId;
+    }
+
+    public void setEachAmount(Double eachAmount)
+    {
+        EachAmount = eachAmount;
+    }
+
+    public Double getEachAmount()
+    {
+        return EachAmount;
+    }
+
+    public void setRemark(String remark)
+    {
+        Remark = remark;
+    }
+
+    public String getRemark()
+    {
+        return Remark;
+    }
+
+    public void setInserted(String inserted)
+    {
+        Inserted = inserted;
+    }
+
+    public String getInserted()
+    {
+        return Inserted;
+    }
+
+    public void setDeleted(String deleted)
+    {
+        Deleted = deleted;
+    }
+
+    public String getDeleted()
+    {
+        return Deleted;
+    }
+
+    public void setUpdated(String updated)
+    {
+        Updated = updated;
+    }
+
+    public String getUpdated()
+    {
+        return Updated;
+    }
+
+    public void setHeadIds(String headIds)
+    {
+        HeadIds = headIds;
+    }
+
+    public String getHeadIds()
+    {
+        return HeadIds;
+    }
+
+    public void setMonthTime(String monthTime)
+    {
+        MonthTime = monthTime;
+    }
+
+    public String getMonthTime()
+    {
+        return MonthTime;
+    }
+
+    public void setBrowserType(String browserType)
+    {
+        this.browserType = browserType;
+    }
+
+    public String getBrowserType()
+    {
+        return browserType;
+    }
+
+    public void setFileName(String fileName)
+    {
+        this.fileName = fileName;
+    }
+
+    public String getFileName()
+    {
+        return fileName;
+    }
+
+    public void setAccountItemID(Long accountItemID)
+    {
+        this.accountItemID = accountItemID;
+    }
+
+    public Long getAccountItemID()
+    {
+        return accountItemID;
+    }
+
+    public void setAccountItemIDs(String accountItemIDs)
+    {
+        this.accountItemIDs = accountItemIDs;
+    }
+
+    public String getAccountItemIDs()
+    {
+        return accountItemIDs;
+    }
+
+    public void setPageSize(int pageSize)
+    {
+        this.pageSize = pageSize;
+    }
+
+    public int getPageSize()
+    {
+        return pageSize;
+    }
+
+    public void setPageNo(int pageNo)
+    {
+        this.pageNo = pageNo;
+    }
+
+    public int getPageNo()
+    {
+        return pageNo;
+    }
+
+    public void setClientIp(String clientIp)
+    {
+        this.clientIp = clientIp;
+    }
+
+    public String getClientIp()
+    {
+        return clientIp;
+    }
+    
+
+
+    public void setExcelStream(InputStream excelStream)
+    {
+        this.excelStream = excelStream;
+    }
+
+    public InputStream getExcelStream()
+    {
+        return excelStream;
+    }
+}

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

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

src/com/jsh/service/asset/AssetIService.java

@@ -4,9 +4,9 @@ import java.io.File;
 import java.io.InputStream;
 
 import com.jsh.base.BaseIService;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public interface AssetIService extends BaseIService<Asset>
 {

src/com/jsh/service/asset/AssetService.java

@@ -33,19 +33,19 @@ import org.apache.poi.ss.usermodel.Row;
 
 import com.jsh.base.BaseService;
 import com.jsh.base.Log;
-import com.jsh.constants.asset.AssetConstants;
+import com.jsh.util.AssetConstants;
 import com.jsh.dao.asset.AssetIDAO;
 import com.jsh.dao.basic.AssetNameIDAO;
 import com.jsh.dao.basic.CategoryIDAO;
 import com.jsh.dao.basic.SupplierIDAO;
 import com.jsh.dao.basic.UserIDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
 import com.jsh.model.po.Assetname;
 import com.jsh.model.po.Category;
 import com.jsh.model.po.Supplier;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.Tools;
+import com.jsh.util.Tools;
 
 public class AssetService extends BaseService<Asset> implements AssetIService
 {

src/com/jsh/service/asset/ReportIService.java

@@ -1,8 +1,8 @@
 package com.jsh.service.asset;
 
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public interface ReportIService
 {

src/com/jsh/service/asset/ReportService.java

@@ -1,9 +1,9 @@
 package com.jsh.service.asset;
 
 import com.jsh.dao.asset.ReportIDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public class ReportService implements ReportIService
 {

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

@@ -1,7 +1,7 @@
 package com.jsh.service.basic;
 
 import com.jsh.base.BaseIService;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Logdetails;
 
 public interface LogIService extends BaseIService<Logdetails>

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

@@ -1,9 +1,9 @@
 package com.jsh.service.basic;
 
 import com.jsh.base.BaseIService;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.UserBusiness;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public interface UserBusinessIService extends BaseIService<UserBusiness>
 {

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

@@ -2,9 +2,9 @@ package com.jsh.service.basic;
 
 import com.jsh.base.BaseService;
 import com.jsh.dao.basic.UserBusinessIDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.UserBusiness;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public class UserBusinessService extends BaseService<UserBusiness> implements UserBusinessIService
 {

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

@@ -1,7 +1,7 @@
 package com.jsh.service.basic;
 
 import com.jsh.base.BaseIService;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Basicuser;
 
 public interface UserIService extends BaseIService<Basicuser>

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

@@ -6,12 +6,12 @@ import java.util.Map;
 
 import com.jsh.base.BaseService;
 import com.jsh.base.Log;
-import com.jsh.constants.common.ExceptionCodeConstants;
+import com.jsh.util.ExceptionCodeConstants;
 import com.jsh.dao.basic.UserBusinessIDAO;
 import com.jsh.dao.basic.UserIDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Basicuser;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public class UserService extends BaseService<Basicuser> implements UserIService
 {

src/com/jsh/service/materials/AccountHeadIService.java

@@ -0,0 +1,15 @@
+package com.jsh.service.materials;
+
+import com.jsh.base.BaseIService;
+import com.jsh.util.JshException;
+import com.jsh.model.po.AccountHead;
+import com.jsh.model.po.UserBusiness;
+import com.jsh.util.PageUtil;
+
+public interface AccountHeadIService extends BaseIService<AccountHead>
+{
+    /*
+     * 获取MaxId
+     */
+    void find(PageUtil<AccountHead> accountHead,String maxid)throws JshException;
+}

src/com/jsh/service/materials/AccountHeadService.java

@@ -0,0 +1,32 @@
+package com.jsh.service.materials;
+
+import com.jsh.base.BaseService;
+import com.jsh.dao.materials.AccountHeadIDAO;
+import com.jsh.util.JshException;
+import com.jsh.model.po.AccountHead;
+import com.jsh.model.po.UserBusiness;
+import com.jsh.util.PageUtil;
+
+public class AccountHeadService extends BaseService<AccountHead> implements AccountHeadIService
+{
+    @SuppressWarnings("unused")
+    private AccountHeadIDAO accountHeadDao;
+
+
+    public void setAccountHeadDao(AccountHeadIDAO accountHeadDao) {
+        this.accountHeadDao = accountHeadDao;
+    }
+
+
+    @Override
+    protected Class<AccountHead> getEntityClass()
+    {
+        return AccountHead.class;
+    }
+
+    @Override
+    public void find(PageUtil<AccountHead> pageUtil, String maxid) throws JshException
+    {
+        accountHeadDao.find(pageUtil, maxid);
+    }
+}

src/com/jsh/service/materials/AccountItemIService.java

@@ -0,0 +1,18 @@
+package com.jsh.service.materials;
+
+import java.io.InputStream;
+import java.util.List;
+
+import net.sf.json.JSONArray;
+
+import com.jsh.base.BaseIService;
+import com.jsh.util.JshException;
+import com.jsh.model.po.Asset;
+import com.jsh.model.po.AccountHead;
+import com.jsh.model.po.AccountItem;
+import com.jsh.util.PageUtil;
+
+public interface AccountItemIService extends BaseIService<AccountItem>
+{
+    
+}

src/com/jsh/service/materials/AccountItemService.java

@@ -0,0 +1,38 @@
+package com.jsh.service.materials;
+
+import java.util.List;
+import java.util.Map;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+import com.jsh.base.BaseService;
+import com.jsh.base.Log;
+import com.jsh.util.AssetConstants;
+import com.jsh.dao.materials.AccountItemIDAO;
+import com.jsh.util.JshException;
+import com.jsh.model.po.Asset;
+import com.jsh.model.po.AccountHead;
+import com.jsh.model.po.AccountItem;
+import com.jsh.util.PageUtil;
+import com.jsh.util.Tools;
+
+public class AccountItemService extends BaseService<AccountItem> implements AccountItemIService
+{
+    @SuppressWarnings("unused")
+    private AccountItemIDAO accoumtItemDao;
+
+
+    public void setAccountItemDao(AccountItemIDAO accoumtItemDao) {
+        this.accoumtItemDao = accoumtItemDao;
+    }
+
+
+    @Override
+    protected Class<AccountItem> getEntityClass()
+    {
+        return AccountItem.class;
+    }
+
+
+}

src/com/jsh/service/materials/DepotHeadIService.java

@@ -1,10 +1,10 @@
 package com.jsh.service.materials;
 
 import com.jsh.base.BaseIService;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.UserBusiness;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public interface DepotHeadIService extends BaseIService<DepotHead>
 {

src/com/jsh/service/materials/DepotHeadService.java

@@ -2,10 +2,10 @@ package com.jsh.service.materials;
 
 import com.jsh.base.BaseService;
 import com.jsh.dao.materials.DepotHeadIDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.UserBusiness;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public class DepotHeadService extends BaseService<DepotHead> implements DepotHeadIService
 {

src/com/jsh/service/materials/DepotItemIService.java

@@ -6,11 +6,11 @@ import java.util.List;
 import net.sf.json.JSONArray;
 
 import com.jsh.base.BaseIService;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
 import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.DepotItem;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
 
 public interface DepotItemIService extends BaseIService<DepotItem>
 {

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

@@ -18,14 +18,14 @@ import jxl.write.WritableWorkbook;
 
 import com.jsh.base.BaseService;
 import com.jsh.base.Log;
-import com.jsh.constants.asset.AssetConstants;
+import com.jsh.util.AssetConstants;
 import com.jsh.dao.materials.DepotItemIDAO;
-import com.jsh.exception.JshException;
+import com.jsh.util.JshException;
 import com.jsh.model.po.Asset;
 import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.DepotItem;
-import com.jsh.util.common.PageUtil;
+import com.jsh.util.PageUtil;
-import com.jsh.util.common.Tools;
+import com.jsh.util.Tools;
 
 public class DepotItemService extends BaseService<DepotItem> implements DepotItemIService
 {