From 612b691c288616b2cdb8e8d0701cfe940c73acee 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, 18 Mar 2018 21:16:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=82=B9=E5=87=BB=E5=90=8E=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=88=E7=BB=AD=E5=A2=9E=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/action/materials/DepotHeadAction.java    | 1 +
 src/main/java/com/jsh/dao/materials/DepotHeadDAO.java     | 3 ++-
 src/main/webapp/pages/reports/in_detail.jsp               | 8 +++++++-
 src/main/webapp/pages/reports/out_detail.jsp              | 8 +++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java
index b83768f3..0f908405 100644
--- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java
+++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java
@@ -722,6 +722,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
 					item.put("supplierName", arr[6]); //供应商
 					item.put("depotName", arr[7]); //仓库
 					item.put("operTime", arr[8]); //入库出库日期
+					item.put("type", arr[9]); //入库出库日期
 					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 1978c243..8e875f4b 100644
--- a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java
+++ b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java
@@ -54,7 +54,8 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
     @SuppressWarnings("unchecked")
     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') " +
+        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'), concat(dh.SubType,dh.Type) as newType " +
                 "from jsh_depothead dh inner join jsh_depotitem di on di.HeaderId=dh.id " +
                 "inner join jsh_material m on m.id=di.MaterialId " +
                 "inner join jsh_supplier s on s.id=dh.OrganId " +
diff --git a/src/main/webapp/pages/reports/in_detail.jsp b/src/main/webapp/pages/reports/in_detail.jsp
index bab0495a..d2b6fad5 100644
--- a/src/main/webapp/pages/reports/in_detail.jsp
+++ b/src/main/webapp/pages/reports/in_detail.jsp
@@ -19,6 +19,7 @@
 		<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
 		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script type="text/javascript" src="<%=path %>/js/common/outlook_in.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
 		<script>
@@ -210,7 +211,12 @@
 					pageSize: 10,
 					pageList: [10,50,100],
 					columns:[[
-			          	{ title: '单据编号',field: 'number',width:140},
+			          	{ title: '单据编号',field: 'number',width:140,
+                            formatter: function (value, row) {
+                                return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.jsp?n=" + row.number + "&type=" + row.type + "','')\">"
+                                    + row.number + "</a>";
+                            }
+                        },
 						{ title: '商品名称',field: 'materialName',width:120},
 						{ title: '商品型号',field: 'materialModel',width:100},
 						{ title: '单价',field: 'unitPrice',width:60},
diff --git a/src/main/webapp/pages/reports/out_detail.jsp b/src/main/webapp/pages/reports/out_detail.jsp
index 52ec3243..16131905 100644
--- a/src/main/webapp/pages/reports/out_detail.jsp
+++ b/src/main/webapp/pages/reports/out_detail.jsp
@@ -19,6 +19,7 @@
 		<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
 		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script type="text/javascript" src="<%=path %>/js/common/outlook_in.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
 		<script>
@@ -210,7 +211,12 @@
 				pageSize: 10,
 				pageList: [10,50,100],
 				columns:[[
-					{ title: '单据编号',field: 'number',width:140},
+					{ title: '单据编号',field: 'number',width:140,
+                        formatter: function (value, row) {
+                            return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.jsp?n=" + row.number + "&type=" + row.type + "','')\">"
+                                + row.number + "</a>";
+                        }
+                    },
 					{ title: '商品名称',field: 'materialName',width:120},
 					{ title: '商品型号',field: 'materialModel',width:100},
 					{ title: '单价',field: 'unitPrice',width:60},