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 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 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 @@ + +