From f432351937d3fc72ac53515e14688ede2217df73 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, 29 Oct 2017 23:46:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0-=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/action/materials/DepotHeadAction.java | 12 +- .../com/jsh/dao/materials/DepotHeadDAO.java | 6 +- .../com/jsh/dao/materials/DepotHeadIDAO.java | 2 +- .../service/materials/DepotHeadIService.java | 2 +- .../service/materials/DepotHeadService.java | 4 +- ...nt_of_account.jsp => customer_account.jsp} | 7 +- .../webapp/pages/reports/vendor_account.jsp | 362 ++++++++++++++++++ 7 files changed, 383 insertions(+), 12 deletions(-) rename src/main/webapp/pages/reports/{statement_of_account.jsp => customer_account.jsp} (98%) create mode 100644 src/main/webapp/pages/reports/vendor_account.jsp diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java index 0dca38f3..60e487ca 100644 --- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java +++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java @@ -749,8 +749,16 @@ public class DepotHeadAction extends BaseAction String beginTime = model.getBeginTime(); String endTime = model.getEndTime(); Long organId = model.getOrganId(); + String supType = model.getSupType(); //单位类型：客户、供应商 + int j = 1; + if(supType.equals("客户")){ //客户 + j = 1; + } + else if(supType.equals("供应商")){ //供应商 + j = -1; + } try{ - depotHeadService.findStatementAccount(pageUtil, beginTime, endTime, organId); + depotHeadService.findStatementAccount(pageUtil, beginTime, endTime, organId, supType); List dataList = pageUtil.getPageList(); JSONObject outer = new JSONObject(); outer.put("total", pageUtil.getTotalCount()); @@ -805,7 +813,7 @@ public class DepotHeadAction extends BaseAction } item.put("discountLastMoney", p1); //金额 item.put("changeAmount", p2); //金额 - item.put("allPrice", String .format("%.2f",allPrice)); //计算后的金额 + item.put("allPrice", String .format("%.2f",allPrice*j)); //计算后的金额 item.put("supplierName", arr[4]); //供应商 item.put("operTime", arr[5]); //入库出库日期 dataArray.add(item); diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java index 6890f389..7b8acc38 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java @@ -129,17 +129,17 @@ public class DepotHeadDAO extends BaseDAO implements DepotHeadIDAO { } @SuppressWarnings("unchecked") - public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime,Long organId) throws JshException { + public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime,Long organId,String supType) throws JshException { StringBuffer queryString = new StringBuffer(); queryString.append("select dh.Number,concat(dh.SubType,dh.Type) as newType,dh.DiscountLastMoney,dh.ChangeAmount,s.supplier,date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depothead dh " + - "inner join jsh_supplier s on s.id=dh.OrganId where s.type!='会员' and dh.SubType!='其它' " + + "inner join jsh_supplier s on s.id=dh.OrganId where s.type='" + supType + "' and dh.SubType!='其它' " + "and dh.OperTime >='"+ beginTime +"' and dh.OperTime<='"+ endTime +"' "); if(organId!=null && !organId.equals("")) { queryString.append(" and dh.OrganId='"+ organId +"' "); } queryString.append("UNION ALL " + "select ah.BillNo,ah.Type as newType,ah.TotalPrice,ah.ChangeAmount,s.supplier,date_format(ah.BillTime,'%Y-%m-%d %H:%i:%S') as oTime from jsh_accounthead ah " + - "inner join jsh_supplier s on s.id=ah.OrganId where s.type!='会员' " + + "inner join jsh_supplier s on s.id=ah.OrganId where s.type='" + supType + "' " + "and ah.BillTime >='"+ beginTime +"' and ah.BillTime<='"+ endTime +"' "); if(organId!=null && !organId.equals("")) { queryString.append(" and ah.OrganId='"+ organId +"' "); diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java index 5728437f..80bedc9d 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java @@ -23,7 +23,7 @@ public interface DepotHeadIDAO extends BaseIDAO public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId) throws JshException; - public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime,Long organId) throws JshException; + public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime,Long organId, String supType) throws JshException; public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam) throws JshException; diff --git a/src/main/java/com/jsh/service/materials/DepotHeadIService.java b/src/main/java/com/jsh/service/materials/DepotHeadIService.java index ecbe6914..18c496d4 100644 --- a/src/main/java/com/jsh/service/materials/DepotHeadIService.java +++ b/src/main/java/com/jsh/service/materials/DepotHeadIService.java @@ -23,7 +23,7 @@ public interface DepotHeadIService extends BaseIService public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId)throws JshException; - public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime, Long organId)throws JshException; + public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime, Long organId, String supType)throws JshException; public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam)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 350efcb4..5f13d86d 100644 --- a/src/main/java/com/jsh/service/materials/DepotHeadService.java +++ b/src/main/java/com/jsh/service/materials/DepotHeadService.java @@ -50,8 +50,8 @@ public class DepotHeadService extends BaseService implements DepotHea depotHeadDao.findMaterialsListByHeaderId(pageUtil, headerId); } - public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime,Long organId) throws JshException { - depotHeadDao.findStatementAccount(pageUtil, beginTime, endTime, organId); + public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime,Long organId, String supType) throws JshException { + depotHeadDao.findStatementAccount(pageUtil, beginTime, endTime, organId, supType); } public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam) throws JshException { diff --git a/src/main/webapp/pages/reports/statement_of_account.jsp b/src/main/webapp/pages/reports/customer_account.jsp similarity index 98% rename from src/main/webapp/pages/reports/statement_of_account.jsp rename to src/main/webapp/pages/reports/customer_account.jsp index c43d6899..e32e9135 100644 --- a/src/main/webapp/pages/reports/statement_of_account.jsp +++ b/src/main/webapp/pages/reports/customer_account.jsp @@ -32,7 +32,7 @@ 单位名称： - +   单据日期： @@ -73,7 +73,7 @@ var thisDateTime = getNowFormatDateTime(); //当前时间 $("#searchBeginTime").val(thisDate + "-01 00:00:00"); $("#searchEndTime").val(thisDateTime); - initSupplier(); //初始化供应商、客户信息 + initSupplier(); //初始化客户信息 initTableData(); ininPager(); search(); @@ -210,7 +210,8 @@ pageSize:pageSize, BeginTime: $("#searchBeginTime").val(), EndTime: $("#searchEndTime").val(), - OrganId: $('#OrganId').combobox('getValue') + OrganId: $('#OrganId').combobox('getValue'), + supType: "客户" }), success: function (res) { if(res){ diff --git a/src/main/webapp/pages/reports/vendor_account.jsp b/src/main/webapp/pages/reports/vendor_account.jsp new file mode 100644 index 00000000..9735640d --- /dev/null +++ b/src/main/webapp/pages/reports/vendor_account.jsp @@ -0,0 +1,362 @@ +<%@page import="com.jsh.util.Tools"%> +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<% + String path = request.getContextPath(); + String clientIp = Tools.getLocalIp(request); +%> + + + + 供应商对账 + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
单位名称： + +  单据日期： + + - + +   + 查询 +    + 打印 +   + 期初应付：0   + 期末应付：0 +
+
+ + +
+
+
+ + + + \ No newline at end of file