Index: ssts-web/src/main/resources/config/zsyy/mybatis/syncFromHERP_Mapper.xml
===================================================================
diff -u -r19552 -r19733
--- ssts-web/src/main/resources/config/zsyy/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 19552)
+++ ssts-web/src/main/resources/config/zsyy/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 19733)
@@ -32,19 +32,18 @@
 	ORDER BY time
 	]]>
   </select>
-  <!--and time >= to_date('2017-8-01 ','yyyy-mm-dd') and time <= to_date('2017-8-11 ','yyyy-mm-dd') ORDER BY time -->
   
   <!-- 按单号查找入库单明细 -->
-  <!-- 中六的HERP不包含供应商信息 -->
+  <!--中大附一根据批次行号关联批次明细表获得批次号和数量-->
   <select id="findInEntryItem" resultType="StorageEntryItem">
   	<![CDATA[
 	SELECT  inventorySerialNumber,
-
-	        
-	        amount,
-	        cost AS unitPrice
+          		t3.lotNumber as batchNumber,
+          		t3.lotAmount as amount,
+	       		cost AS unitPrice
 	FROM apps.CSSD_GodownEntry t1
 	INNER JOIN apps.CSSD_GodownEntryItem t2 on t1.serialNumber = t2.serialNumber
+	INNER JOIN apps.CSSD_GODOWNENTRYLOT t3 on t2.lineId=t3.lineId
 	WHERE t1.serialNumber = #{inEntrySerialNumber}
 	]]>
   </select>
@@ -53,7 +52,7 @@
   <select id="getInventory" resultType="Inventory">
   	<![CDATA[
 	SELECT InventorySerialNumber AS serialNumber,
-	       name,specification,unit,cost
+	       name,specification,unit
 	FROM apps.CSSD_MaterialDefinition
 	WHERE InventorySerialNumber = #{inventorySerialNumber}
 	]]>
@@ -62,7 +61,7 @@
    <!-- 按名称规格查找物资信息 -->
   <select id="findInventory" resultType="Inventory">
 	SELECT InventorySerialNumber AS serialNumber,
-	       name,specification,unit,cost
+	       name,specification,unit
 	FROM apps.CSSD_MaterialDefinition
 	WHERE name = #{name}
 	<choose>
@@ -76,7 +75,6 @@
   </select>
   
   <!-- 按单号查找退库单 -->
-  <!-- 中山眼科中心无需从物资系统同步退库单 -->
   <select id="findOutEntryBySerialNumber" resultType="StorageEntry">
   	<![CDATA[
 	SELECT serialNumber,time,remark
@@ -86,33 +84,34 @@
   </select>
   
   <!-- 按时间查找退库单 -->
-  <!-- 中山眼科中心无需从物资系统同步退库单 -->
   <select id="findOutEntryByTime" resultType="StorageEntry">
   	<![CDATA[
 	SELECT serialNumber,time,remark
 	FROM apps.CSSD_GodownEntry
 	WHERE type = 'T'
 	]]>
 	<if test="startDate != null">
-		and time >= to_date(#{startDate},'yyyy-mm-dd')
+		and time >= #{startDate}
 	</if>
 	<if test="endDate != null">
 		<![CDATA[
-		and time <= to_date(#{endDate},'yyyy-mm-dd')
+		and time <= #{endDate}
 		]]>
 	</if>
 	ORDER BY time
   </select>
   
   <!-- 按单号查找退库单明细 -->
+    <!--中大附一根据批次行号关联批次明细表获得批次号和数量-->
   <select id="findOutEntryItem" resultType="StorageEntryItem">
   	<![CDATA[
 	SELECT  inventorySerialNumber,
-
-	        amount,
-	        cost AS unitPrice
+		        t3.lotNumber as batchNumber,
+		        t3.lotAmount as amount,
+	        	cost AS unitPrice
 	FROM apps.CSSD_GodownEntry t1
 	INNER JOIN apps.CSSD_GodownEntryItem t2 on t1.serialNumber = t2.serialNumber
+	INNER JOIN apps.CSSD_GODOWNENTRYLOT t3 on t2.lineId=t3.lineId
 	WHERE t1.serialNumber = #{entrySerialNumber}
 	]]>
   </select>
Index: ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp
===================================================================
diff -u -r19567 -r19733
--- ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp	(.../syncStorageEntry.jsp)	(revision 19567)
+++ ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp	(.../syncStorageEntry.jsp)	(revision 19733)
@@ -330,6 +330,11 @@
     		cellSix.insertBefore(createDisplayTextNodeIfEmpty(expDate), null);//失效日期
     	}else{
     		var columnField2 = createInputElement("itemExpDate_"+entryId+"_" + prev, "text", "");
+    		var date = new Date();
+    		var mon = date.getMonth()+1;
+    		var day = date.getDate();
+    		var date = date.getFullYear()+3 + "-" + (mon<10?"0"+mon:mon) + "-" +(day<10?"0"+day:day);
+    		columnField2.value=date;
     	    columnField2.className="accessories_iamge";
     	    columnField2.style.width="80";
     	    columnField2.style.height="20";