From 33bb4e06efb1314e65a9fd841cff473a60610941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 9 Apr 2017 16:52:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7=E7=9A=84=E7=B4=AF=E8=AE=A1=E5=BA=94?= =?UTF-8?q?=E6=94=B6=E5=BA=94=E4=BB=98=E7=9A=84=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/action/basic/SupplierAction.java | 6 +- .../action/materials/AccountHeadAction.java | 70 ++++++++++++++++- .../jsh/action/materials/DepotHeadAction.java | 73 +++++++++++++++++- .../com/jsh/dao/materials/AccountHeadDAO.java | 18 ++++- .../jsh/dao/materials/AccountHeadIDAO.java | 3 + .../com/jsh/dao/materials/DepotHeadDAO.java | 19 ++++- .../com/jsh/dao/materials/DepotHeadIDAO.java | 3 + .../com/jsh/dao/materials/DepotItemIDAO.java | 4 +- .../model/vo/materials/AccountHeadModel.java | 14 +++- .../model/vo/materials/DepotHeadModel.java | 14 +++- .../materials/AccountHeadIService.java | 3 + .../service/materials/AccountHeadService.java | 7 +- .../service/materials/DepotHeadIService.java | 2 + .../service/materials/DepotHeadService.java | 6 +- .../com/jsh/action/basic/SupplierAction.class | Bin 11303 -> 11185 bytes .../action/materials/AccountHeadAction.class | Bin 10688 -> 12306 bytes .../action/materials/DepotHeadAction.class | Bin 12687 -> 14442 bytes .../jsh/dao/materials/AccountHeadDAO.class | Bin 2219 -> 3094 bytes .../jsh/dao/materials/AccountHeadIDAO.class | Bin 461 -> 702 bytes .../com/jsh/dao/materials/DepotHeadDAO.class | Bin 2195 -> 3153 bytes .../com/jsh/dao/materials/DepotHeadIDAO.class | Bin 453 -> 728 bytes .../model/vo/materials/AccountHeadModel.class | Bin 4593 -> 4793 bytes .../model/vo/materials/DepotHeadModel.class | Bin 5505 -> 5705 bytes .../materials/AccountHeadIService.class | Bin 481 -> 722 bytes .../materials/AccountHeadService.class | Bin 1440 -> 1865 bytes .../service/materials/DepotHeadIService.class | Bin 473 -> 748 bytes .../service/materials/DepotHeadService.class | Bin 1410 -> 1891 bytes .../js/pages/financial/financial_base.js | 8 +- src/main/webapp/pages/manage/vendor.jsp | 68 ++++++++++++++-- 29 files changed, 293 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/jsh/action/basic/SupplierAction.java b/src/main/java/com/jsh/action/basic/SupplierAction.java index f54942be..ce9ea841 100644 --- a/src/main/java/com/jsh/action/basic/SupplierAction.java +++ b/src/main/java/com/jsh/action/basic/SupplierAction.java @@ -5,15 +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.Supplier; import com.jsh.model.vo.basic.SupplierModel; import com.jsh.service.basic.SupplierIService; +import com.jsh.util.JshException; import com.jsh.util.PageUtil; /* * 单位管理 @@ -242,8 +246,6 @@ public class SupplierAction extends BaseAction 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()); diff --git a/src/main/java/com/jsh/action/materials/AccountHeadAction.java b/src/main/java/com/jsh/action/materials/AccountHeadAction.java index 3a055bdb..ed8e3264 100644 --- a/src/main/java/com/jsh/action/materials/AccountHeadAction.java +++ b/src/main/java/com/jsh/action/materials/AccountHeadAction.java @@ -7,9 +7,12 @@ 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.Account; @@ -19,6 +22,8 @@ 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.service.materials.DepotHeadIService; +import com.jsh.util.JshException; import com.jsh.util.PageUtil; import com.jsh.util.Tools; /* @@ -276,6 +281,70 @@ public class AccountHeadAction extends BaseAction Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询财务信息结果异常", e); } } + + /** + * 查询单位的累计应收和累计应付 + * @return + */ + public void findTotalPay() { + try + { + JSONObject outer = new JSONObject(); + Double sum = 0.0; + String getS = model.getSupplierId(); + //进销部分 + sum = sum - (allMoney(getS, "付款", "合计") + allMoney(getS, "付款", "实际")); + sum = sum + (allMoney(getS, "收款", "合计") + allMoney(getS, "收款", "实际")); + sum = sum - (allMoney(getS, "收入", "合计") - allMoney(getS, "收入", "实际")); + sum = sum + (allMoney(getS, "支出", "合计") - allMoney(getS, "支出", "实际")); + //收付款部分 + + outer.put("getAllMoney", sum); + toClient(outer.toString()); + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找异常", e); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询结果异常", e); + } + } + + /** + * 统计总金额 + * @param type + * @param mode 合计或者金额 + * @return + */ + @SuppressWarnings({ "unchecked", "rawtypes" }) + public Double allMoney(String getS, String type, String mode) { + Log.infoFileSync("getS:" + getS); + Double allMoney = 0.0; + String allReturn = ""; + PageUtil pageUtil = new PageUtil(); + pageUtil.setPageSize(0); + pageUtil.setCurPage(0); + try { + Integer supplierId = Integer.valueOf(getS); + accountHeadService.findAllMoney(pageUtil, supplierId, type, mode); + allReturn = pageUtil.getPageList().toString(); + allReturn = allReturn.substring(1,allReturn.length()-1); + if(allReturn.equals("null")){ + allReturn = "0"; + } + } catch (JshException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + allMoney = Double.parseDouble(allReturn); + //返回正数，如果负数也转为正数 + if(allMoney<0){ + allMoney = -allMoney; + } + return allMoney; + } /** * 拼接搜索条件 @@ -296,7 +365,6 @@ public class AccountHeadAction extends BaseAction } //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override public AccountHeadModel getModel() { return model; diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java index 427ce27b..df16802d 100644 --- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java +++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java @@ -7,9 +7,12 @@ 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.Account; @@ -20,8 +23,11 @@ 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.JshException; import com.jsh.util.PageUtil; import com.jsh.util.Tools; + + /* * 单据表头管理 * @author jishenghua qq:752718920 @@ -331,6 +337,72 @@ public class DepotHeadAction extends BaseAction } } + /** + * 查询单位的累计应收和累计应付 + * @return + */ + public void findTotalPay() { + try + { + JSONObject outer = new JSONObject(); + Double sum = 0.0; + String getS = model.getSupplierId(); + //进销部分 + sum = sum + (allMoney(getS, "入库", "采购", "合计") - allMoney(getS, "入库", "采购", "实际")); + sum = sum + (allMoney(getS, "入库", "销售退货", "合计") - allMoney(getS, "入库", "销售退货", "实际")); + sum = sum + (allMoney(getS, "入库", "其他", "合计") - allMoney(getS, "入库", "其他", "实际")); + sum = sum - (allMoney(getS, "出库", "销售", "合计") - allMoney(getS, "出库", "销售", "实际")); + sum = sum - (allMoney(getS, "出库", "采购退货", "合计") - allMoney(getS, "出库", "采购退货", "实际")); + sum = sum - (allMoney(getS, "出库", "其他", "合计") - allMoney(getS, "出库", "其他", "实际")); + outer.put("getAllMoney", sum); + toClient(outer.toString()); + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找异常", e); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询结果异常", e); + } + } + + + /** + * 统计总金额 + * @param type + * @param subType + * @param mode 合计或者金额 + * @return + */ + @SuppressWarnings({ "unchecked", "rawtypes" }) + public Double allMoney(String getS, String type, String subType, String mode) { + Log.infoFileSync("getS:" + getS); + Double allMoney = 0.0; + String allReturn = ""; + PageUtil pageUtil = new PageUtil(); + pageUtil.setPageSize(0); + pageUtil.setCurPage(0); + try { + Integer supplierId = Integer.valueOf(getS); + depotHeadService.findAllMoney(pageUtil, supplierId, type, subType, mode); + allReturn = pageUtil.getPageList().toString(); + allReturn = allReturn.substring(1,allReturn.length()-1); + if(allReturn.equals("null")){ + allReturn = "0"; + } + } catch (JshException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + allMoney = Double.parseDouble(allReturn); + //返回正数，如果负数也转为正数 + if(allMoney<0){ + allMoney = -allMoney; + } + return allMoney; + } + /** * 拼接搜索条件 * @return @@ -362,7 +434,6 @@ public class DepotHeadAction extends BaseAction } //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override public DepotHeadModel getModel() { return model; diff --git a/src/main/java/com/jsh/dao/materials/AccountHeadDAO.java b/src/main/java/com/jsh/dao/materials/AccountHeadDAO.java index 3bfb4839..1731bb97 100644 --- a/src/main/java/com/jsh/dao/materials/AccountHeadDAO.java +++ b/src/main/java/com/jsh/dao/materials/AccountHeadDAO.java @@ -5,6 +5,7 @@ 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.DepotHead; import com.jsh.model.po.UserBusiness; import com.jsh.util.PageUtil; import com.jsh.util.SearchConditionUtil; @@ -22,11 +23,26 @@ public class AccountHeadDAO extends BaseDAO implements AccountHeadI } @SuppressWarnings("unchecked") - @Override public void find(PageUtil 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()); } + + @SuppressWarnings("unchecked") + public void findAllMoney(PageUtil pageUtil, Integer supplierId, String type, String mode) throws JshException + { + Query query; + String modeName = ""; + if(mode.equals("实际")){ + modeName = "ChangeAmount"; + } + else if(mode.equals("合计")){ + modeName = "TotalPrice"; + } + query= this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select sum(" + modeName + ") as allMoney from AccountHead accountHead where Type='" + type + "' and OrganId =" + supplierId + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); + pageUtil.setTotalCount(query.list().size()); + pageUtil.setPageList(query.list()); + } } diff --git a/src/main/java/com/jsh/dao/materials/AccountHeadIDAO.java b/src/main/java/com/jsh/dao/materials/AccountHeadIDAO.java index b350f2f0..a96b7eaa 100644 --- a/src/main/java/com/jsh/dao/materials/AccountHeadIDAO.java +++ b/src/main/java/com/jsh/dao/materials/AccountHeadIDAO.java @@ -3,6 +3,7 @@ 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.DepotHead; import com.jsh.model.po.UserBusiness; import com.jsh.util.PageUtil; @@ -12,4 +13,6 @@ public interface AccountHeadIDAO extends BaseIDAO * 获取MaxId */ void find(PageUtil pageUtil,String maxid) throws JshException; + + void findAllMoney(PageUtil pageUtil, Integer supplierId, String type, String mode) throws JshException; } diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java index a5240497..9e3e0a81 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java @@ -22,11 +22,26 @@ public class DepotHeadDAO extends BaseDAO implements DepotHeadIDAO } @SuppressWarnings("unchecked") - @Override - public void find(PageUtil pageUtil,String maxid) throws JshException + public void find(PageUtil pageUtil,String maxid) throws JshException { Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select max(Id) as Id from DepotHead depotHead where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); pageUtil.setTotalCount(query.list().size()); pageUtil.setPageList(query.list()); } + + @SuppressWarnings("unchecked") + public void findAllMoney(PageUtil pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException + { + Query query; + String modeName = ""; + if(mode.equals("实际")){ + modeName = "ChangeAmount"; + } + else if(mode.equals("合计")){ + modeName = "TotalPrice"; + } + query= this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select sum(" + modeName + ") as allMoney from DepotHead depotHead where Type='" + type + "' and SubType = '" + subType + "' and OrganId =" + supplierId + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); + pageUtil.setTotalCount(query.list().size()); + pageUtil.setPageList(query.list()); + } } diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java index 9bd606f5..11a74668 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java @@ -12,4 +12,7 @@ public interface DepotHeadIDAO extends BaseIDAO * 获取MaxId */ void find(PageUtil pageUtil,String maxid) throws JshException; + + void findAllMoney(PageUtil pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException; + } diff --git a/src/main/java/com/jsh/dao/materials/DepotItemIDAO.java b/src/main/java/com/jsh/dao/materials/DepotItemIDAO.java index 6ccc31c6..c51d79bd 100644 --- a/src/main/java/com/jsh/dao/materials/DepotItemIDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotItemIDAO.java @@ -8,7 +8,7 @@ import com.jsh.util.PageUtil; public interface DepotItemIDAO extends BaseIDAO { - void findByType(PageUtil pageUtil,String type,Long MId, String MonthTime,Boolean isPrev) throws JshException; + public void findByType(PageUtil pageUtil,String type,Long MId, String MonthTime,Boolean isPrev) throws JshException; - void buyOrSale(PageUtil pageUtil,String type, String subType,Long MId, String MonthTime, String sumType) throws JshException; + public void buyOrSale(PageUtil pageUtil,String type, String subType,Long MId, String MonthTime, String sumType) throws JshException; } diff --git a/src/main/java/com/jsh/model/vo/materials/AccountHeadModel.java b/src/main/java/com/jsh/model/vo/materials/AccountHeadModel.java index 0c0b1432..386dae88 100644 --- a/src/main/java/com/jsh/model/vo/materials/AccountHeadModel.java +++ b/src/main/java/com/jsh/model/vo/materials/AccountHeadModel.java @@ -20,6 +20,8 @@ public class AccountHeadModel implements Serializable private String BeginTime; //查询开始时间 private String EndTime; //查询结束时间 private String MonthTime; //查询月份 + + private String supplierId; //单位Id，用于查询单位的收付款 /** * 分类ID */ @@ -222,4 +224,14 @@ public class AccountHeadModel implements Serializable public String getClientIp() { return clientIp; - }} + } + + public String getSupplierId() { + return supplierId; + } + + public void setSupplierId(String supplierId) { + this.supplierId = supplierId; + } + +} diff --git a/src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java b/src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java index f41ffb8b..761d6ade 100644 --- a/src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java +++ b/src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java @@ -25,7 +25,10 @@ public class DepotHeadModel implements Serializable private String BeginTime; //查询开始时间 private String EndTime; //查询结束时间 private String MonthTime; //查询月份 - /** + + private String supplierId; //单位Id，用于查询单位的应收应付 + + /** * 分类ID */ private Long depotHeadID = 0l; @@ -225,5 +228,14 @@ public class DepotHeadModel implements Serializable public void setMonthTime(String monthTime) { MonthTime = monthTime; } + + public String getSupplierId() { + return supplierId; + } + + public void setSupplierId(String supplierId) { + this.supplierId = supplierId; + } + } diff --git a/src/main/java/com/jsh/service/materials/AccountHeadIService.java b/src/main/java/com/jsh/service/materials/AccountHeadIService.java index 90ba812a..cb46fcd7 100644 --- a/src/main/java/com/jsh/service/materials/AccountHeadIService.java +++ b/src/main/java/com/jsh/service/materials/AccountHeadIService.java @@ -3,6 +3,7 @@ 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.DepotHead; import com.jsh.model.po.UserBusiness; import com.jsh.util.PageUtil; @@ -12,4 +13,6 @@ public interface AccountHeadIService extends BaseIService * 获取MaxId */ void find(PageUtil accountHead,String maxid)throws JshException; + + void findAllMoney(PageUtil accountHead, Integer supplierId, String type, String mode)throws JshException; } diff --git a/src/main/java/com/jsh/service/materials/AccountHeadService.java b/src/main/java/com/jsh/service/materials/AccountHeadService.java index 5b298234..c4267b1f 100644 --- a/src/main/java/com/jsh/service/materials/AccountHeadService.java +++ b/src/main/java/com/jsh/service/materials/AccountHeadService.java @@ -4,6 +4,7 @@ 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.DepotHead; import com.jsh.model.po.UserBusiness; import com.jsh.util.PageUtil; @@ -24,9 +25,13 @@ public class AccountHeadService extends BaseService implements Acco return AccountHead.class; } - @Override public void find(PageUtil pageUtil, String maxid) throws JshException { accountHeadDao.find(pageUtil, maxid); } + + public void findAllMoney(PageUtil pageUtil, Integer supplierId, String type, String mode) throws JshException + { + accountHeadDao.findAllMoney(pageUtil, supplierId, type, mode); + } } diff --git a/src/main/java/com/jsh/service/materials/DepotHeadIService.java b/src/main/java/com/jsh/service/materials/DepotHeadIService.java index a3e2bc59..75f6c0d1 100644 --- a/src/main/java/com/jsh/service/materials/DepotHeadIService.java +++ b/src/main/java/com/jsh/service/materials/DepotHeadIService.java @@ -12,4 +12,6 @@ public interface DepotHeadIService extends BaseIService * 获取MaxId */ void find(PageUtil depotHead,String maxid)throws JshException; + + void findAllMoney(PageUtil depotHead, Integer supplierId, String type, String subType, String mode)throws JshException; } diff --git a/src/main/java/com/jsh/service/materials/DepotHeadService.java b/src/main/java/com/jsh/service/materials/DepotHeadService.java index b912b84b..94f790c0 100644 --- a/src/main/java/com/jsh/service/materials/DepotHeadService.java +++ b/src/main/java/com/jsh/service/materials/DepotHeadService.java @@ -24,9 +24,13 @@ public class DepotHeadService extends BaseService implements DepotHea return DepotHead.class; } - @Override public void find(PageUtil pageUtil, String maxid) throws JshException { depotHeadDao.find(pageUtil, maxid); } + + public void findAllMoney(PageUtil pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException + { + depotHeadDao.findAllMoney(pageUtil, supplierId, type, subType, mode); + } } diff --git a/src/main/webapp/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class b/src/main/webapp/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class index b15dc5ea1cb4b098037590563db00526577d551c..5cb6496f8e1291fcc275128f58362a63df73b68f 100644 GIT binary patch delta 3959 zcmcJR32;?K7KZ;n+wHt}37H3C5+DW=gGqpZBI5=K3IYNHf`m;GG;E3ssJMWSAVS!Y ziva^fR3wUuL@*L|cSRHwTo7^M5>Xk)ZB$g$`TO0Mz>G{y)l^O0s@tdcbG~!>be9jR zDCoNLw@upswB-i@JcMco9|jPE>O`!4cuXf$vg7}>q&0&Cla zR_bc!cC*q&4!Z|1)*98r)_VqcF?*?ny&d)m;5t+X`4{#LvL7!A+kbyC<^T)&XTwWv zdDw8EEk8Fbu;mfMLALzLaIh`EF&tvc?+k~kkO|qyuomS;Y7n5 z4R12M*)A~2;VlktUB5jhF+O1p9woB8>Vz!g;$b{Obo15)PVrJrPSR~IZ|7u(Q(WG` zu-Dh5ho@qb%OXy5d8d`8Tj?$<&9Kr;D-~O57H7Mh!?`Z!S!q7!I$U6vS?Ka^E^_JF zp^NR%d#qGqr6pYI@?Ms@SdDUr%Uo1&Ig#*b@xq$f_qklb%(*t4i zB-gvB;s!4mY|>&apCTG&WE?7;UbkD#mT5H`H@d9k(+*WuN!32V<-twd>|!$~6Yafx zx3QP(PBmL(3$|#$QumhFt=#H0s5etKP4-sQOUvHI?Jjrl8JEvm={ZT*jXf@(=L;@h zPx!vKb7V<8aukm#+IVmk=x63_z!{M7Q_i~@hxA4Bpx4GWylGHWi zjGcJv#2X98yL^Z5y4=tAysb%ju?P6RcR1-v^S1WEJJ{n5tUs9ty}k8|V&BF7^##d? z9dBexVdg3&F(})_Sbs$%1(3@6AQV^nKjwXr(k$(u=HVQ8I2TLN9V^ir52B~iVJ|7x2altJl<0&FI3HE$jP2-x=QVDZ#_dMWF!pHR z+ZwnZ-SD0|K2k@G7C5B#zf1laeK{Qcd6l-e)^vv>1!v$%te2gukf5cXlC&0$Bvne< zQ`dG#V{LDo%r1=DAK*|tjg8_!DHOj+#be%~#y^d)B-*2%{=-CKI8MS9f;a*h7=uh) zi7XUK#ZgjgH2Nuh4aYdVi}5&!Ya@y^($-lbW|gqOtLuPojsox8^i>~tnLq=Rw9Rcu z#qF9lS%{|y;~nUVF#2LDhN4KDPSfId;#N%8cNgYkra%|tUd%$7($H!wQxq%}=u-K1 zxrofs_VdJZJ`P|3KEy&@aV6ro4Bu$nw9rsjpOhE7Vt}zTN736R$<218V<3?bX;TGW*z2V67S* zWp^u`1wZgc>SXvl%KWzW(y}@N$&b8~>VPEI0oms3t0TP#vATr7A>P2uK@C1=S%n*j zbK+Cut1yA`^e*q2%;NC$Qkc+P<%kc>sKm7esZMBSYCZ(!&^xFBRNhDTu#TFe>Qqos!l+ zMCp4xgCFoZepGlK(Tty{rxfes7dF9B=HOSh#cynM zXMlt0MjSCp>1wL-*>>zu08Ubr*kDbNbN6Z^>wG;?@SGA3ai#+N1-vK=JJ87aJ7n1a zor;$g1ll4J$~w609}Q|9VGfCUZf90B`26Kwty^xFmZPG@Prz<=bKdRcXBRfL$ah%M zi%vk=tH@4^=^ckJogxX9fnaIWA)+#_?24Vm9tz z3luRIvv>yPvL)uRH9W~BY=b2{U1zvm1kW%e;xa|Q#giaob0c`-6~7mZiSUV&JBy-x za+L0TK5cd8ER|R}&t_Mf&XydbqGRIUBs*)NMAooS{55Ip!5`!UV_qFQ2Gc;KS3EHDE$THQb8FaC z^<{oNP+MQ_*HdciEBtzLZN1E|C)L*P3$2Wb_8|~C*gC_BiosFBJsRN@j=^ahi?cWm z-FY}_OYJ` zldnjz6qzMOW=oMd|Dz(*qhY@Y*&xVQX`c%5)=}$}Wu>6K8xw3R7e#jPUvKeIQ>i!7 zf#~dx8f`-;Avfx>iJ!4iQx<@t_Tl V<1|6q2{eg``uL!(NIUwk{{#{MTFn3e delta 4062 zcmcJR2XvK17RUepv~TkA5wee#074*L^o1r#4qqzQ_A zAqYZ1MS=}MFjOgaK_vEy22DU$5zDG5Ebf2adkI+f>^XbRp5(l_GjnI=-rv1*zgeAI znU}TW=*BGoviOA$kD}H=oevSHjl~M=GuZFL7x>bLf8Z+zU;AKCdtbkdKm>lY@=sRv zXDc1@;TQaBrNegYh?V|jrK48*O%frA)V_>}V=0Q+Bjaq!EwBlm)W0O%Q(*>KWaF{ zwg(L_x9tJLD{Onj@JieMV0e{ne>A+>wm%!@tK~I@1-2b(ILx-g6<8J;jxZc)ILfMi zXGU?fozwpq8Nq7}$I2=i!y?1$tS8so@nAr2Fuc)loWo)t7Ft(I;&>AW8QyGoi{W^~ z35F95Z#BHlaFXHec74F%WQV0|o{ET#j#-JPh*YmSCe^rj0#6eCy`{dkUaU!vzr*F7 zoZ|2%UsU0QaQ^U&bQm# z?{Wbbx_rQ@F0!hNtyE#9C0y$AK|bW-F+A?@VHeME84ABJ$woQaiie z;RXw6Qe0cF#1}9dxyi+|-0U6pwN9(zvqaP6s@Z)R)^bMZkNTq z;ugg{$LC#arOT=$Rlji{B(DG;qPq@kJ9^Wt9*Jte53kwT}pIcbs@>9-LF$s@cTrk09jU91D7f&cIDJ*iim!G-( zoVDJJ_{_*U?(^2g4>KRi6nuoYz4nc7<9=^R2Fv1d(6!dFh4Mk5PLj-5ap*Vq1@ zn>aFMg^D9o&mwHxgOUG)iSByh9OhOi> z<7CW6Hawh)`*9AIO7mg#$1)6%sprec(`De9I=TlopeMF!w-==Mn)G&~e*o1|d{>Ge z;B0)TiO)1qrw#UN{2R&NB8U07h{JJl(3=5pWZ+a(VV(S3h8V2Z#t}NCxulJfsvE}k zOV`du$?d|h|2|%UP1r0B#IuOrqGpxnwfd#NlE_9Q{pN|p6=)`3Tj44sW4O5FBNYWQ zYbbIs41-Xpkr8-b<#7+j1PyDhqf3t);@1*xV$^$qg#lx6`Bbdu5%%_7geHP1^AlZ)vEXAS*&`CNd z1p2WCsB6(Z4Ep=}F|9ua`i`*Q(VWx(dK-eA6$Y=WZOssix(nj;yIgr$iPrL>y}U@n zYNgu~O1G7`K+rCcS9#j*Wf@^J*&@z74)Kl##M{G&4<=t7LVTIx2b~&??P!Oc%H(Qg z@GdRhjjQp7V)?vc`J&+L)OVp8i#1oFx!sz36R)at>=eRke4_Ch>=v17Hr0$ZqnG^d ztlSSJ-ca3yP~ugD#9vT|M-43TB2x029O|?IHxg$= zCq-|-I4aWnyrPupf$MUU9RHN0m@3>=gh@EUCpmE=@mPHyFI%{%+=ONz1z8J(*zw+gA1Xqw~qGS?%m622UNnWRA4YB>ew zbEv9p#;}Nn#qtTbPR5c_K>L5i^*DS#oPOJHeA&&Mvy;-LRP5gLtk)tSVf)Af6aS zC?kj`S{dGVRFF@U!de>Ula6b`e6n;aMMZpO*F#Z-2~}cS`YQeiCAf!$651mK<;~-u z%>NHi?r%uL1%H5Yrl9l?l%9gpOHg_X%2|SPwxIMClzxJ8uAmGMl=B5;prGUk%0+^b zCn$pi36O>B@C09^}{5L3p|1*>b`(#nZtP;eJgx7w^Z`y=~L)PJeoJ{|sK*n0= zuD0BO#gWL(^jC!XZhe1AsPC)qFAen*>-!Ie`U&;@heG}M`u@ZIWns};5W3$Tlq1mR z*XR=(NaP4~PP6SU+?m`u*=EET(0mxa-4C2KUwDwe%!~)x(R5)iD<)Hk255>!H~p18Dd9%Z-|~} zVfKG%$np&cgs}e=rjQ|1WymxcGF^tu_#X|Sis>E^vLWcI*50US8>m(K_{l(9bYtu& z=LAm(z3-yKu2LoVQ@h$r&TKK!>IUC~EJHNs9cNKYSl{kt-;_+~qjPKQ%HN$^g-Sbc Y+_9=j$DWn-$3}z$x>pZ4tNr=E0e>ZaWdHyG diff --git a/src/main/webapp/WEB-INF/classes/com/jsh/action/materials/AccountHeadAction.class b/src/main/webapp/WEB-INF/classes/com/jsh/action/materials/AccountHeadAction.class index 6bbd3b7f90e82ecfbe22f990967845023ba69db2..ba362b4e659ca989354aa0465daeb1a746688a76 100644 GIT binary patch delta 4698 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 delta 3282 zcmZ8jd3;vI6+P$6@+L2jBqoG?CjuryP=qS3C}>a?5vZb8_)0!PGz$_`)M~)GQnku! zZE-;bK|}>45kw*&s37!?Fj5fOUs_a)I^-ybt~?#$ff+%q$8=D0N@t2Z2e zeieY@BEFBssQ2)Vj|l41un6Cp^qr60*yG`QA0Fzh*=x-{TkwO!{&f6^pB#QR<$-kk zf`cA@bvWeXHyn02qV0qu9V1dP$!9WCJf`|+W9F(O^d!>B7t=f{ijGV-O<Yq8vy)AC_SnT$ zv#Tx1GsV%$h20#xD>wGA<`|1M-6 zDaZO8$Efh1tb*~cKBl5Ro#R=Y&KM_HQ{p($P$_l1-1;jV%d9vWms?-qSZVr6Rv#&^ zw0^Q`}WsoHUxEy{MBZhfBP zO^S|xcf45%FyHYO$6Gz#=3}mmQ0{aucCJO0xUxX0tY9%t6{PkJb+ zX0x}7Nws)3yf>|P)>7024EZmQ{|5pW*o z6JFI-S5A_5xQ0Tx|~4SX|kcN3V_+R$W8aU#AZ#;Ol1Y4aJL>`6iLNZ`ITr_blS{%e8Euob@QZM2#$9Rr zl3xYb$OU0W=Dlg$u28T^p)ANOZN(kj8E}^xe2i@Yzh=Fa`kU~WtS*`SmODLuXCdeg z%MC}Q=2m;$6YzWP^|&wK58NN{N9-UXgH^VltTf*6$tBSW8!qC{1jL27W>~a57Vv-} z+pH*BQCyX%m@TZ~FGS`al!>(mZEf0s1mkR79e)jXXXPFHA`b=pjfVx@SrelbC9whJ zMoN!If{57fMIu2YDUz(XBPro&N3~B%jdg`IP9J$!*LiTses`86du`;(a+ZfW1V=8{&klFtZAVpGnHm6TT4P7y@IK^4U| zKxe%Mi}j4iznz@8qywftT?pvNsa+OM=+L=fxpX?CYTF|jo$#EbK(jy=R^WN{#7fk~ z*DvibvD()6k`C*e5sM<1Ml6EH*?vzagJ{gI6qunI{U z4{xxZj)7Q>HL{IQE+*=^n=V3V>m+2>z^+LR*qHM*}*e14qA(qvP2j6LSw-~Ws1^QW7 z9l%l{TqAUAc{H9Cx+{4+)>N}EUJ$&iDbnzCtl$7m48|G`k$#x;qa|O2wOlXi7y%9X zxW+Nac{F-=TlC0f`i@LuMoNn;M|+)cwmbzn_gwIz5}w zP8oI)u-);Y`2Vg5yH!MdU*!7$7m0A|@o5v}1%H5iLlfki8z8^5M_K~%nF1LC%HbOw zm~YWRfOQjKy|G6JZ!b<2fzA_nqx2g%MgU%;Kfq}?sM`K2zz@mgZ({jj5=Zp&1)fZ@ zi26rik{-#$JP2tTuYy?)82~QYCR7bdLXiNljrg?X6t@$&Yf%#&tZZN z;WQOui*ojG4U6LNrs}{%g}^)Fh|{}d=bPxu*+Szz5$#mH^jozf38PpoWIjMLx5mNW z0P^#OGKhxUh3dq0WS4_+G-2+;CUYN27qM4E?J}*Ykx{$WMz6$NRpzlF1=;iRYmvMR zy;dMA2^SV*&rgioHI5%oj2ASHpGb@sCdSnT*-vIa)iAe2mXpLMr~;nC>#TUXpcT8K z2lH^Es9MBs7|HHU1y&>tWpyIKC-Ez<@uEv;K24hz?vnb_1^M;=0HC>#Y?+8y_~t3w+rGgIq~Npqg5>AsY{I17YRD{AV5S}4@rLM;+%u~18d z@<}%86)u(RER$uq#Cwmpy+Xr#6|U59mBRZJu9mm=Yd&0~aIGkKK*x2sUdIi%QA1OQ zshFm4lRO_(_>jVfg=9?=@ew<27Asp6J}M`-iq+pK+$ItY3LjJWxWerUpO6<%D%>H@ zoeFm;d`jVNg?kkKUQRx3_wk#(3im18uke7vXN3I+Sq_TRhXmF?%5lGj&+1SwP8}BJ z5gm`>G2t-a$91?D)9m;sJYmN_<8!k7Md3-w$@2w?)E3eU*qtim_t`IZ32N8gs`I||TI`Jp_S z`H?Vdb^IHCtmEJD6QMp;_?fUjS3dkg;g>=$Qg}|DOB9}$a4smkDB<0s@RGvIl8vtv zey!s-_^m8g6#hf<^qs=*75<>`M-ll+;Xf7rOX0s2UR8Ka;eQnVtnj}IuPgk8lSaVl zB-Du*O`P@(g(wPTg%qa9rje$@`=r=O3fD;2;UmsC*%cXzA{4by6sahR?NUoc4tYi^ zYNe>PkZlyTWhW>`Bd12O2N#4K2^ln}w4x}#((5YAbJZb)RM(UvII`!u=DU*1TouL1 zS(P=j%iIGILW|wr2?)wnR+dv);b!52?&i|i81rnbVb*JQb4_dn(-FSkI;>aMR8^Ig zx;>+c5Tct&jH>Xui`^d9-!8kbvOIZibxCrKx3nyIbalz_+Cq1gx3scCtb6OK+z48A z&Fp-O3N5cJVn#T-Gv4j3@l+rf?BTG=gZ;FVX!{PnN9bW**Lt`OxB~w$s2#;=)ZU-Ujs-Y5*TtqsJyv8l@ZX9c36akTMM#BrgYx*bur+qoD@fE}UU3epc_E zoJGS$`VNCe&`5(u!Bqskj{o(_$>~+ZL5wzN3}qXXLn9Gl%*?PDbBI0FmP_dfPV-D# zr*6<#$}?yjrJGyqacVqGFesllC+zKWCekE>Cexh;O`)jK2JP>~MGE&mqNBVqP{!UVoQjZYB-)4lOmm= zXr~mjL*zC!pADkH249S285_kvTT1vwbnuYP3X*`^?2rv03#7 zEv01|EjQ>MT4B(=cq;;p;uuy+zQXf7m2=&NUSXusDg;2V2YI=!a<@VE!Bz94sJNM{ zEgXh<+%B&>zf|7bPiqWXOAl}_jjeKf0?bjghO2w5r`S~?I&*0q8?m+lb?Ze<#7I{~ zQFWf%Q(b9EjiU|bq?QRG`LxljYuTZ3D%j4NyxJ<7qRaM|B92AYo?gPwx#4cbk6Ow-{T@p}nBvJtMC z)icYy?s*11ZGk(gh#8fhBDaSv6uGMl4caR&j9z{FB&4KdSpN;S*XQ7r=xBS(2=TAk zJnUws#J9TTH;1Aj<9m1h3clvMAMp=Q zLyO``%Fjryb{??2{$L)9@0j!>^Y{b9YZnNGZtxRR2EPS}f`7ul_=)guxN6C39ZGy6 z-y7__Ci9vC(a;BCAQjp}Kj;Dd`6m<7Aq_J4=QbD!*)Yh`naJ8Rzya6bKM=yF#|E|A zAq#$n|FZsQK6xE};qNZLwtTSOA;S%b6!7`rw;d*u<-|!g4sZvA!3YjuG^-xNPGm!O z$YDddFq}=~@sArOfDi73WiSzz!(_M*roaxE3V(rV@G%s?MVOAEFaslDCdR@nyafs| z5!{#pbFd#&;~=QT+n@%A!U7xtbvPPId^iT?;yAbqCqWq&KsmZtu#^SMSg@Q0t66Y9 z%)?sd*E4@P^H(r`4b$u3ZoCdlD1_aTY>x-Uj@jTEhHz#a*cn4HjI%J*;@OxQ18w-N z##Fh*OA_V^(3olC_<=%$$<*;0Dh#(0rUyYQ>wLu}p!J6cURSdGYG@7jLpxXl31C8J zcz~f_&zao7+1m)?U=z%Q2jLBP1m1?tmWyq;K)OIL%Lzf}y~ff&dk~i6U8V6vS2+6E{9h*XRqQ~=C5b|M&@s3dMms|c6hf5ikc=UoEQ;=BDD#MOfK~R6bqYp z8-qx65GagbYQjisg2D(w(ZBl_Q*QLnC){D5LL7V!o!|@ZyvvXX=O76#Z~3zcA3s$hB^b|()e@>K6> z#WsfTUoN}>JRdS~2>*6Alw13DZtW~shQnb4&x$QL61MZ0*ugVnCuYOb zOz+2BIDmQJ$MII^1rW}&C_Wf)7VEPD_Az){f)OWiMgkG{h00*W19H7Yypc(s|B>>8C7 zH#2$K@!CyNul*mX<|a=&ZkV)mB{^Q_2v$r^O!9;8s2_57L91-X8%c*DdKc)~jx$0% z!<7OU&RsIjdbZ)O41qMYe1QO`akUgc1Wt$6I1>iqEG}Xfti;){m#5R)Sj3kLH+R$= z)=`NDmhg<3%Y9YJ{Zz*NRDtcW3V!mj!oiHEVo|AazCXgx{3@P}wT2(D17jb;Z5qU$ zkrm1&fU`{SyNwChkvTswubSV7v(AQNFqQG0<~Zwz=^W>DKg>D|F#>i*m}6ar?HFkM zUimUKrxxOeaBI~$@;5USSA*TDIaSYI&d?+9mJOVmA0qwmc81Mq3w7H3@J?uvAD)w~ z<6S?zw;43YUo&i+y$t14e)zy?I}9IMwwz&HL@gfK3N0*ZL6CWX{pF7?_~yg=!Mx`3 z3PqXEm<9i^RC;KG4m%rL8xkXm-M|UmE$JN}CYhW=x z!1-U#9k~IvqS-WX20|Kk!p_`iwLD<1VHc)2L4o8+{u`_;OA9sNEu3$;BQ;=G$-G5% zv-&R%mUEutSw#Z)usic?d=Hv$^{#xe`PUUbDHz!Koaoqm3_ju<|1CSvUBh02=p@I- z!Oanf3W3Rq=8$B&@9zO##{e(M@kwAG*SP;Qu#a!te-_wxY21Gv*niQu|1z*Y*SJ6L zxDX@{uv;Nk6{qsW3$TF;?=c_WMIMJvxE*@p6FlUeBNB;kdG7Fy^@AoS2Bg7naP56KhI6iAVP?miH)f+%lyU6Hky z6;V(y*j-UX0UIg;Hn1WV1Qius-I@1Z0;|Ax&Yb_wnKLv0nK_T+i`Nwf_x$$6GXT1p zfQvWjcbMYB(4T<)Y@kxA%QQB0*vN%LzYdLcXrc;DEz^B$#^#nS6m02ZD`q%sZP~_U zTeh=ouiHCVcC^e?D9dFwJ2~v^qKTRd8s@0jMbGN0Qa6X)bg~#@ zeO&fsKV9~BIKbgR7ny1*ljphU$U*ugPq&7frhvQrfj3DC`nV@DSsx(QZ$tq1zX{t)oRGO~Ym|;0nvolMF*&6R0 zb$hPEd6oqZ=UWz97U|c36Xb=K3)H|umy39j%Zpj;u*Ag-`YlU!F0)*0xkN>=G@0c- zR_G~}mQ}j*5CRc%K8qS@3g#2_;12o%ez(K9?N@mzE3&(x8?o1*kt*D&YP7m z+4`W)4_R(eaH~=#;KMqLy+;(>rmP9LU1tFwRd9mK8t!oU7#~;Z3CkxHe#!>Ghu`s8qa#3;4xPk?N$s%|>!lNEPk^yhwZ6dCupn61+!;d|F z!cPgWD6qJ!a(JMiD8HcE<7fQb;W3Y2@ObE$JERf6^!OFOCK3YGg@MJDWs6EZe!~-? zA-;tkzvW4Xr#ybg??YW0Hwf+XxoP|XM?9Y936DRj^b=1IX`wtPEz9H2JmcXYfARP$ z|LgHLRrp<0jl}L46D+}si?>?K2NsP z^Gu>i2(9$;W0H6#^oG|wJK5CtjGt$ShP7EKDJu#T=PWME85bz8C@b|$ifQ1PRN2t9 zUbAs&rlDsVnZ}-JVw!p;UEDOy#6#0uu@;K8RL@$8ulT}b5b>W~eZ!~M-sYLs6d&4{ zww`IH8tpaQl+e+*l+Z2p?vLqUI);WNc1y{`5yxbCCfme2rjumMbPlaa?9(X6bRpQ1 zh&l1pN)5KFW4aMzLMM}2gnmuD%68X`o#Zc}>ypxAa!ilVrlbuqJx#CBMz2w5ZgS&T zoZ`vQWy!bNTsa=!N$N7{S2XNx`go?V42)r{XZo4`!nYX^+FZYN;y}~KG3TidgXG$T zK8#Nt>X$uN{cEYjH#C2OdyiZ0aaJ_DR1u0x4K|st?j_ZRGq+-Hab;kMX9^_=x2C2wEYie`*RwFPDBN0G8f|!8I<;YbSk83ay_h1s9!(?$`3XWkaV=;|M zn9e5heznDHW@0Y8U>~GILxq<7aDpiLazx<%O}Y zMH+=P`TC7WC1ET}!PRgC{959NiH#=HDys; zgq9jn12)Prx1lj^mu+{*&A3xYx=YO8jj6Z~ORyQ0xF1z`0GHxH+=Pd)4O{RUw&E}z z#%Vl4d70>8JJV3Zrr5z&c#Q3^i=DBDU9p?p@G^U2FZG;ea0t8>%~_ps_Lj{%z9BOy46w9U#@n9 zisg0K`Y01ElnO7JnmFUsQSn`ritSk+Pd{5fhor&|BV7*8kUj0C1~R46vc!D8)W}4s zifK{}yXEGqYf3@ZITY-vqu~1}1>a_Gh)}Re3<2LuEI&w5otDD>5$*7k)XUFOkiTF6 ze#I#KCN=Q8+<9UtW8`N>EY>m(n;0*-aqt!`jxs?W2A8Cd&FQfp>v5WN?J6d5J(IbG z^|_yZd5=csX^19Y0}UeO1EufCbEf{#dK4|wq^mFn}uv?N=0763{%cFrdk-) z*e;X;UcuMJ-P4lFr92c)dprtwN?iX*?vgdL!o7j$X>uftGm?z~ro9AnT54vJNtTfQ zi&!&wVVIR~KvN#&NA9ax7EP8m7ENTt+;37R5p%x_CW(l)#l2k)hC9q0G?ea_11r5C zNiJOjxpe95j&|&UEa?s1*$cVMMSu2@zR?fWauF}(KwQrAaHEv(2A+>QrFie*5Zue5 z*evoE4#!sMAvGKw4t*99Fhdy9l8=`zmKzB;DCBL3Mx2GE(TKaFEE;jH^cK=cPrbJ` zV5yz>a6`}n-SNkO!`3w5h&2t^=*unhVF}VFS=2Y+<|nap`VKswI68AXVrww?MWkf; zUkG`<8V7eppjM9~IR;a+{4Yk<>9y=1&d@@_!CdA9P_%_>m6Epol=69z#dKA8g>vo6VeO4llRpPZdW_=6|%0H6K+Q0s~O@YWNhX(Wf|`u_t_DnY*h diff --git a/src/main/webapp/WEB-INF/classes/com/jsh/dao/materials/AccountHeadDAO.class b/src/main/webapp/WEB-INF/classes/com/jsh/dao/materials/AccountHeadDAO.class index 866d9f665ee50ded1d9d74507eaef7aa032fb66c..755fb3886a3862aa1c24571f5ca61de211473d85 100644 GIT binary patch delta 1204 zcmaKr%WoT17{!0rW6w;-(>8HPQl}|6ZJLLZVBP_T1d>unz-?L@3T=5!;)(0vSNsTs zN8JWWTi76tgj5zttXLpbR7frX#2>(lCI0{tNbK1mzOhMUA;ji;+nY?b|m@NCFD+XyJgln*Rd--P-$|zDJ-XChx zD+GEv?A2@`J)6s&C>GpJ#c6L&9f>X!s&2+DPo>tJ4JVOv3Yo;2YB^iTc=|+;2t2>)7)(TaB|C8&#-TFddEfuRy?o>IuA`-$CH|MTY zW0hJYKcbi%jX9N=^N)jGQ5%dciTLSZ#s1-#Q%J`a%NeJzkd95;l=w(7==~5F_~uV- zUP~!D{%x_)y6ZJ3S5b72w3)lOye6zuqvsV9|Fxd-X0_h>6a(_C4vDzC<+TMRi;)rs zq)SK^-Gt(IP`9NBa9E<=T-?hMsqGekL5@nN7-CpZ{_wrh`NP330$)pRpY7S5J?L|` zhDVy9Q5lLehQ@&Ri*Z&R_7Y}q-KUBR5_$bCv|o)g(WE#oWChs9G`y?BJ*os7wdNdg6YH-(0tVnlK|B}vVJs9a}t{9Qt zq#kdeH3)7KQhbko?hZ!eK!ZI|T|y)(VZtx^B#bvWIM%@WmaudU>}~c2NQTCup>6gl zw%M;}(6Q4u==6Qonm!M)N9v<;?fMY=#Mo{|2%C{R3#=!X-$(qQNDVMwcd<1GLbpXmd%RK9P2#9WI@8xpdQG z#@+yZ^amJVFu)MQ<~M4}h+)iJM1du5DU>^cSft5$wx|S34arm|YKi(IuUOC0_y|i)h&^gDrPpzQEV5;?$RSrKW3H9S zn4KWLC(-}j^gnMF&aXKy2IY&XKz6bTc}eby754Vr(6Nb%2no?&+H^$}$0DMXP$~gc i@>fQ=cq@dAuV$!9p(66)h*lBLsTMxo)yS%5y}BQ~1u6urOnx0x@?UR*QmZ+bTn3t{}TvC*omp*a6IAh^NS@DVWI=B^WoX^O}$TWE& oqm&K{BLf!$HvV!Z delta 82 zcmdnTdX`!E)W2Q(7#J7~83frGc-a~F*ctdI3cE52OpJ`3+{^e%myv~$frWvUfr)_) bsEmbyk%66o1IS`x-~?g_i;IC9EW!f-iN*>> diff --git a/src/main/webapp/WEB-INF/classes/com/jsh/dao/materials/DepotHeadDAO.class b/src/main/webapp/WEB-INF/classes/com/jsh/dao/materials/DepotHeadDAO.class index 5493313e33fd822a624885eeafaa422311b12806..eeef685dc51baca1ab90b0d70e30213fc2c38b48 100644 GIT binary patch delta 1293 zcmb7@%X1V}6vlr&uiNyrkW3uHgb2+u?}UgCoER~ZsKJmRi9zszolG;CFqs+VfyUPa z6pb=kma}4Gl`D6YlvShADs|1yKf)^gCoIqHiI7D$ZqE76ckg+9x4Yi@$DZoFe}4WI z80JfheT*w6EFR%`ix+q?$|R>1FIhwwH<{A@jKwrF7H4@`hv%ZqG8g3)=A)eFRegFv zn~Nr|nY?cC25*{NGI`6yHCZrOG)b9wI{UIRNh_8VnY#=33}d-I5SVGPFK2S8v26BC zKIg3(EY^<&+E0v3ExXs;p{$!r4^8IEUfL^erDn^;OfJ0*Q+LB{r{@ioUt&|Nre@Uk$8991a+Cd>!bB+gu^5 zSh2~GR}^fnQmhXK&sR&76&0Inysdc0W|ens-s6462R0v4Rjk=u=Z4}Vn~%9^^9i5Y ztn--x29ZDSeDnA1n~KkEZc#I^Pc4aF-q=dMk}K=;uh##%^R0+6moK~7v&GD!>=Z3| zS#PoIlq#{6ZiC}Jj$3lvP5JAWg3hp3W3@5KjrkQ?8U z8`{k6@$d9XP9OaQrQh#rzN&L#G6n1vzLTWPHZIfY-n~9Qv6&AO4ES9&8seCA?4v_| zx<{qjak+2%^XOZT33^-@z1C>l0v7nDe1!=`=JTomYECoA#86!fkb5c09MNnOC SJ3*h7!cA$%cuvX%IQ1`G&F=#M delta 500 zcmYk1%Tg0j5Qe|GBu8e>#>8ZzghZk!CJKodz+e2Ec=Y9(#7e&`|tDj-~A&O9o-oG{`w85vFnkhs;GISxacv%C7(L8 ziaC!Y)g#OsyzJ3n!Q%=|Q(pDC#-h)4Zuqoln{H^rO~oz6lHzuMe_**Ci%!(HgXp7O zkA6BmCqp(`cZ=CO+*RDu+-F(wK(oTCMG)<&Ao}Dsn-6)Uc&zF2MDbMfjOUscyi}}d zUh!J7u6e_T;;rT#o0|7*X|~z1C>?w+9sWwRoE+nFQyPn7a;hUJ?h=FO^GNnXPPn90 zpgA5#lP5UAsGvojF>C_Kr=&7HH;w&8(B_{u^PkooY76n7qG(Ra29Eeuy>8EFQn(WH zRAhF80&R-1z8v%6P!Ay`PQ{)frAPI44` delta 82 zcmcb?dX!oC)W2Q(7#J7~83frGc-a~F*ctdI3cE52OpJ`4yq58aE+Y#g0}BHy0}}%q bP#FsYBLh1F2av_YzzM_<78e6IScC@vlsXD< diff --git a/src/main/webapp/WEB-INF/classes/com/jsh/model/vo/materials/AccountHeadModel.class b/src/main/webapp/WEB-INF/classes/com/jsh/model/vo/materials/AccountHeadModel.class index 7e333a7880e244f77a5f0bd869489ffc97dd3291..2a13cedba1b6338151e88e4b21c0feaf27f5aff4 100644 GIT binary patch literal 4793 zcmb7`%X1V}6o*fT$-L5&OkRK>Afhr1!ieA#42A$^Fd>nNAPQ<{(o8zcOow>{f+7kk zK0w6>EZpeAjasEvk-|q6F5IY9Zgk;F7cN}r|6ut$ckaye+`3%_n{)cU&i&3g_uRfe z|M%@RBHBckqqL0XLv%7qZ8RUDo9MYHJx{0j>xD3#X8j_Imsp%(ahAo)EM8&pDvNV0 zUSsh(i#J%j$>KbV3oPDZ@ivQhLUb`i?}q3-gCgZ=_xPwgW#G2s+29^7XatkO|T++pXOVy!c@t2kBrij2C&%5?2JTCUE{<{i7l zwqjP()AUY*I$PRh>@jQQ?2K~~dl+f#!%eYw7AA_7^epUu2g%dsM0?JDM4nGRyPQ4m5N6gZBRDBbB!W5h&JH=DRt907Qv2+XlVq)6 zTD_WrrFvOmO1+bjJXIE%Y*rj2d4@QljT#Ku^=jnQHM-fFr#d5rW~H(<&k*NR`pXv+ zmn-K_>FQQzp}M-&Y3SoU$&ChDlrK9)nUhcuSjfGpz{G`zC!rmrUA7s|_NP zQnbpXyJ(Y1ceB{c&6O-}q17hc%3=-OX435}?%?KH9!;=V$0EsMJ&QY8Y@k&Jt-n4t z`NN4fD}HQp#?Ip2?-N~)o63m)j&rhhQFbJXJqtMQv# zMg}dXUi??#KYq4t?4Ho@P-r+QH2f4At_lrrg@(gI!)Kx4w$SigXgDu4{1+M_5E>yC z8X*=MQ5G7378$w+=jZ3nN?q6G>hBVSYd0tJ&jp#=&j z+8ZF->0!CJ1;kWA1^}|%2V@XYWsn^-ByD*?Oci8E3$l}T=|EyC$S^?CJ|Mdh zc?NlehBY8D6=YNklGcNCsv!FSlJNoABS9Y3f^@1N2ecp~G^&e8mkM$SAcuWG_M)&j zB4aeJiAa|UVrfAh(}ToS5E~#zd_eX|kc<{2u7WsPkO_Tix>b-OKwKY?$7O2vYg5y$ zf|Ru&2lQ3bqk^0O$h;586S8U!YOAJ41v#Y!c~TG3tAd;X$XOqdrzFTBEl95la!w0! zSP#;tf}97)1s{;7CCD>ckUkaUq88*?JxIR_atR=peLyS;GN}dWS3y41f@Jj|i&c=1 z0P?X9$dm-JwIGXCkWaKANAw^|RFF>r@|h1vPJ&EpL6)c>UuZ!befb7ekShRL@B!gJ zJYQ%t+VTymAm3;~j_M;4Rza=-D-@ zfc)eG!fzY~acNfC^8S4zpDWLRU$h{{^dM0cLa7ytTr!Eajj;h7>9LImRq}h7YrfEx2q~d~xAjAr;K(&;mg_agtP(a0- zKt&yW@I@bd(HWg_>)^P}_@XoVq7OdlgMW$R_jhuV+?+Xg23~&Wp6z!&zwMs$+kfBv zL`1{%Zj^4KT8NgS)Iqfft)kOWdX~=c*V!u^yLBo?-x0qh2%%_VykX~}rMXPF; z9jj1Dk7l!OtyCSit=w#5%T|K|b7vN9gA$Vq){>PjSfzY=wpw;ddCY~T%XzCbkuxan znVxjTWNh3j|}9dL=v(7;0~uy z*zXz?=8rk2i22|_yJ(e9V&M)u@099;pXcNA zA=A967l#sMNe_0lCuEyhG9!ievTb?W16}PK+s$m|a*Q43N#|(Q(}}T@JbezdC*315 zKRNX|dfq9lY!pKlC1FWpkdZuv70I-U zjFCK39MERjh3rNFa_E}Ftj$x9kz%VjS(|5y<0T7#%(lzc=kjuKNKGp{UezoUQ)@yIU){ zN>R{DR-tB3pD?H|x!3zw5Je2~Rk$Dxx|tHVAYnRg%?`Fqv@lMzuurrwQM9m9v@le( zuvN4$SG2HLv@lwEQjT4LG!=mERQv%uax^hL!bIQUjmIPQ~R$ zTWOorl@@)X&eS&)_yU_chyjBbCTwhhbT&b@(}>*M24bop+W@lN2jo$>fI%LkQK`!d zVyYmcT96$yrUQwoAiDvw#|LC5!p|VPXtxF=rh@F#g6z?QbgLjU06E|TGA=@Fo z$RRDrUfQSgNRJ9~6d=cZKqire?2#$juklEa3UXWvGOY)Rs~}l` zq)!F80FaA5AV(y~Q7uTH3UWyca!e1>uYz0#$Q2)uCnd;JT9AGf``~r|)eL(n)!yrW}NnPICH}aYC4ES9O;_5-7D##xI z`O^o4A6X2ts0E3tAb)8=PU%DAd2ZDoMt=k3A0H5Yb5lB3M1QJL*fW!kxJb=Ul{0WHPxjVZ%dpRS8mvhUWd+&Eoo4eos^XV5v zw2t17(lXi?rU#-_L;E6hG(A{P4{`f2i$_>I%HlB=k4NbVdXjrjv3Q!rGc2BE@f?f& zEDo@Ep2Z6+US#nSi1~4|xjFZ`5qHK;8WbN+xT*Mj zZZ4kUiTHvWPg!|8>sZNLe9+Fg`K`7!Gf`S_mO-_XyE3*xZNu}{f)!6%>Dl;1KI^1s z@mqMJFkSpPGM;tk?L>ZP#-J9T>aeR6L!*V%w4F7mX)I%B$L(y+O^;eB>|4(hlMZ*o zW7%0N%{w%1wbC=Wq8g7Q{fUHINUPn=fjKbP{VATP<{ESh(@7g#?fuE5o3QeZoAz-< zC*8c29M3ul92UCRPFdL<*!w(t)=7H=o6|GJUSz~g=jV$3Xs(dSBpo};C=D|uBMl82 zWco%qTqa}9+7r%h>~9R=3?7cUm``9i@H3b@+eth5jRr00?VEyi2jB*SnundVU9{1p zg*))QaDn8M1ILzECOfqKsA=gma}HU)tyTwyGn&pyXTmblUx= zDiuC6lBooC1e=xuIfBKdekkolcPkY10B?n&KG)=GS-@8+M?YVwJP5m`q-cSTmKQD1 z)TSDd9sbl|L-?}?D}2Lu=6{{TP>9O(5L{+YKF^iO$T}&nY z&~8byjo8PZ%Z*s>A4l`PL}#a!a~+DMekkh|fF>xED<3Cy6SS%(*fPEeWFVWMdZqz7 zfJ?(+r%6_ zWxJ^YwU#S^NoUhJ2CeyD-zJlerR4^ZNh@fjNyo7`kwq_yb+j@}@0j#1y=T&Cbb?8z z^Yj_C!K5=;oW;ZA`G**bRV-GsSVL<~igWKI?yYCNlUek!IEBTjw9=ry!=d#)yDgP^ zH#W`RNrO7nl;g%H)YsS9U99^}6-}-|sGAE`vS5#03(NIh;4hr2MA345?3a;2$51z3 z9IyzUAvJ6f)xs#M#XVIE`=}NsQZ25eT9`n!u!3q~2-U(Cs)adJ3yY{0)>SQxqgvQU zwXlwAVIbAQ@T!IFRSWa079LP7oPahCegpvIMvPvjCFl{2#14@W`;2O~9ikG1d}Yq^4NyA~matmV@fJb0OCwV2DCgOZC)D4b+Ko z4>iGX%?O`vxPJxwdm`dvHT5Hmwjg>oVTDEXPAsu8hK(+*cTnHyJ$gl_!)dIWHbO|)B_o#als<3I><#L z$VGIqWRX@K{1i3=5DWV;N~u7eZ+ zvJe1rwFh#I2-2a0>=HpN8Kgr8*#nT90zjrckOa*LS<|V5>=i+5cwQ)IojS-J0J$>& zWELM6&YC&VB3(MjJtBxBTck?|*$0pZ0zl?Hi|i0B(yfC$EP^Cui*)NCj|1e10Fabt zk+hh;Q61!I5yX|#H>!i|2grc{kc^kUJ4M%+I>?J6NLF@@se`-(;!V7*TjjQjruseOvX literal 5505 zcmb7`+jA5}6voelWH-B++%H^$qKKL-!U`(h5Df`PAU8>j0*X#HL$YCaC+=>7fLBly zP*hM0l+j#QtSAhuFNr=2bSYh3POI;nM4D-e7Z-&6{lA zV)HheV{DGId56urY)-IwkInmRK45c_&8Z-L7^IJablRX$X587)>x|k7gQ7h#CmEf{ zj7O8)5S@0SNh@oo<5nUQ?XoAG>^j>T9n5#Q)1dO9os+gf4LuXqv=vQQsj=u_HXTom z;ahNUY9#kLG>~>C>{zyY)Sx;~Xpf@;1ASA;5j$;AP5-2w9WO{48^$^ z>`#wbDITGEos}BRWIahsgxSs>>LM!-I3&mQm!s%Y9wKUtFa@IaAHMi zuo}+8V4O-ULeo5U6U3iF0$q>uiE^`E4X%HB>HJ`lTtIW%|Gz7-vg-7Oc|rNJ7G|`3C78*Vc+sBSZYY`3J%_w1PfVkCRu#f?h9-+= zIfOy;XE%h-`EnrT9_V@m=x4effqGkwqaA!+QsKb!k_wfelh1=X#AvBdhe)ld8VTXe z78b&rFzDf_hOA;P)grPqok};VkWjT4qcpH&!`wI)&y1C%XA84P$=JeF(uYP%YOTgN z-t?_TcW*tM_2f2hS|Pm=m@fy?ZqC;rpm5o7Qr94=q=A+3G#~?6g3^{M#0(U&AIXjU zuR>I@t-P&U9Vj=D?*%?Y9KdBBptEpIaMxmuH_>x5@xk>}LnFmYiw{!a-r|E)s08i& zb;dIlFIt|dSgYidnY-zDQqRT5lX|M5WbsZ64?0unn7ua67gu9J7j*$G^UO~5-bQ_!7xw?oy zw6lq@SmT92oemW zxUuK3D^WW|vrr=HjhrPTa-PaIouyebR32%ln4y5OL1inI4JjLrgubV$88TI^I#L&& zp_)kf4ArWJy06r9cfl^l86gT#IaN|ERZ%nQtyBZ4YH?U*17-nE$0FdgQwO$wEp~Yo zdYCyVx|{An&A_+SE^ri{fh!{4Qu&uClo3x9P>m}*ohu5RJE_aGAm)_wf&_GsRU*i}v`zvE=pd^B(&+=zjZI{b^&&`6 z2U#nEY>+{MI>>r}Z14f;aY1^iPf(;@2k8?*`e{H?q+SQv2#`S^ko$1#S&@yRB9%JG zun00JD^jV0YzD{{ACMtek^4oEkPfm{1R0h=LORF@Kw>^154a!?id)m5gKQH)HpyGl zpo2^RWV;W@W_N40h#-wRNJ<2GNCs)tLDB%p_<%g@f@~E*nskt95#$jWq)7+a1(4l7 zAdk8r7L5p5)2xF$C4$6gRLYuW9b^wc_WFR>>PKMEHc^ol9b}&fGA1k1qJta&$Uz^F zaaWPJsK{&`336N7hApD@5ZE z{(WmcM}zkn@P!C6MbmEQ;xnKX4;LNeYk+*?1Hw-#2H7Ek)aoGLi6D>5AhkNkIe?t^ z0pT|tgX|QyrcU3Q3nIuad22lHx7@?%2Y~$O1Hz9=2H7ow%+W!95<#AjLFVX+Tm;C^ zJ|IuJAWw-Pb9InkM3ARtkhwa@uK@YY2jm$S=ul$n!Ets}AxvK>qOo+2?}1pz`#^{{ZgaY8wCm diff --git a/src/main/webapp/WEB-INF/classes/com/jsh/service/materials/AccountHeadIService.class b/src/main/webapp/WEB-INF/classes/com/jsh/service/materials/AccountHeadIService.class index 6a4ddd3014aab7b4187b53515b5493f38ae4b9cd..187ede524485b30d5282f1b77200de90da460dfa 100644 GIT binary patch delta 191 zcmaFJe2G=~)W2Q(7#J7~8AR9_1lSn_*%^c;3cE52PmGKe;7QBOOL5G}@y*Xmtz={f zoG7a->6urOnx0x@?UR*QmZ+bTn3t{}TvC*omp*a6IAh^NS@DVWI=B^WoG;4g&cwpV sz{0@Fz{J1?w3&s0k%66o1IS`x-~`HWF>qs%;Q@+4)bKL!fz|Q@04_c!2><{9 delta 61 zcmcb_`jA=p)W2Q(7#J7~83frGc-a~F*ctdI3cE52OpJ`3+{^fnk#TYllavqx69WfO N6%zv&12>rF0RY#%3vK`a diff --git a/src/main/webapp/WEB-INF/classes/com/jsh/service/materials/AccountHeadService.class b/src/main/webapp/WEB-INF/classes/com/jsh/service/materials/AccountHeadService.class index 41dea364a06fd117a919f89232471185c1813e40..f13b3a422b7772fb9ae4a51d311f36837568826c 100644 GIT binary patch delta 756 zcmaJ-K~EDw7=1I{?b7bRB1LMU0tyIj3l*$NVq!u#k;tLpW@18l1o7q}=FdlZkZ@zu+eecb=`+Lm4fB1C^U>%!jI9N>~i8Ti$7jLkx zj|~TJ9h4os>n)X~cprU{m2vg05!SYv&E3N=I1{KuUu8Br7b>?Cc7l4){`mQO^`u&A zR>OK}uhVXXb^gt6q<hA@9=0#@g&6|fu})>w`xy#0UC=%|O){Lo2tTQTOl-3!kLM_FC03!Q{xw98jl>wwq#3&K z*lVb!jpGTczyvZpHTe_Kk~QfUt{@-TX)~Q5r<*YnQ!%VBq2;v~#>FI_@}Cx4<6SSZ zGDuvo4jai08L|2*QwEbIhk=nW8vCpX&Xs=&St#BhD%z>84isCOW%41q#JgXz=R5azpE9mZgct8#%~?0FZS>Fu5sw}g*e@Cn r6zrLNh9n~jD1t^n6h8@qR=MU5oGm}yl zdB5rI*Dqhqr)={5^Zo(g2J;j#CJ7>(DV%4xz@1`MZ zYn45R>5{`+5jc$p=74iuyg-)IH<(47Jlcc2r2+3AI<1k%{W;R;kv Z^f6#H)hI9Tr9gE(UG}CI&X36ImD-8Q2*(fGj2k9w3IWcp3P>BK!bd88x2( delta 82 zcmaFEdXriB)W2Q(7#J7~83frGc-a~F*ctdI3cE52OpJ`4yq58YE+Y#g0}BHy0}}%q bP#FsYBLh1F2av_YzzM_<78e6IScC@vq>c)# diff --git a/src/main/webapp/WEB-INF/classes/com/jsh/service/materials/DepotHeadService.class b/src/main/webapp/WEB-INF/classes/com/jsh/service/materials/DepotHeadService.class index ebc9f180270fb060aad527ff3dc138d353f8747c..efb62b7ce19946fefea6b16b76a948831a215b79 100644 GIT binary patch literal 1891 zcmb7ETTc^F5dKcP?Mhk2Qn?fbxrmk)SW)qkk|qckOX?*l^6a)fmL=QWW_L^A(fEfn z(HMO22l%6mbN1F^q3FY&GdpMI`@Wg8v%h}-_z7SQ&r*=FI)o%t8TW_D^FS;QWjvCx zF5@wS(%@~&eaW@Pwq`LbR_azuJ#-G#hGwZP&E>YP8IHOgMwPcW-xL{=8@j2xC5Cuz zX`eybvKpLWq@tVrb*EM1_MTQV$TM28>YA~y5emHrPRTvc9fswI%i;EsUgziWRsAEP z9C5fC$?(MHauLEHwL;*vCU z&L%P>TH3Kr*rWXz4C80pe9{hEy?#F4rG=z+j_bVb>Xzxqc*3xIK}DAU^=lRNDxyo9 zhVjZW`3Xb)0_@&yl}(p7x!vmu8rVG7SE^ScXD)Gyo^8hanqA zd*ih097NwW!$NpA;OBuk`gzKr8KoyCYNj7+f^2F5tyk$yrJV_H{yW$gGGe$!YtnP3 zFhaHn6=~Ozrk!RO8CpehiK1h)C-a4Gh;_45o;OW7qaMPz9~B@7bRmU4S=_)Foe8W} zdKWxW2Jz3d_v)DJ(IEvW<6g`J<OCE{#Ir#kZWYY&iNTP;MR9TYtw9mhim9mLb zB$9n1=81H{6H)RLA`$6GL>h~@>oqQodn88`mPU>&$+MQoO7ut+ndeE&6NWFgfMv>z GVdW3P&d#;~ delta 460 zcmYjNOHRWu6dXGrlf(qtLTLlEh0+2}X~hLN0TSW{>^Vdw_N*-KK_x0w794;zH{b%C z05NtV=pygunR)Z_l|N*okDs@90GF7hh%rhKVXSbP;SA>rMxj)gEX-Jn3wtYX>}T+p zrN}fkkO&m^J18=Rsm2~U0>-F#ZFT|;G#MTFifG9kn{o;H&rbcc!5ijHFVU`GwS<#*UIe|gu){YeHf8UY zhAjlo% k`28CDIN 编辑  '; @@ -428,6 +428,12 @@ $("#phonenum").val("").focus(); return; } + var beginNeedGet = $.trim($("#BeginNeedGet").val()); + var beginNeedPay = $.trim($("#BeginNeedPay").val()); + if(beginNeedGet && beginNeedPay) { + $.messager.alert('提示','期初应收和期初应付不能同时输入','info'); + return; + } $('#supplierFM').form('submit',{ url: url, @@ -467,11 +473,9 @@ email : supplierInfo[4], BeginNeedGet : supplierInfo[5], BeginNeedPay : supplierInfo[6], - AllNeedGet : supplierInfo[7], - AllNeedPay : supplierInfo[8], - description : supplierInfo[10], - type : supplierInfo[11], - enabled : supplierInfo[12], + description : supplierInfo[8], + type : supplierInfo[9], + enabled : supplierInfo[10], clientIp:'<%=clientIp %>' }; orgSupplier = supplierInfo[1]; @@ -482,6 +486,54 @@ //焦点在名称输入框==定焦在输入文字后面 $("#supplier").val("").focus().val(supplierInfo[1]); url = '<%=path %>/supplier/update.action?supplierID=' + supplierInfo[0]; + + //显示累计应收和累计应付 + $.ajax({ + type:"post", + url: "<%=path %>/depotHead/findTotalPay.action", + dataType: "json", + async: false, + data: ({ + supplierId: supplierInfo[0] + }), + success: function(res){ + if(res) { + var moneyA = res.getAllMoney.toFixed(2)-0; + $.ajax({ + type:"post", + url: "<%=path %>/accountHead/findTotalPay.action", + dataType: "json", + async: false, + data: ({ + supplierId: supplierInfo[0] + }), + success: function(res){ + if(res) { + var moneyB = res.getAllMoney.toFixed(2)-0; + var money = moneyA+moneyB; + var moneyBeginNeedGet = $("#BeginNeedGet").val()-0; //期初应收 + var moneyBeginNeedPay = $("#BeginNeedPay").val()-0; //期初应付 + money = money + moneyBeginNeedPay - moneyBeginNeedGet; + if(money>0) { + $("#AllNeedPay").val(money); //累计应付 + } + else { + $("#AllNeedGet").val(-money); //累计应收 + } + } + }, + error: function(){ + $.messager.alert('提示','网络异常请稍后再试！','error'); + return; + } + }); + } + }, + error: function(){ + $.messager.alert('提示','网络异常请稍后再试！','error'); + return; + } + }) }