Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setWorkScoreConfig.js =================================================================== diff -u -r18491 -r25994 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setWorkScoreConfig.js (.../setWorkScoreConfig.js) (revision 18491) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setWorkScoreConfig.js (.../setWorkScoreConfig.js) (revision 25994) @@ -62,7 +62,7 @@ //模块类型store var modelTypeStore = new Ext.data.SimpleStore({ fields : ['value'], - data : [ ['回收数量'],['清点数量'],['清洗数量'],['配包数量'],['审核数量'],['灭菌数量'],['发货数量'],['核对数量']] + data : [ ['预回收数量'],['检查数量'],['回收数量'],['清点数量'],['清洗数量'],['配包数量'],['审核数量'],['灭菌数量'],['发货数量'],['核对数量']] }); var cm = new top.Ext.grid.ColumnModel([new top.Ext.grid.RowNumberer({header:"序号",width:50}), Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java =================================================================== diff -u -r25920 -r25994 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 25920) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 25994) @@ -262,7 +262,22 @@ obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseTypeAndPackageSizeSql); break; - + case "预回收数量": + amountSql = String + .format("select sum(ti.prepareRecycleAmount * mi.count) amount ,ip.prepareRecycleOperator userName, td.tousseType,td.name tousseName " + + "from invoicePlan ip inner join TousseItem ti on ti.invoicePlanID =ip.id inner join TousseDefinition td on td.id = ti.tousseDefinitionId " + + "inner join MaterialInstance mi on td.id = mi.tousse_id " + + "where ip.prepareRecycleDateTime %s %s " + + "and ip.prepareRecycleOperator is not null and %s(ip.prepareRecycleOperator)<>0 %s %s %s %s " + + "group by ip.prepareRecycleOperator,td.tousseType,td.name ", + obj.betweenSql, + SqlUtils.get_InSql_Extra("ip.handleDepartCoding", obj.querySupplyRoom), + obj.sqlLengthFunctionName, + obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, + obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, + obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, + obj.tousseTypeAndPackageSizeSql); + break; case "年度报表中的回收数量（按材料）": amountSql = String .format("select " + obj.monthlyStr + " monthstr, sum(ri.amount * mi.count) amount " @@ -745,7 +760,21 @@ break; - + case "预回收数量": + amountSql = String + .format("select SUM(ti.prepareRecycleAmount) amount,ip.prepareRecycleOperator userName, td.tousseType tousseType,td.name tousseName from invoicePlan ip" + + " inner join TousseItem ti on ti.invoicePlanID =ip.id inner join TousseDefinition td on ti.tousseDefinitionId = td.id " + + " where ip.prepareRecycleDateTime %s %s " + + " and ip.prepareRecycleOperator is not null and %s(ip.prepareRecycleOperator)<>0 %s %s %s %s " + + " group by ip.prepareRecycleOperator,td.tousseType,td.name ", + obj.betweenSql, + SqlUtils.get_InSql_Extra("ip.handleDepartCoding", obj.querySupplyRoom), + obj.sqlLengthFunctionName, + obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, + obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, + obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, + obj.tousseTypeAndPackageSizeSql); + break; case "清点数量": amountSql = String .format("select sum(ri.amount) amount ,rr.operator userName, td.tousseType,td.name tousseName " Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r25949 -r25994 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 25949) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 25994) @@ -5246,7 +5246,7 @@ // 统计工作环节的数量 int staticFieldsCount = 0; - + sequenceMap.put("预回收数量", ++staticFieldsCount); sequenceMap.put("回收数量", ++staticFieldsCount); sequenceMap.put("清点数量", ++staticFieldsCount); sequenceMap.put("清洗数量", ++staticFieldsCount); @@ -5304,9 +5304,15 @@ //按包数量统计的SQL //回收记录 - String tousseAmountSql = String.format("select '回收数量' type,tl.userName,sum(tl.amount) amount from (" - +dataIndex.getWorkAmountByPackageSQL("回收数量", params) - + ") tl group by tl.userName "); + String tousseAmountSql = String.format("select '预回收数量' type,tl.userName,sum(tl.amount) amount from (" + +dataIndex.getWorkAmountByPackageSQL("预回收数量", params) + + ") tl group by tl.userName "); + + tousseAmountSql += " union all "; + + tousseAmountSql += String.format("select '回收数量' type,tl.userName,sum(tl.amount) amount from (" + +dataIndex.getWorkAmountByPackageSQL("回收数量", params) + + ") tl group by tl.userName "); tousseAmountSql += " union all "; //清点记录 @@ -5417,10 +5423,16 @@ // 按材料数量统计的SQL //回收记录 - String materialAmountSql = String.format("select '回收数量' type,tl.userName,sum(tl.amount) amount from (" - +dataIndex.getWorkAmountByMaterialSQL("回收数量", params) + String materialAmountSql = String.format("select '预回收数量' type,tl.userName,sum(tl.amount) amount from (" + +dataIndex.getWorkAmountByMaterialSQL("预回收数量", params) + ") tl group by tl.userName "); + materialAmountSql += " union all "; + + materialAmountSql += String.format("select '回收数量' type,tl.userName,sum(tl.amount) amount from (" + +dataIndex.getWorkAmountByMaterialSQL("回收数量", params) + + ") tl group by tl.userName "); + materialAmountSql += " union all "; //清点记录 materialAmountSql += String.format("select '清点数量' type,tl.userName,sum(tl.amount) amount from (" @@ -5526,9 +5538,6 @@ DatabaseUtil.closeResultSetAndStatement(rs2); } } - - - } return list; Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r25564 -r25994 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 25564) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 25994) @@ -3418,7 +3418,7 @@ for ( var j = 0; j < materialArray.length; j++) { var materialItems = materialArray[j].split("#&"); content +="   " + materialItems[0] +"" + materialItems[1]+""; - content +="" + (materialItems[2] == "null" ? " " : materialItems[2]) + "   "; + content +="" + (materialItems[2] == "null" ? " " : materialItems[2]) + "    "; } } } Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js =================================================================== diff -u -r25936 -r25994 --- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js (.../config.js) (revision 25936) +++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js (.../config.js) (revision 25994) @@ -193,7 +193,7 @@ //隐藏档案管理 hideStaffArchive:false, //装配界面显示检查人字段 - //showInspectorField:true, + showInspectorField:true, //设备维护功能自定义 isDeviceMaintenanceCus:true, //是否启用快速入筐按钮(true为启用,false或者不配置都不启用)