Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
===================================================================
diff -u -r39400 -r39659
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 39400)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 39659)
@@ -2,14 +2,16 @@
 <%@page import="java.util.Collections"%>
 <%@page import="org.apache.velocity.runtime.directive.Foreach"%>
 <%@page import="net.sf.json.JSONArray"%>
-<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="java.text.SimpleDateFormat,java.text.SimpleDateFormat,java.util.Date"%>
 <%@page import="com.forgon.disinfectsystem.entity.tousseitem.TousseItem"%>
 <%@page import="java.util.Calendar"%>
 <%@page import="com.forgon.disinfectsystem.packing.service.PackingManager,com.forgon.tools.SpringBeanManger"%>
 <%@page import="com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan"%>
 <%@page import="com.forgon.disinfectsystem.entity.invoicemanager.Invoice"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
+<%@ page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager" %>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
@@ -81,6 +83,11 @@
 		SterilisationManager sterilisationManager = (SterilisationManager)SpringBeanManger.getBean("sterilisationManager");
 		List<Sterilisation> allSterilisationList = sterilisationManager.getAllSterilisation();
 		
+		request.setAttribute("newDate", sdf.format(new Date()));
+
+		SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+		SupplyRoomConfig firstSupplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig();
+		
 		JSONArray allSterilisationJSONArray = new JSONArray();
 		if(allSterilisationList != null){
 			Collections.sort(allSterilisationList,Sterilisation.NAME_COMPARATOR);
@@ -130,6 +137,8 @@
 	
 	<script type="text/javascript">
 		 var invoicePlanType_disinfect = '<%= InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM%>';
+		 var newDate = '<%=request.getAttribute("newDate")%>';
+		var dayStartTime = '<%=supplyRoomConfigManager.getDayStartTime()%>';//一天的开始时间
 		 //申请日期下拉选项数据
 		 <%--var applyDateDataArray = [['全部',''],['今天','${today}'],['昨天','${yesterday}'],['近三天','${lastThreeDays}'],['近一周','${lastSixDays}']];--%>
 		 //物品类型下拉选项数据