Index: ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jasper
===================================================================
diff -u -r12974 -r12990
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jrxml
===================================================================
diff -u -r12975 -r12990
--- ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jrxml (.../invoiceSummaryQuery_main.jrxml) (revision 12975)
+++ ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jrxml (.../invoiceSummaryQuery_main.jrxml) (revision 12990)
@@ -45,21 +45,21 @@
-
+
-
+
-
+
@@ -73,7 +73,7 @@
-
+
@@ -86,6 +86,13 @@
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jrxml
===================================================================
diff -u -r12974 -r12990
--- ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jrxml (.../invoiceSummaryQuery_child.jrxml) (revision 12974)
+++ ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jrxml (.../invoiceSummaryQuery_child.jrxml) (revision 12990)
@@ -49,6 +49,9 @@
+
+
+
@@ -64,33 +67,40 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jasper
===================================================================
diff -u -r12975 -r12990
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java
===================================================================
diff -u -r12974 -r12990
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java (.../InvoiceQueryItem.java) (revision 12974)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java (.../InvoiceQueryItem.java) (revision 12990)
@@ -24,7 +24,19 @@
private String batch;
private double totalPrice;
+ /**
+ * 一次性物品外部编码
+ */
+ private String externalCode;
+ public String getExternalCode() {
+ return externalCode;
+ }
+
+ public void setExternalCode(String externalCode) {
+ this.externalCode = externalCode;
+ }
+
public String getBarcode() {
return barcode;
}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r12974 -r12990
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 12974)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 12990)
@@ -4271,8 +4271,8 @@
+ "bo.statisticsAmount,po.sendTime,po.applicant from Invoice po,BarcodeDevice "
+ "do,TousseInstance bo where po.id = bo.invoice_id and bo.id = do.id ";
String diposableSql = "select po.settleAccountsDepart,bo.barcode,bo.name,bo.price,bo.amount,"
- + "po.sendTime,po.applicant,bo.batch from Invoice po,DiposableGoodsItem bo "
- + "where po.id = bo.invoice_id ";
+ + "po.sendTime,po.applicant,bo.batch,dg.externalCode from Invoice po,DiposableGoodsItem bo,DisposableGoods dg "
+ + "where po.id = bo.invoice_id and bo.disposableGoodsID = dg.id";
sql += " and " + dateQueryAdapter.dateAreaSql("po.sendTime", startDate, endDate, true, true);
/*if (StringUtils.isNotBlank(startDate)) {
sql += " and po.sendTime >= "
@@ -4307,20 +4307,23 @@
}
tousseSql += sql;
diposableSql += sql;
+
+ diposableSql += " order by po.settleAccountsDepart,dg.externalCode desc ";
- ResultSet rs = objectDao.executeSql(tousseSql);
Map> map = new HashMap>();
+ ResultSet rs2 = objectDao.executeSql(diposableSql);
try {
- while (rs.next()) {
- String departStr = rs.getString(1);
+ while (rs2.next()) {
+ String departStr = rs2.getString(1);
InvoiceQueryItem item = new InvoiceQueryItem();
- item.setBarcode(rs.getString(2));
- item.setGoodsName(rs.getString(3));
- item.setPrice(rs.getDouble(4));
- item.setAmount(rs.getInt(5));
- item.setTime(rs.getString(6));
- item.setApplicant(rs.getString(7));
- item.setBatch("");
+ item.setBarcode(rs2.getString(2));
+ item.setGoodsName(rs2.getString(3));
+ item.setPrice(rs2.getDouble(4));
+ item.setAmount(rs2.getInt(5));
+ item.setTime(rs2.getString(6));
+ item.setApplicant(rs2.getString(7));
+ item.setBatch(rs2.getString(8));
+ item.setExternalCode(rs2.getString(9));
List list = map.get(departStr);
if (list != null) {
if(isSummary){
@@ -4344,20 +4347,21 @@
} catch (SQLException e) {
e.printStackTrace();
}finally {
- DatabaseUtil.closeResultSetAndStatement(rs);
+ DatabaseUtil.closeResultSetAndStatement(rs2);
}
- ResultSet rs2 = objectDao.executeSql(diposableSql);
+
+ ResultSet rs = objectDao.executeSql(tousseSql);
try {
- while (rs2.next()) {
- String departStr = rs2.getString(1);
+ while (rs.next()) {
+ String departStr = rs.getString(1);
InvoiceQueryItem item = new InvoiceQueryItem();
- item.setBarcode(rs2.getString(2));
- item.setGoodsName(rs2.getString(3));
- item.setPrice(rs2.getDouble(4));
- item.setAmount(rs2.getInt(5));
- item.setTime(rs2.getString(6));
- item.setApplicant(rs2.getString(7));
- item.setBatch(rs2.getString(8));
+ item.setBarcode(rs.getString(2));
+ item.setGoodsName(rs.getString(3));
+ item.setPrice(rs.getDouble(4));
+ item.setAmount(rs.getInt(5));
+ item.setTime(rs.getString(6));
+ item.setApplicant(rs.getString(7));
+ item.setBatch("");
List list = map.get(departStr);
if (list != null) {
if(isSummary){
@@ -4381,8 +4385,9 @@
} catch (SQLException e) {
e.printStackTrace();
}finally {
- DatabaseUtil.closeResultSetAndStatement(rs2);
+ DatabaseUtil.closeResultSetAndStatement(rs);
}
+
Iterator iterator = map.keySet().iterator();
List invoiceList = new ArrayList();
while (iterator.hasNext()) {