Index: ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js
===================================================================
diff -u -r24719 -r24758
--- ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js (.../printConfig.js) (revision 24719)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js (.../printConfig.js) (revision 24758)
@@ -239,17 +239,11 @@
// 页眉名称
{label : "广州医科大学附属口腔医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
// 标题
- {label : "材料出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]},
+ {label : "物品发货单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]},
{label : "部门:", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]},
- {label : "单号:", dataIndex : 'serialNumber', fontSize : 11, position : ["55","35%","90%",5]},
- {label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]},
- {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["80","75%","90%",5]},
- {label : "申请时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["80","35%","90%",5]},
- {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]},
- {label : "主管:", dataIndex : '', fontSize : 11, position : ["415","5%","90%",5]},
- {label : "领料人:", dataIndex : '', fontSize : 11, position : ["415","40%","90%",5]},
- {label : "发货员:", dataIndex : 'sender', fontSize : 11, position : ["415","75%","90%",5]},
- {label : "发货日期:", dataIndex : 'sendTime', fontSize : 11, position : ["445","5%","90%",5]},
+ {label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","65%","90%",5]},
+ {label : "发货员:", dataIndex : 'sender', fontSize : 11, position : ["80","75%","90%",5]},
+ {label : "发货日期:", dataIndex : 'sendTime', fontSize : 11, position : ["80","2%","90%",5]},
{barcodes : [
{codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"],
styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
@@ -266,14 +260,9 @@
position : ["100","1%","97%","7cm"],
headRepeat : true,
columns : [
- {header : "名称", dataIndex : 'name', width : 220, align : 'left', fontSize : 11},
- {header : "数量", dataIndex : 'count', width : 40, align : 'right', fontSize : 11},
- {header : "单位", dataIndex : 'unit', width : 40, align : 'center', fontSize : 11},
- {header : "规格", dataIndex : 'specification', width : 110, align : 'center', fontSize : 11},
- {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11},
- {header : "失效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11},
- {header : "单价", dataIndex : 'price', width : 60, align : 'right', fontSize : 11},
- {header : "金额", dataIndex : 'totalPrice', width : 75, align : 'right', fontSize : 11}
+ {header : "名称", dataIndex : 'name', width : 340, fontSize : 11},
+ {header : "数量", dataIndex : 'amount', width : 40,align : 'center' , fontSize : 11}
+
]
}
}
@@ -1160,80 +1149,50 @@
//回收页面打印配置
var recyclingGoodsDetailConfig = {
- customPrint:printRecyclingGoodsDetail_gykq
+ isPrintTousse : true,
+ isPrintDisinfectGoods : true,
+ isPrintDisposableGoods : false, // 打印申请单是否打印一次性物品
+ isMergePrintTousseAndDisposable : false, // 器械包和一次性物品是否合并打印
+ printByOriginalApplications : false, //不合并打印情况下是否按原始单据逐份打印
+ printApplyInfo : false,
+ printOrder : 2, // 1:优先打印一次性物品, 2:优先打印器械包
+
+ // 在器械包和一次性物品不合并打印的情况下,消毒物品打印方式:
+ // 1:优先与一次性物品合并打印,如果无一次性物品则与器械包合并打印, 2:优先与器械包一起合并打印,如果没有器械包则与一次性物品合并打印 ,3:单独打印
+ disinfectGoodsPrintMode : 1,
+ rowsPerPage : 7,
+ headerFooter : [
+ // 标题
+ {label : "广州医科大学附属口腔医院部门领货凭证", dataIndex : 'header', fontSize : 14, position : ["10","1%","99%",5],type: 'html', beforeStr: "
"},
+ {label : "去向:", dataIndex : 'departName', fontSize : 10, position : ["55","5%","90%",5]},
+ {label : "单号:", dataIndex : 'invoicePlanSerialNumber', fontSize : 10, position : ["55","40%","90%",5]},
+ {label : "日期:", dataIndex : 'recyclingTime', fontSize : 10, position : ["70","5%","90%",5]},
+ {label : "备注:", dataIndex : 'remark', fontSize :10, position : ["70","40%","90%",5]}
+ ],
+ goodsTable :{
+ rowHeight : 25,
+ position : ["85","2%","97%","2000"],
+ columns : [
+ {header : "序号", dataIndex : 'index', width : 60, align : 'center', fontSize : 10},
+ {header : "名称", dataIndex : 'name', width : 340, align : 'left', fontSize : 10},
+ {header : "数量", dataIndex : 'amount', width : 60, align : 'center', fontSize : 10}
+ ]
+ },
+ footer: {
+ fontSize : 12,
+ rowHeight : 20,
+ content : [
+ {label : "制单:", dataIndex : 'applicant'},
+ {label : "打印时间:", dataIndex : 'printTime'}
+ ]
+ }
}
-
-function printRecyclingGoodsDetail_gykq(printSummaryObj){
- //科室、申请单号、日期、备注
- var departName = printSummaryObj.departName ;
- var invoicePlanSerialNumber = getDefaultString(printSummaryObj.invoicePlanSerialNumber,' ');
- var recyclingTime = getDefaultString(printSummaryObj.recyclingTime,' ');
- var remark = getDefaultString(printSummaryObj.remark,' ');
- var goods = getDefaultString(printSummaryObj.goods,' ');
-
- LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM'));
- var rowHeight = 20;
-
- var css="table{margin:0px;padding:0px;width: 100%; border-collapse: collapse;}";
- css+="tr{padding:0px;margin:0px;height:20px;}td{padding:0px;margin:0px;border:1px solid black;font-size: 14px;font-weight:bold;text-align:center;}";
- css+="td.headRow{font-size: 20px;font-weight:bold;text-align:center;} td.dataRow{font-size: 18px;text-align:center;}";
- css+="table.chld td{border-top-width: 0px;text-align:center;}";
- var tableHtml ="";
-
- tableHtml += "广州医科大学附属口腔医院回收物品表
";
- tableHtml += "科室:"+ departName +" 申请单号:"+ invoicePlanSerialNumber +" 回收日期:"+ recyclingTime +" 备注:"+ remark +"
";
- tableHtml +="";
-
- var minRowCount = 9;
- tableHtml += "";
- tableHtml += "序号 | "
- tableHtml += "名称 | ";
- tableHtml += "数量 | ";
- tableHtml += "单位 | ";
- tableHtml += "单价 | ";
- tableHtml += "金额 | ";
- tableHtml += "
";
- for(var i = 0; i < goods.length;i++){
- var printGoods = goods[i];
- tableHtml += "";
- tableHtml += ""+getDefaultString(i+1," ")+" | ";
- tableHtml += ""+getDefaultString(printGoods.name," ")+" | ";
- tableHtml += ""+getDefaultString(printGoods.amount," ")+" | ";
- tableHtml += ""+getDefaultString(printGoods.unit," ")+" | ";
- tableHtml += ""+getDefaultString(printGoods.price," ")+" | ";
- tableHtml += ""+getDefaultString(printGoods.rowPrice," ")+" | ";
- tableHtml += "
";
- }
- function addEmptyRow(){
- tableHtml += "";
- tableHtml += " | ";
- tableHtml += " | ";
- tableHtml += " | ";
- tableHtml += " | ";
- tableHtml += " | ";
- tableHtml += " | ";
- tableHtml += "
";
- }
- if(goods.length == 0){
- addEmptyRow();
- }
- //添加空行到最少行数,以便表格好看一些
- var otherEmptyRow = minRowCount - goods.length;
- if(otherEmptyRow > 0){
- for(var i = 0; i < otherEmptyRow;++i){
- addEmptyRow();
- }
- }
-
- tableHtml += "
";
- LODOP.ADD_PRINT_HTM(0,0,"100%","100%",tableHtml);
-// LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page");
-}
var printConfig = {
//发货计划单
invoicePlan : invoicePlanPrintConfig,
batchPrintMaterialInvoices:batchPrintMaterialInvoicesConfig,
+ batchPrintInvoices : invoiceComboPrintConfig,
// 发货单(通用发货单)
invoiceCombo : invoiceComboPrintConfig,
// 发货单(一次性物品)
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintItem.java
===================================================================
diff -u -r24702 -r24758
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintItem.java (.../RecyclingPrintItem.java) (revision 24702)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintItem.java (.../RecyclingPrintItem.java) (revision 24758)
@@ -1,7 +1,13 @@
package com.forgon.disinfectsystem.recyclingrecord.vo;
public class RecyclingPrintItem {
+
/**
+ * 序号
+ */
+ private Integer index;
+
+ /**
* 名称。
* 对于外来器械包则为材料名称
* 对于其它类型包则为包名称
@@ -34,6 +40,29 @@
*/
private Double rowPrice;
+ public RecyclingPrintItem() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public RecyclingPrintItem(Integer index, String name, Integer amount,
+ String isImplant, String unit, Double price, Double rowPrice) {
+ super();
+ this.index = index;
+ this.name = name;
+ this.amount = amount;
+ this.isImplant = isImplant;
+ this.unit = unit;
+ this.price = price;
+ this.rowPrice = rowPrice;
+ }
+
+ public Integer getIndex() {
+ return index;
+ }
+ public void setIndex(Integer index) {
+ this.index = index;
+ }
public String getName() {
return name;
}
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintData.java
===================================================================
diff -u -r24702 -r24758
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintData.java (.../RecyclingPrintData.java) (revision 24702)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintData.java (.../RecyclingPrintData.java) (revision 24758)
@@ -3,14 +3,27 @@
import java.util.ArrayList;
import java.util.List;
+import net.sf.json.JSONArray;
+
import com.forgon.tools.MathTools;
/**
* 回收打印数据。目前回收的时候,如果是外来器械,需要打印外来器械包的病人等信息及包内材料清单。ZJYY-4
* 其他的包都不用打印。打印的材料清单,跟随包一起清洗、装配(类似于标识牌,只是不打印条码)
* 增加广医口腔的打印(打印结果参考申请单打印)、打印普通器械包
* @author kzh
- *
+ * 针对广医口腔要求按申请单内容打印的要求需打印的对象示例格式如下:
+ * {
+ departName:"",//科室
+ invoicePlanSerialNumber:"",//单号
+ recyclingTime:"",//回收时间
+ applicant:"",//申请/回收人
+ printTime:"",//打印时间
+ remark:"",//备注
+ pageAmount:1,//总页数
+ //各页的数据内容
+ pages:[{pageNumber:1,rows:[{},{}...]},{pageNumber:2,rows:[{},{}...]}...]
+}
*/
public class RecyclingPrintData implements Comparable {
/**
@@ -57,6 +70,11 @@
private String departName;
/**
+ * 申请(回收)人
+ */
+ private String applicant;
+
+ /**
* 申请单类型
*/
private String recyclingApplicationType;
@@ -76,7 +94,26 @@
*/
private String remark;
- /**
+ /**
+ * 合计数量
+ */
+ private Long totalGoodsAmount = 0L;
+
+ /**
+ * 打印时间
+ */
+ private String printTime;
+
+ /**
+ * 总页数
+ */
+ private Integer pageAmount = 1;
+
+ /**
+ * 所有页的内容数组
+ */
+ private JSONArray pages;
+ /**
* 材料明细项
*/
private List goods;
@@ -157,12 +194,13 @@
item.setIsImplant(isImplant);
goods.add(item);
}
- public void addItem(String name,Integer amount,String unit,Double price){
+ public void addItem(Integer index,String name,Integer amount,String unit,Double price){
if(goods == null){
goods = new ArrayList<>();
}
RecyclingPrintItem item = new RecyclingPrintItem();
item.setAmount(amount);
+ item.setIndex(index);
item.setName(name);
item.setUnit(unit);
item.setPrice(price);
@@ -212,5 +250,35 @@
public void setRecyclingApplicationType(String recyclingApplicationType) {
this.recyclingApplicationType = recyclingApplicationType;
}
+ public String getApplicant() {
+ return applicant;
+ }
+ public void setApplicant(String applicant) {
+ this.applicant = applicant;
+ }
+ public Long getTotalGoodsAmount() {
+ return totalGoodsAmount;
+ }
+ public void setTotalGoodsAmount(Long totalGoodsAmount) {
+ this.totalGoodsAmount = totalGoodsAmount;
+ }
+ public String getPrintTime() {
+ return printTime;
+ }
+ public void setPrintTime(String printTime) {
+ this.printTime = printTime;
+ }
+ public Integer getPageAmount() {
+ return pageAmount;
+ }
+ public void setPageAmount(Integer pageAmount) {
+ this.pageAmount = pageAmount;
+ }
+ public JSONArray getPages() {
+ return pages;
+ }
+ public void setPages(JSONArray pages) {
+ this.pages = pages;
+ }
}
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r24682 -r24758
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 24682)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 24758)
@@ -539,6 +539,225 @@
}
}
+/**
+ * 根据回收明细打印配置进行打印(模式根据打印发货计划)
+ */
+function print3(printSummaryObj){
+ doGetLodop();
+
+ var myObj = printConfig[formTypeOfPrinted];
+ if(isUndefinedOrNullOrEmpty(myObj)){
+ if(!isUndefinedOrNull(printSummaryObj.printConfigObj_default)){
+ myObj = printSummaryObj.printConfigObj_default;
+ }
+ }
+ if(isUndefinedOrNullOrEmpty(myObj)){
+ var msg = '未找到('+formTypeOfPrinted+')的打印配置';
+ showResult(msg);
+ return;
+ }
+ // 自定义打印
+ if (!isUndefinedOrNullOrEmpty(myObj.customPrint)) {
+ myObj.customPrint(printSummaryObj);
+ return;
+ }
+ // 打印表头的内容
+ if (!isObjEmpty(myObj.headerFooter)){
+ // 设置为页眉页脚模式
+ LODOP.SET_PRINT_STYLE("ItemType",1);
+
+ for (var i=0;i";
+
+ // 如果需要表头在每页重复打印,则增加thead标签
+ if (myObj.goodsTable.headRepeat){
+ tableHtml += "";
+ }
+
+ tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
+
+ for (var i=0;i" + item.header + "";
+ }
+ tableHtml += "";
+
+ if (myObj.goodsTable.headRepeat){
+ tableHtml += "";
+ }
+
+ // 打印物品内容行
+ var columnCount = myObj.goodsTable.columns.length;
+ var page = printSummaryObj.pages[printSummaryObj.pageIndex];
+ var rows = page.rows;
+ if(rows != null && rows.length > 0){
+ for ( var k = 0; k < rows.length; k++) {
+ var row = rows[k];
+ tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
+ for (var i=0;i" + value + " ";
+ }
+ tableHtml += "";
+ }
+ if(!myObj.goodsTable.donotPrintTotal && page.pageNumber == printSummaryObj.pageAmount){
+ // 打印合计信息
+ tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
+ var style = getTableTdStyle(myObj.goodsTable,0);
+ tableHtml += "合计 | ";
+ for (var i=columnCount-1;i= 0 || indexName == "amount"){
+ value = printSummaryObj.totalGoodsAmount;
+ }
+ else if (indexName == "applyAmount"){
+ value = printSummaryObj.totalApplyAmount;
+ }
+ else if (indexName == "recyclingAmount"){
+ value = printSummaryObj.totalRecyclingAmount;
+ }
+ else if(indexName == "rowPrice" || indexName == "totalPrice"){
+ value = formatMoney(printSummaryObj.totalPrice);
+ }
+
+ tableHtml += "" + value + " | ";
+ }
+ tableHtml += "";
+ }
+ }
+
+ //打印表格表尾的统计信息
+ if(myObj.goodsTable.footer){
+ tableHtml += ""
+ var rowCount = myObj.goodsTable.footer.length;
+ for(var row = 0; row < rowCount;++row){
+ var rowObj = myObj.goodsTable.footer[row];
+ tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
+ var colIndex = 0;
+ for(var col=0;col" + text + "";
+ }
+ tableHtml += "";
+ }
+ tableHtml += "";
+ }
+
+ if(myObj.footer){
+ // 打印页脚信息
+ tableHtml = appendTableRowString(tableHtml, myObj.footer.rowHeight , myObj.footer.fontSize)
+
+ tableHtml += "";
+ var text = "";
+
+ for (var i=0;i 0){
+ temp = temp.substring(0,10);
+ }
+
+ text += temp;
+ }
+ }
+
+ }
+ tableHtml += "" + text;
+ tableHtml += " 第"+page.pageNumber+"页/共"+printSummaryObj.pageAmount+"页";
+ tableHtml += " | ";
+ }
+
+ tableHtml += "";
+
+ LODOP.ADD_PRINT_TABLE(myObj.goodsTable.position[0], myObj.goodsTable.position[1], myObj.goodsTable.position[2], myObj.goodsTable.position[3],tableHtml);
+ }
+}
+
//根据配置的表单打印信息,以及从服务器取到的物品信息数据,打印表单
//@Deprecated,新的打印函数采用Lodop的自动分页以及页眉页脚打印方式
function print(printSummaryObj){
@@ -1674,7 +1893,7 @@
return tousseName;
}
/**
- * 打印回收篮筐内物品。目前就外来器械会打印
+ * 打印回收篮筐内物品。外来器械及其它类型单的回收物品打印(根据配置项决定)
* @param recyclingPrintDatas
*/
function printRecyclingDetail(recyclingPrintDatas){
@@ -1684,8 +1903,19 @@
recyclingPrintData.printTousseName = getForeignTousseName(recyclingPrintData);
formTypeOfPrinted = "recyclingGoodsDetail";
setPrinterByConfig();
- print2(recyclingPrintData);
- LODOP.PRINT();
+ //如果打印回收清单的类型为2(目前仅广医口腔有此配置),则按申请单的打印格式进行配置
+ if(sstsConfig.recyclingPrintContent == 2){
+ if(recyclingPrintData && recyclingPrintData.pages && recyclingPrintData.pages.length > 0){
+ for(var i = 0;i < recyclingPrintData.pages.length;i++){
+ recyclingPrintData.pageIndex = i;
+ print3(recyclingPrintData);
+ LODOP.PRINT();
+ }
+ }
+ }else{
+ print2(recyclingPrintData);
+ LODOP.PRINT();
+ }
}
}
}
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r24702 -r24758
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 24702)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 24758)
@@ -82,6 +82,7 @@
import com.forgon.disinfectsystem.recyclingrecord.vo.RecyclingBasketItemVo;
import com.forgon.disinfectsystem.recyclingrecord.vo.RecyclingContext;
import com.forgon.disinfectsystem.recyclingrecord.vo.RecyclingPrintData;
+import com.forgon.disinfectsystem.recyclingrecord.vo.RecyclingPrintItem;
import com.forgon.disinfectsystem.recyclingrecord.vo.SimpleTousseItem;
import com.forgon.disinfectsystem.recyclingrecord.vo.SimpleTousseItemImpl;
import com.forgon.disinfectsystem.recyclingrecord.vo.TousseDefinitionAble;
@@ -4167,6 +4168,8 @@
list.addAll(printDatas);
}
} else {
+ //每页打印物品条数(默认7条)
+ int rowCountPerPage = CssdUtils.getSystemSetConfigByNameInt("recyclingPrintRowCountPerPage", 7);
List recyclingItemList = recyclingRecord.getItems();
RecyclingPrintData printData = new RecyclingPrintData();
//科室、申请单号、日期、备注
@@ -4175,11 +4178,47 @@
printData.setRecyclingTime(ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDD, ""));
printData.setRemark(recyclingRecord.getRemark());
printData.setRecyclingApplicationType(recyclingRecord.getRecyclingApplicationType());
+ //申请/回收人
+ printData.setApplicant(recyclingRecord.getRecyclingUser());
+ //打印时间,保留到分
+ printData.setPrintTime(ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));
+ //物品总数量
+ Long totalGoodsAmount = 0L;
+ //物品序号
+ Integer index = 1;
+ int pageAmount = ((recyclingItemList.size() -1 )/rowCountPerPage) + 1;
+ //所有页及各页的数据
+ JSONArray pagesJsonArray = new JSONArray();
+ List tousseDefinitionIdList = new ArrayList();
for(RecyclingItem item : recyclingItemList){
- TousseDefinition td = tousseDefinitionManager.get(item.getTousseDefinitionId());
- //名称、数量、单位、单价、金额
- printData.addItem(item.getTousseName(), item.getAmount(), td.getUnit() , td.getPrice());
+ tousseDefinitionIdList.add(item.getTousseDefinitionId());
}
+ List tdList = tousseDefinitionManager.getCollection(tousseDefinitionIdList);
+ Map tdMap = new HashMap();
+ for (TousseDefinition tousseDefinition : tdList) {
+ tdMap.put(tousseDefinition.getId(), tousseDefinition);
+ }
+ for (int i = 1; i <= pageAmount; i++) {
+ JSONObject pageJsonObject = new JSONObject();
+ pageJsonObject.put("pageNumber", i);
+ JSONArray rows = new JSONArray();
+ for (int j = (i-1) * rowCountPerPage; j < i * rowCountPerPage && j < recyclingItemList.size(); j++) {
+ RecyclingItem item = recyclingItemList.get(j);
+ TousseDefinition td = tdMap.get(item.getTousseDefinitionId());
+ rows.add(new RecyclingPrintItem(index , item.getTousseName() , item.getAmount() , null , td.getUnit() , td.getPrice() , MathTools.mul(item.getAmount(), td.getPrice(), 2).doubleValue()));
+ index++;
+ totalGoodsAmount += item.getAmount();
+ }
+ pageJsonObject.put("rows", rows);
+ pagesJsonArray.add(pageJsonObject);
+ }
+
+ //设置物品数量总和
+ printData.setTotalGoodsAmount(totalGoodsAmount);
+ //设置总页数
+ printData.setPageAmount(pageAmount);
+ //设置所有页的数据记录
+ printData.setPages(pagesJsonArray);
list.add(printData);
}
}
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js
===================================================================
diff -u -r24702 -r24758
--- ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js (.../config.js) (revision 24702)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js (.../config.js) (revision 24758)
@@ -107,6 +107,8 @@
showRecyclingSaveAndPrintAndNewActionButton:true,
//回收打印的内容(1:外来器械包明细 2:发货计划),默认为1
recyclingPrintContent : 2,
+ //回收打印每页物品条数,默认为7
+ recyclingPrintRowCountPerPage : 7,
//发货科室依据,departCoding为申请科室,settleAccountsDepartCoding为结算科室,默认为申请科室
invoice_groupBy:'settleAccountsDepartCoding'
}
\ No newline at end of file