Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java =================================================================== diff -u -r13124 -r13143 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java (.../MaterialCheckManagerImpl.java) (revision 13124) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java (.../MaterialCheckManagerImpl.java) (revision 13143) @@ -154,11 +154,13 @@ if(lastRecord != null){ startDate = lastRecord.getDate(); } + int i = 1; for (MaterialCheck materialCheck : list) { SupplyRoomMaterialStocktaking vo = new SupplyRoomMaterialStocktaking(); vo.setName(materialCheck.getName()); vo.setSpecification(materialCheck.getSpecification()); vo.setCurrentMonthSum(materialCheck.getStock()); + vo.setsNumber(i); // 获取本月材料报损数量 setDamageAndLost(vo, startDate, endDate); // 获取本月材料入库数量 @@ -175,6 +177,7 @@ vo.setLastMonthSum(0); } smtList.add(vo); + i++; } } } Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jasper =================================================================== diff -u -r12331 -r13143 Binary files differ Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java =================================================================== diff -u -r13124 -r13143 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java (.../InventoryRecordAction.java) (revision 13124) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java (.../InventoryRecordAction.java) (revision 13143) @@ -17,7 +17,6 @@ import com.forgon.Constants; import com.forgon.disinfectsystem.entity.stocktakemanager.InventoryItem; -import com.forgon.disinfectsystem.entity.stocktakemanager.InventoryRecord; import com.forgon.disinfectsystem.inventoryrecord.service.InventoryRecordManager; import com.forgon.tools.StrutsParamUtils; Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js =================================================================== diff -u -r13130 -r13143 --- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js (.../inventoryMaterialForm.js) (revision 13130) +++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js (.../inventoryMaterialForm.js) (revision 13143) @@ -163,8 +163,8 @@ text : '物资收发明细', hidden:status=="已更新"?false:true, handler : function() { - window.close(); location.href = WWWROOT + "/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp?id="+recordId; + window.close(); } }] }); @@ -182,22 +182,9 @@ }); window.show(); - function showMask(msg){ - myMask = new top.Ext.LoadMask(top.Ext.getBody(), { - msg: msg, - removeMask: true - }); - myMask.show(); - } - showMask("正在加载，请稍候！"); + itemsStore.load(); - itemsStore.load({ - callback: function(records, options, success){ - myMask.hide(); // 加载完成，关闭提示框 - } - }); - function saveInventoryItem(){ top.Ext.getCmp('button1').disable(); var array = new Array(); @@ -214,20 +201,17 @@ }; array.push(obj); } - showMask("正在保存，请稍候！"); Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/inventoryRecordAction!saveInventoryRecord.do', params : { items : JSON.stringify(array) }, success : function(response, options) { - myMask.hide(); var jsonObj = Ext.decode(response.responseText); showResult(jsonObj.msg); window.close(); }, failure : function(response, options) { - myMask.hide(); var jsonObj = Ext.decode(response.responseText); showResult(jsonObj.msg); window.close(); @@ -260,8 +244,6 @@ return; } - showMask("正在保存，请稍候！"); - Ext.Ajax.request({ timeout: 300*000, url : WWWROOT + '/disinfectSystem/inventoryRecordAction!updateGoodsStock.do', @@ -271,14 +253,12 @@ type : 'material' }, success : function(response, options) { - myMask.hide(); var jsonObj = Ext.decode(response.responseText); showResult(jsonObj.msg); grid.dwrReload(); window.close(); }, failure : function(response, options) { - myMask.hide(); var jsonObj = Ext.decode(response.responseText); showResult(jsonObj.msg); grid.dwrReload(); Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jrxml =================================================================== diff -u -r12331 -r13143 --- ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jrxml (.../supplyRoomApplianceMonthStatistics.jrxml) (revision 12331) +++ ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jrxml (.../supplyRoomApplianceMonthStatistics.jrxml) (revision 13143) @@ -1,5 +1,5 @@ - + @@ -87,13 +87,16 @@ + + + <band height="34" splitType="Stretch"> <staticText> - <reportElement uuid="5d88e429-354d-4d63-886e-cad6abb66010" x="0" y="0" width="700" height="34"/> + <reportElement uuid="5d88e429-354d-4d63-886e-cad6abb66010" x="0" y="0" width="800" height="34"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="16" isBold="true"/> </textElement> @@ -104,120 +107,120 @@ <columnHeader> <band height="33" splitType="Stretch"> <staticText> - <reportElement uuid="67bb57d3-2cba-45c1-a213-457b58914ce5" style="table_TH" mode="Opaque" x="55" y="0" width="184" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="67bb57d3-2cba-45c1-a213-457b58914ce5" style="table_TH" mode="Opaque" x="55" y="0" width="244" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[名称]]></text> </staticText> <staticText> - <reportElement uuid="5c291727-4353-49d4-9e6c-6886d7a7f8b3" style="table_TH" mode="Opaque" x="239" y="0" width="86" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="5c291727-4353-49d4-9e6c-6886d7a7f8b3" style="table_TH" mode="Opaque" x="418" y="0" width="86" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[上月总数]]></text> </staticText> <staticText> - <reportElement uuid="00983ad7-c920-42b2-abf3-2bb86533130c" style="table_TH" mode="Opaque" x="325" y="0" width="63" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="00983ad7-c920-42b2-abf3-2bb86533130c" style="table_TH" mode="Opaque" x="588" y="0" width="63" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[报废]]></text> </staticText> <staticText> - <reportElement uuid="bbc1e3b6-4306-4acf-8932-61cf9e8123dc" style="table_TH" mode="Opaque" x="388" y="0" width="67" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="bbc1e3b6-4306-4acf-8932-61cf9e8123dc" style="table_TH" mode="Opaque" x="651" y="0" width="67" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[入库]]></text> </staticText> <staticText> - <reportElement uuid="fd7d0ef2-6865-425c-971a-9d156340a10f" style="table_TH" mode="Opaque" x="455" y="0" width="82" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="fd7d0ef2-6865-425c-971a-9d156340a10f" style="table_TH" mode="Opaque" x="718" y="0" width="82" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[本月总数]]></text> </staticText> <staticText> - <reportElement uuid="3924a602-bedf-41d7-a3ab-5930b372862b" style="table_TH" mode="Opaque" x="537" y="0" width="79" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="7da7eae9-d41d-487a-afe9-9accb2233b3d" style="table_TH" mode="Opaque" x="0" y="0" width="55" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> - <text><![CDATA[本月库存]]></text> + <text><![CDATA[编号]]></text> </staticText> <staticText> - <reportElement uuid="608fab83-c2d8-4f3e-9e8d-b6391091133d" style="table_TD" mode="Opaque" x="616" y="0" width="84" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="4233c6c7-19a4-4cbb-9290-2d07fc130e93" style="table 1_TH" x="504" y="0" width="84" height="33" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> - <text><![CDATA[本月运作]]></text> + <text><![CDATA[丢失]]></text> </staticText> <staticText> - <reportElement uuid="7da7eae9-d41d-487a-afe9-9accb2233b3d" style="table_TH" mode="Opaque" x="0" y="0" width="55" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="6354e9bd-4e3d-49e2-bd88-e81bd88c4a63" style="table 1_TH" mode="Opaque" x="299" y="0" width="119" height="33" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> - <text><![CDATA[编号]]></text> + <text><![CDATA[规格]]></text> </staticText> </band> </columnHeader> <detail> <band height="25" splitType="Stretch"> <textField> - <reportElement uuid="4dc3cf68-de9f-4b0e-aaaa-b98914733d58" style="table_TD" x="55" y="0" width="184" height="25"/> + <reportElement uuid="4dc3cf68-de9f-4b0e-aaaa-b98914733d58" style="table_TD" x="55" y="0" width="244" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{name}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="a3e37a99-3420-484a-aec8-78014870b8fe" style="table_TD" x="239" y="0" width="86" height="25"/> + <reportElement uuid="a3e37a99-3420-484a-aec8-78014870b8fe" style="table_TD" x="418" y="0" width="86" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{lastMonthSum}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="af45dcc2-7124-4bd1-88f4-8d7525b4cc34" style="table_TD" x="325" y="0" width="63" height="25"/> + <reportElement uuid="af45dcc2-7124-4bd1-88f4-8d7525b4cc34" style="table_TD" x="588" y="0" width="63" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{scrap}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="9d01bdae-db7f-457b-8717-849ac2fd4417" style="table_TD" x="388" y="0" width="67" height="25"/> + <reportElement uuid="9d01bdae-db7f-457b-8717-849ac2fd4417" style="table_TD" x="651" y="0" width="67" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{warehousing}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="bc43cfe9-8eb2-4721-9cfa-51d680d96f55" style="table_TD" x="455" y="0" width="82" height="25"/> + <reportElement uuid="bc43cfe9-8eb2-4721-9cfa-51d680d96f55" style="table_TD" x="718" y="0" width="82" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{currentMonthSum}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="78d71375-57f5-46ea-b556-1989cb5c1d4d" style="table_TD" x="537" y="0" width="79" height="25"/> + <reportElement uuid="8f3e2c40-d02f-4dd4-8cd6-4586475b0ac0" style="table_TD" x="0" y="0" width="55" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> - <textFieldExpression><![CDATA[$F{currentStock}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{sNumber}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="dee8cb23-5fc9-41e5-be94-58e5fa6e9c20" style="table_TD" x="616" y="0" width="84" height="25"/> + <reportElement uuid="3f3ec07d-4001-404e-bc8a-b150bea84fcd" style="table_TD" x="504" y="0" width="84" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> - <textFieldExpression><![CDATA[$F{currentMonthOperation}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{lost}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="8f3e2c40-d02f-4dd4-8cd6-4586475b0ac0" style="table_TD" x="0" y="0" width="55" height="25"/> + <textField isBlankWhenNull="true"> + <reportElement uuid="10469d7f-b0f7-4cd8-bd1d-cdfeeaf10fb7" style="table_TD" x="299" y="0" width="119" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> - <textFieldExpression><![CDATA[$F{sNumber}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{specification}]]></textFieldExpression> </textField> </band> </detail>