Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/deliveryPlanApplication.js
===================================================================
diff -u -r24565 -r24576
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/deliveryPlanApplication.js	(.../deliveryPlanApplication.js)	(revision 24565)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/deliveryPlanApplication.js	(.../deliveryPlanApplication.js)	(revision 24576)
@@ -33,7 +33,7 @@
 				{ 
 					var handle="";
 					handle +='<a class="mainFont" data-target="#myModal" data-toggle="modal" ' ;
-					handle +=' onclick="deliverySave('+row.departCode +',\''+row.depart+'\')" >';
+					handle +=' onclick="deliverySave(\''+row.departCode +'\' , \''+row.depart+'\')" >';
 					handle += row.depart;
 					handle += '</a>';
 					return  handle;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/inputPrint.js
===================================================================
diff -u -r24565 -r24576
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/inputPrint.js	(.../inputPrint.js)	(revision 24565)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/inputPrint.js	(.../inputPrint.js)	(revision 24576)
@@ -15,7 +15,7 @@
 		},
 		{
 			title : '批次/灭菌日期',
-			field : 'endDate',
+			field : 'batchNumber',
 			align : 'center'
 		},
 		{
@@ -100,6 +100,10 @@
 	var today =  myDate.getFullYear()+"-"+myDate.getMonth()+"-"+myDate.getDate()+" "+myDate.toLocaleTimeString();
 	$('#deliveryTime').datetimepicker('setStartDate', today);
 	
+	startTime
+	finishTime
+	$("#startTime").datetimepicker('setStartDate', today);
+	$("#finishTime").datetimepicker('setStartDate', today);
 	//发货单left的调用
 	invoiceTable([]);
 	//发货物品扫描
@@ -146,7 +150,21 @@
 										}
 										else
 										{
-											var invGoods2 = [{
+											data.rows[0].sendAmount = 1;
+											var endDate = data.rows[0].endDate;
+											endDate = (endDate).replace(/-/g,"/");
+											endDate = new Date(endDate);
+											
+											newEndDate = endDate.getFullYear()+"-"+endDate.getMonth()+"-"+endDate.getDay();
+											endDate = newEndDate+" "+endDate.getHours()+":"+endDate.getMinutes();
+											console.log("zus:"+endDate);
+											
+											data.rows[0].endDate = endDate;
+											var invGoods2 = data.rows;
+											
+											/*
+											[{
+															id : 0,
 															barcode:data.rows[0].barcode,
 															name:data.rows[0].name,
 															endDate:data.rows[0].endDate,
@@ -160,9 +178,10 @@
 															diposable : data.rows[0].diposable,
 															batchNumber : data.rows[0].batchNumber,
 															tousseType : data.rows[0].tousseType,
-															sendAmount : data.rows[0].storage,
+															sendAmount : data.rows[0].storage
 															
-															}];
+															}];*/
+															
 										}
 										//旧代码的参考与判断 例如 比较库存与发货量的关系
 										var goods = data.rows[0];
@@ -279,13 +298,20 @@
 			var swn = $("#sourceWarehouseName").select2('data');
 			var sA = (JSON.parse($("#deliveryCode").val())).length; 
 			var addData = {   
+				
+						applyDate : null,
+						//"2018-10-15 13:44:00"+";"+"2018-10-15 16:44:00",
+						//"2018-10-12 13:44:00;2018-10-15 13:44:00",
+						//null,
+						//"2018-10-15 13:44:00"+";"+"2018-10-15 15:44:00",
+						 
 						depart :$("#depart").val(),
 						sender :$("#sender").val(),
 						sourceWarehouseName :$("#sourceWarehouseName").val(),
-						orgUnitCoding : $("#deliveryDepartCodeHide").val(),
 						
+						orgUnitCoding : $("#deliveryDepartCodeHide").val(),
 						sendOutGoodsStoreData : $("#deliveryCode").val(),
-						
+					//	tousseType : "一次性物品,普通器械包,敷料包,消毒物品,自定义器械包,外来器械包,外部代理灭菌包",
 						sourceWarehouseId : swn[0].id,
 						sourceWarehouseName: swn[0].text