Merge branches 'hy' and 'master' of 47.92.228.5:huyi/warehouse into hy

src/main/webapp/webpage/modules/warehouse/ledger/ledgerDetail.jsp

@@ -51,6 +51,11 @@
                     align: 'center'
                 },
                 {
+                    field: 'sum',
+                    title: '数量',
+                    align: 'center'
+                },
+                {
                     title: '操作',
                     align: 'center',
                     formatter: function (){

src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.js

@@ -302,6 +302,7 @@ $(document).ready(function() {
 								<th>批次号</th>
 								<th>货架</th>
 								<th>仓库</th>
+								<th>数量</th>
 							</tr>
 						</thead>
 						<tbody id="ledgerChild-{{idx}}-1-List">
@@ -328,6 +329,8 @@ $(document).ready(function() {
 					<td>
 						{{row.warehouseNames}}
 					</td>
-
+					<td>
+						{{row.sum}}
+					</td>
 				</tr>//-->
 	</script>