From cdd06c3abf48de66fd91d05323899223e3156d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 5 Dec 2017 23:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E7=9A=84=E6=A0=8F?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/action/materials/DepotHeadAction.java | 9 ++-- .../com/jsh/dao/materials/DepotHeadDAO.java | 44 +++++++++++++++---- .../com/jsh/dao/materials/DepotHeadIDAO.java | 4 +- .../service/materials/DepotHeadIService.java | 4 +- .../service/materials/DepotHeadService.java | 8 ++-- .../webapp/pages/reports/customer_account.jsp | 2 +- src/main/webapp/pages/reports/in_detail.jsp | 24 +++++++++- .../pages/reports/in_material_count.jsp | 24 +++++++++- src/main/webapp/pages/reports/out_detail.jsp | 23 +++++++++- .../pages/reports/out_material_count.jsp | 28 ++++++++++-- .../webapp/pages/reports/vendor_account.jsp | 2 +- 11 files changed, 143 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java index 10e98f4c..abb2ae15 100644 --- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java +++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java @@ -640,11 +640,12 @@ public class DepotHeadAction extends BaseAction pageUtil.setCurPage(model.getPageNo()); Long pid =model.getProjectId(); String dids =model.getDepotIds(); + Long oId = model.getOrganId(); String beginTime = model.getBeginTime(); String endTime = model.getEndTime(); String type = model.getType(); try{ - depotHeadService.findInDetail(pageUtil,beginTime,endTime,type,pid,dids); + depotHeadService.findInDetail(pageUtil,beginTime,endTime,type,pid,dids,oId); List dataList = pageUtil.getPageList(); JSONObject outer = new JSONObject(); outer.put("total", pageUtil.getTotalCount()); @@ -688,11 +689,12 @@ public class DepotHeadAction extends BaseAction pageUtil.setCurPage(model.getPageNo()); Long pid =model.getProjectId(); String dids =model.getDepotIds(); + Long oId = model.getOrganId(); String beginTime = model.getBeginTime(); String endTime = model.getEndTime(); String type = model.getType(); try{ - depotHeadService.findInOutMaterialCount(pageUtil, beginTime, endTime, type, pid, dids); + depotHeadService.findInOutMaterialCount(pageUtil, beginTime, endTime, type, pid, dids, oId); List dataList = pageUtil.getPageList(); JSONObject outer = new JSONObject(); outer.put("total", pageUtil.getTotalCount()); @@ -707,7 +709,8 @@ public class DepotHeadAction extends BaseAction item.put("mName", arr[1]); //商品名称 item.put("Model", arr[2]); //商品型号 item.put("categoryName", arr[3]); //商品类型 - item.put("priceSum", arr[4]); //金额 + item.put("numSum", arr[4]); //数量 + item.put("priceSum", 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 3043a1e4..1978c243 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java @@ -52,7 +52,7 @@ public class DepotHeadDAO extends BaseDAO implements DepotHeadIDAO { } @SuppressWarnings("unchecked") - public void findInDetail(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException { + public void findInDetail(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids,Long oId) throws JshException { StringBuffer queryString = new StringBuffer(); queryString.append("select dh.Number,m.`name`,m.Model,di.UnitPrice,di.OperNumber,di.AllPrice,s.supplier,d.dName,date_format(dh.OperTime, '%Y-%m-%d') " + "from jsh_depothead dh inner join jsh_depotitem di on di.HeaderId=dh.id " + @@ -60,6 +60,9 @@ public class DepotHeadDAO extends BaseDAO implements DepotHeadIDAO { "inner join jsh_supplier s on s.id=dh.OrganId " + "inner join (select id,name as dName from jsh_depot) d on d.id=di.DepotId " + "where dh.OperTime >='"+ beginTime +"' and dh.OperTime <='"+ endTime +"' "); + if(oId!=null){ + queryString.append(" and dh.OrganId = "+ oId ); + } if(pid!=null){ queryString.append(" and di.DepotId=" + pid ); } @@ -84,21 +87,44 @@ public class DepotHeadDAO extends BaseDAO implements DepotHeadIDAO { } @SuppressWarnings("unchecked") - public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException { + public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids,Long oId) throws JshException { StringBuffer queryString = new StringBuffer(); - queryString.append("select di.MaterialId, m.mName,m.Model,m.categoryName, "+ - " (select sum(jsh_depotitem.AllPrice) priceSum from jsh_depothead INNER JOIN jsh_depotitem " + - "on jsh_depothead.id=jsh_depotitem.HeaderId where jsh_depotitem.MaterialId=di.MaterialId " + - " and jsh_depothead.type='"+ type +"' and dh.OperTime >='"+ beginTime +"' and dh.OperTime <='"+ endTime +"'"); + queryString.append("select di.MaterialId, m.mName,m.Model,m.categoryName, "); + //数量汇总 + queryString.append(" (select sum(jdi.BasicNumber) numSum from jsh_depothead jdh INNER JOIN jsh_depotitem jdi " + + "on jdh.id=jdi.HeaderId where jdi.MaterialId=di.MaterialId " + + " and jdh.type='"+ type +"' and jdh.OperTime >='"+ beginTime +"' and jdh.OperTime <='"+ endTime +"'"); + if(oId!=null){ + queryString.append(" and jdh.OrganId = "+ oId ); + } if(pid!=null){ - queryString.append(" and di.DepotId=" + pid ); + queryString.append(" and jdi.DepotId=" + pid ); } else { - queryString.append(" and di.DepotId in (" + dids + ")" ); + queryString.append(" and jdi.DepotId in (" + dids + ")" ); } - queryString.append(" ) priceSum from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId " + + queryString.append(" ) numSum, "); + //金额汇总 + queryString.append(" (select sum(jdi.AllPrice) priceSum from jsh_depothead jdh INNER JOIN jsh_depotitem jdi " + + "on jdh.id=jdi.HeaderId where jdi.MaterialId=di.MaterialId " + + " and jdh.type='"+ type +"' and jdh.OperTime >='"+ beginTime +"' and jdh.OperTime <='"+ endTime +"'"); + if(oId!=null){ + queryString.append(" and jdh.OrganId = "+ oId ); + } + if(pid!=null){ + queryString.append(" and jdi.DepotId=" + pid ); + } + else { + queryString.append(" and jdi.DepotId in (" + dids + ")" ); + } + queryString.append(" ) priceSum "); + + queryString.append(" from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId " + " INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_materialcategory.`Name` categoryName from jsh_material INNER JOIN jsh_materialcategory on jsh_material.CategoryId=jsh_materialcategory.Id) m " + " on m.Id=di.MaterialId where dh.type='"+ type +"' and dh.OperTime >='"+ beginTime +"' and dh.OperTime <='"+ endTime +"' "); + if(oId!=null){ + queryString.append(" and dh.OrganId = "+ oId ); + } if(pid!=null){ queryString.append(" and di.DepotId=" + pid ); } diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java index b4ffd3db..8a92be80 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java @@ -17,9 +17,9 @@ public interface DepotHeadIDAO extends BaseIDAO public void batchSetStatus(Boolean status,String depotHeadIDs); - public void findInDetail(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException; + public void findInDetail(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids,Long oId) throws JshException; - public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException; + public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids, Long oId) throws JshException; public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId) 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 addcda8f..df15c963 100644 --- a/src/main/java/com/jsh/service/materials/DepotHeadIService.java +++ b/src/main/java/com/jsh/service/materials/DepotHeadIService.java @@ -17,9 +17,9 @@ public interface DepotHeadIService extends BaseIService public void batchSetStatus(Boolean status,String depotHeadIDs); - public void findInDetail(PageUtil pageUtil,String beginTime,String endTime, String type, Long pid,String dids)throws JshException; + public void findInDetail(PageUtil pageUtil,String beginTime,String endTime, String type, Long pid,String dids,Long oId)throws JshException; - public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime, String type, Long pid,String dids)throws JshException; + public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime, String type, Long pid,String dids,Long oId)throws JshException; public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId)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 00488327..12eac750 100644 --- a/src/main/java/com/jsh/service/materials/DepotHeadService.java +++ b/src/main/java/com/jsh/service/materials/DepotHeadService.java @@ -38,12 +38,12 @@ public class DepotHeadService extends BaseService implements DepotHea depotHeadDao.batchSetStatus(status, depotHeadIDs); } - public void findInDetail(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException { - depotHeadDao.findInDetail(pageUtil,beginTime,endTime,type,pid,dids); + public void findInDetail(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids,Long oId) throws JshException { + depotHeadDao.findInDetail(pageUtil,beginTime,endTime,type,pid,dids,oId); } - public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException { - depotHeadDao.findInOutMaterialCount(pageUtil,beginTime,endTime,type,pid,dids); + public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids,Long oId) throws JshException { + depotHeadDao.findInOutMaterialCount(pageUtil,beginTime,endTime,type,pid,dids,oId); } public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId) throws JshException { diff --git a/src/main/webapp/pages/reports/customer_account.jsp b/src/main/webapp/pages/reports/customer_account.jsp index e32e9135..3cd71684 100644 --- a/src/main/webapp/pages/reports/customer_account.jsp +++ b/src/main/webapp/pages/reports/customer_account.jsp @@ -30,7 +30,7 @@
- + diff --git a/src/main/webapp/pages/reports/in_detail.jsp b/src/main/webapp/pages/reports/in_detail.jsp index 1df19d6e..bab0495a 100644 --- a/src/main/webapp/pages/reports/in_detail.jsp +++ b/src/main/webapp/pages/reports/in_detail.jsp @@ -30,6 +30,11 @@
单位名称：客户：
+ + +
供应商： + +   仓库： @@ -62,6 +67,8 @@ var depotList = null; var depotID = null; var depotString = ""; //仓库列表 + var path = "<%=path %>"; + var supUrl = path + "/supplier/findBySelect_sup.action"; //供应商接口 //初始化界面 $(function() { @@ -71,6 +78,7 @@ $("#searchEndTime").val(thisDateTime); var userBusinessList=null; var userdepot=null; + initSupplier(); //初始化供应商信息 initSystemData_UB(); initSelectInfo_UB(); initSystemData_depot(); @@ -79,9 +87,20 @@ ininPager(); search(); print(); - }); - + }); + //初始化供应商 + function initSupplier(){ + $('#OrganId').combobox({ + url: supUrl, + valueField:'id', + textField:'supplier', + filter: function(q, row){ + var opts = $(this).combobox('options'); + return row[opts.textField].indexOf(q) >-1; + } + }); + } //初始化系统基础信息 function initSystemData_UB(){ @@ -290,6 +309,7 @@ data: ({ pageNo:pageNo, pageSize:pageSize, + OrganId: $('#OrganId').combobox('getValue'), ProjectId: $.trim($("#searchProjectId").val()), DepotIds: depotString, BeginTime: $("#searchBeginTime").val(), diff --git a/src/main/webapp/pages/reports/in_material_count.jsp b/src/main/webapp/pages/reports/in_material_count.jsp index b2a2679a..f6f1c458 100644 --- a/src/main/webapp/pages/reports/in_material_count.jsp +++ b/src/main/webapp/pages/reports/in_material_count.jsp @@ -30,6 +30,11 @@
+ + +
供应商： + +   仓库： @@ -62,6 +67,8 @@ var depotList = null; var depotID = null; var depotString = ""; //仓库列表 + var path = "<%=path %>"; + var supUrl = path + "/supplier/findBySelect_sup.action"; //供应商接口 //初始化界面 $(function() { @@ -71,6 +78,7 @@ $("#searchEndTime").val(thisDateTime); var userBusinessList=null; var userdepot=null; + initSupplier(); //初始化供应商信息 initSystemData_UB(); initSelectInfo_UB(); initSystemData_depot(); @@ -79,8 +87,20 @@ ininPager(); search(); print(); - }); + }); + //初始化供应商 + function initSupplier(){ + $('#OrganId').combobox({ + url: supUrl, + valueField:'id', + textField:'supplier', + filter: function(q, row){ + var opts = $(this).combobox('options'); + return row[opts.textField].indexOf(q) >-1; + } + }); + } //初始化系统基础信息 function initSystemData_UB(){ @@ -193,6 +213,7 @@ { title: '商品名称',field: 'mName',width:150}, { title: '商品型号',field: 'Model',width:150}, { title: '商品类型',field: 'categoryName',width:120}, + { title: '入库数量',field: 'numSum',width:120}, { title: '入库金额',field: 'priceSum',width:120} ]], onLoadError:function() @@ -284,6 +305,7 @@ data: ({ pageNo:pageNo, pageSize:pageSize, + OrganId: $('#OrganId').combobox('getValue'), ProjectId: $.trim($("#searchProjectId").val()), DepotIds: depotString, BeginTime: $("#searchBeginTime").val(), diff --git a/src/main/webapp/pages/reports/out_detail.jsp b/src/main/webapp/pages/reports/out_detail.jsp index c29fbfca..52ec3243 100644 --- a/src/main/webapp/pages/reports/out_detail.jsp +++ b/src/main/webapp/pages/reports/out_detail.jsp @@ -30,6 +30,11 @@
+ + +
客户： + +   仓库： @@ -62,6 +67,8 @@ var depotList = null; var depotID = null; var depotString = ""; //仓库列表 + var path = "<%=path %>"; + var cusUrl = path + "/supplier/findBySelect_cus.action?UBType=UserCustomer&UBKeyId=" + uid; //客户接口 //初始化界面 $(function() { @@ -71,6 +78,7 @@ $("#searchEndTime").val(thisDateTime); var userBusinessList=null; var userdepot=null; + initSupplier(); //初始化客户信息 initSystemData_UB(); initSelectInfo_UB(); initSystemData_depot(); @@ -81,6 +89,18 @@ print(); }); + //初始化客户 + function initSupplier(){ + $('#OrganId').combobox({ + url: cusUrl, + valueField:'id', + textField:'supplier', + filter: function(q, row){ + var opts = $(this).combobox('options'); + return row[opts.textField].indexOf(q) >-1; + } + }); + } //初始化系统基础信息 function initSystemData_UB(){ @@ -196,7 +216,7 @@ { title: '单价',field: 'unitPrice',width:60}, { title: '出库数量',field: 'operNumber',width:60}, { title: '金额',field: 'allPrice',width:60}, - { title: '供应商',field: 'supplierName',width:200}, + { title: '客户',field: 'supplierName',width:200}, { title: '仓库',field: 'depotName',width:120}, { title: '出库日期',field: 'operTime',width:80}, ]], @@ -289,6 +309,7 @@ data: ({ pageNo:pageNo, pageSize:pageSize, + OrganId: $('#OrganId').combobox('getValue'), ProjectId: $.trim($("#searchProjectId").val()), DepotIds: depotString, BeginTime: $("#searchBeginTime").val(), diff --git a/src/main/webapp/pages/reports/out_material_count.jsp b/src/main/webapp/pages/reports/out_material_count.jsp index 7b97541d..81fd023f 100644 --- a/src/main/webapp/pages/reports/out_material_count.jsp +++ b/src/main/webapp/pages/reports/out_material_count.jsp @@ -22,7 +22,7 @@ @@ -30,6 +30,11 @@
+ + +
客户： + +   仓库： @@ -62,6 +67,8 @@ var depotList = null; var depotID = null; var depotString = ""; //仓库列表 + var path = "<%=path %>"; + var cusUrl = path + "/supplier/findBySelect_cus.action?UBType=UserCustomer&UBKeyId=" + uid; //客户接口 //初始化界面 $(function() { @@ -71,6 +78,7 @@ $("#searchEndTime").val(thisDateTime); var userBusinessList=null; var userdepot=null; + initSupplier(); //初始化客户信息 initSystemData_UB(); initSelectInfo_UB(); initSystemData_depot(); @@ -79,8 +87,20 @@ ininPager(); search(); print(); - }); + }); + //初始化客户 + function initSupplier(){ + $('#OrganId').combobox({ + url: cusUrl, + valueField:'id', + textField:'supplier', + filter: function(q, row){ + var opts = $(this).combobox('options'); + return row[opts.textField].indexOf(q) >-1; + } + }); + } //初始化系统基础信息 function initSystemData_UB(){ @@ -88,7 +108,7 @@ type:"post", url: "<%=path %>/userBusiness/getBasicData.action", data: ({ - KeyId:kid, + KeyId:uid, Type:"UserDepot" }), //设置为同步 @@ -193,6 +213,7 @@ { title: '商品名称',field: 'mName',width:150}, { title: '商品型号',field: 'Model',width:150}, { title: '商品类型',field: 'categoryName',width:120}, + { title: '出库数量',field: 'numSum',width:120}, { title: '出库金额',field: 'priceSum',width:120} ]], onLoadError:function() @@ -284,6 +305,7 @@ data: ({ pageNo:pageNo, pageSize:pageSize, + OrganId: $('#OrganId').combobox('getValue'), ProjectId: $.trim($("#searchProjectId").val()), DepotIds: depotString, BeginTime: $("#searchBeginTime").val(), diff --git a/src/main/webapp/pages/reports/vendor_account.jsp b/src/main/webapp/pages/reports/vendor_account.jsp index 9735640d..f72020f0 100644 --- a/src/main/webapp/pages/reports/vendor_account.jsp +++ b/src/main/webapp/pages/reports/vendor_account.jsp @@ -30,7 +30,7 @@
- +
单位名称：供应商：