Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp =================================================================== diff -u -r12959 -r12965 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp (.../godownOutView.jsp) (revision 12959) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp (.../godownOutView.jsp) (revision 12965) @@ -66,5 +66,13 @@ + +
+ + + + +
+ \ No newline at end of file Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java =================================================================== diff -u -r12942 -r12965 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java (.../GodownEntryTableManager.java) (revision 12942) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java (.../GodownEntryTableManager.java) (revision 12965) @@ -73,6 +73,7 @@ Map sqlWhereParamMap = gridManager .getParamFromView(parameterMap); + sqlWhereParamMap.put("type", GodownEntry.TYPE_IN); String sql = getGodownEntryListSql(sqlWhereParamMap); return gridManager.renderGrid(parameterMap, GodownEntry.class.getSimpleName(), sql, @@ -101,9 +102,10 @@ return JSONUtil.toJSONStringEx(map, true, new String[] { "itemsList" }); } private String getGodownEntryListSql(Map sqlWhereParamMap) { - String sql = "where po.type='" + GodownEntry.TYPE_IN + "' and (po.sourceId is null or po.sourceId = 0)"; + String godownEntryType = sqlWhereParamMap.get("type"); String code = sqlWhereParamMap.get("code"); String batchNumber = sqlWhereParamMap.get("batchNumber"); + String sql = "where po.type='" + godownEntryType + "' and (po.sourceId is null or po.sourceId = 0)"; int codeIndex = code.lastIndexOf("["); String specification = ""; if (StringUtils.isNotBlank(code) && code.lastIndexOf("[") != -1) { @@ -131,13 +133,14 @@ if (StringUtils.isNotBlank(startDate)) { startDate += " 00:00:00"; - sql += " and po.time >= " + dateQueryAdapter.dateAdapter(startDate); + //sql += " and po.time >= " + dateQueryAdapter.dateAdapter(startDate); } if (StringUtils.isNotBlank(endDate)) { endDate += " 23:59:59"; - sql += " and po.time <= " + dateQueryAdapter.dateAdapter(endDate); + //sql += " and po.time <= " + dateQueryAdapter.dateAdapter(endDate); } + sql += " and " + dateQueryAdapter.dateAreaSql("po.time", startDate, endDate); sql += " and " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseID", wareHouseManager.getCurrentUserOrgUnitWarehouseIds()); return sql; } @@ -150,9 +153,14 @@ */ public String findGodownEntryTableList2( Map> parameterMap) { + Map sqlWhereParamMap = gridManager + .getParamFromView(parameterMap); - String sql = "where po.type='" + GodownEntry.TYPE_OUT + "' and (po.sourceId is null or po.sourceId = 0)"; - sql += " and " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseID", wareHouseManager.getCurrentUserOrgUnitWarehouseIds()); + sqlWhereParamMap.put("type", GodownEntry.TYPE_OUT); + String sql = getGodownEntryListSql(sqlWhereParamMap); + + //String sql = "where po.type='" + GodownEntry.TYPE_OUT + "' and (po.sourceId is null or po.sourceId = 0)"; + //sql += " and " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseID", wareHouseManager.getCurrentUserOrgUnitWarehouseIds()); return gridManager.renderGrid(parameterMap, GodownEntry.class.getSimpleName(), sql, new String[] { "itemsList" }); Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r12961 -r12965 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 12961) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 12965) @@ -1415,9 +1415,9 @@ LODOP.PREVIEW(); } } -//一次性物品入库单 +//一次性物品入\退库单列表 function printGodownEntryList(obj,printType) { - formTypeOfPrinted = "godownEntryList"; + formTypeOfPrinted = obj.formTypeOfPrinted; print2(obj); if(printType == 0){//直接打印 LODOP.PRINT(); Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js =================================================================== diff -u -r12959 -r12965 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js (.../commonEntry.js) (revision 12959) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js (.../commonEntry.js) (revision 12965) @@ -103,4 +103,37 @@ godownEntrysInfo.category = '共'+godownEntrysInfo.totalRows+'种'; printGodownEntryInfo(godownEntrysInfo, type); } + //打印入/退库单列表 + this.onPrintEntryList = function(mapfilter,entryType){ + top.Ext.MessageBox.confirm("请确认", "要打印" + entryType + "列表吗？", + function(btn) { + if (btn == 'yes') { + printGodownEntryListInternal(mapfilter,0,entryType); + } + }); + + } + function printGodownEntryListInternal(mapfilter,printType,entryType){ + top.Ext.MessageBox.show({ + title:'请等待', + msg:'打印中……', + width:350, + progress:true, + closable:false + }); + GodownEntryTableManager.loadGodownEntryListPrintData(mapfilter,function(result){ + if(result && result != ""){ + var rs = Ext.decode(result); + if(rs.success = true){ + if(entryType == '退库单'){ + rs.formTypeOfPrinted = 'godownEntryOutList'; + }else{ + rs.formTypeOfPrinted = 'godownEntryList'; + } + printGodownEntryList(rs,printType); + } + } + hideMessageBox(true); + }); + } } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js =================================================================== diff -u -r12959 -r12965 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js (.../godownOutView.js) (revision 12959) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js (.../godownOutView.js) (revision 12965) @@ -61,7 +61,35 @@ } } } - +//全部一次性物品 +var allDiposableGoodsStore = new Ext.data.Store({ + proxy : new Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do?allItems=yes', + method : 'POST' + }), + reader : new Ext.data.JsonReader({ + totalProperty : 'totalCount', + root : 'data' + }, [ + {name : 'id',mapping : 'id'}, + {name : 'spelling',mapping : 'spelling'}, + {name : 'name',mapping : 'name'}, + {name : 'displayName',mapping : 'displayName'}, + {name : 'referencePrice',mapping : 'referencePrice'} + ]) +}); +batchNumStore = new top.Ext.data.Store({ + proxy : new top.Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDisposableGoodsBatchList.do', + method : 'POST' + }), + reader : new top.Ext.data.JsonReader({ + fields : [ + {name : 'id'}, + {name : 'batchNumber'} + ] + }) +}); var wareHouseStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getWareHouseData.do', @@ -873,6 +901,21 @@ handler : function(){ commonEntry.onPrintEntryDetail(grid,entityName) } + },'-',{ + text : '打印列表', +// hidden : SSTS_WarehouseEntry_Delete, + iconCls : 'icon_print', + handler : function() { + //加载打印数据 + var map = {}; + map["code"] = Ext.getCmp('code').getValue(); + map["batchNumber"] = Ext.getCmp('batchNumber').getValue(); + map["startDate"] = $Id('startDate').value; + map["endDate"] = $Id('endDate').value; + map["type"] = entityName; + + commonEntry.onPrintEntryList(map,entityName); + } }]; grid = new Ext.ux.ForgonPageGrid( { @@ -895,9 +938,171 @@ null ); + function initQueryValueAndReload() { + var startDate = $Id('startDate').value; + var endDate = $Id('endDate').value; + var code = Ext.getCmp('code').getValue(); + var batchNumber = Ext.getCmp('batchNumber').getValue(); + if(startDate || endDate){ + if(!compareDate(startDate,endDate)){ + showResult("开始时间不能大于结束时间"); + return; + } + } + + $Id('parm_s_startDate').value = startDate; + $Id('parm_s_endDate').value = endDate; + $Id('parm_s_code').value = code; + $Id('parm_s_batchNumber').value = batchNumber; + grid.dwrReload(); + } + var dt = new Date(); + var v = dt.getMonth()+1; + if(v < 10){ + v = "0" + (dt.getMonth()+1); + } + var startDayofMonth = dt.getFullYear() + "/" + v + "/01"; + var form = new Ext.Panel({ + id : 'northPanel', + layout : 'table', + frame : true, + region : 'north', + border : false, + bodyBorder : false, + layoutConfig : {columns : 2}, + height : 63, + items : [{ + width :900, + layout : 'column', + items:[{ + columnWidth : .73, + layout : 'form', + labelWidth : 60, + items : [{ + fieldLabel : '关键字', + xtype : 'combo', + id : 'code', + name : 'code', + queryParam : 'spell', + minChars : 0, + valueField : 'id', + displayField : 'displayName', + width : 600, + store : allDiposableGoodsStore, + forceSelection : true, + lazyInit : true, + triggerAction : 'all', + hideTrigger : true, + typeAhead : false, + allowBlank : true, + anchor : '97%', + listeners : { + select : function(combo, record, index) { + Ext.getCmp('batchNumber').setValue(); + Ext.getCmp('code').setValue(record.data.name); + batchNumStore.baseParams['disposableGoodsID'] = record.data.id; + batchNumStore.load(); + } + } + }] + },{ + columnWidth : .25, + layout : 'form', + labelWidth : 60, + items : [{ + xtype : 'combo', + id : 'batchNumber', + name : 'batchNumber', + fieldLabel : '物品批次', + maxLength : '30', + minChars : 0, + valueField : 'batchNumber', + displayField : 'batchNumber', + store : batchNumStore, + forceSelection : true, + lazyInit : false, + triggerAction : 'all', + hideTrigger : false, + typeAhead : false, + selectOnFocus :true, + anchor : '94%', + listeners :{ + select:function(combo, record, index ){ + var batchNumber = record.data.batchNumber; + Ext.getCmp('batchNumber').setValue(batchNumber); + } + } + }] + },{ + columnWidth : .5, + layout : 'form', + labelWidth : 60, + items : [{ + xtype : 'datefield', + fieldLabel : '开始日期', + name : 'startDate', + id : 'startDate', + readOnly : false, + altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', + editable : false, + format : 'Y-m-d', + value:new Date(startDayofMonth), + anchor : '94%' + }] + },{ + columnWidth : .5, + layout : 'form', + labelWidth : 60, + items : [{ + xtype : 'datefield', + fieldLabel : '结束日期', + name : 'endDate', + id : 'endDate', + readOnly : false, + altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', + editable : false, + format : 'Y-m-d', + value:new Date(), + anchor : '94%' + }] + }] + },{ + width :150, + layout : 'column', + items : [{ + columnWidth : .5, + layout :'form', + items : [{ + xtype : 'button', + text : '查询', + minWidth : 70, + iconCls : 'icon_search', + handler : function() { + initQueryValueAndReload(); + } + }] + },{ + columnWidth : .5, + layout :'form', + items : [{ + xtype : 'button', + text : '重置', + minWidth : 70, + iconCls : 'icon_set', + handler : function() { + $Id('code').value = ""; + $Id('startDate').value = ""; + $Id('endDate').value = ""; + Ext.getCmp('batchNumber').setValue(""); + } + }] + }] + }] + }); + var viewport = new Ext.Viewport( { layout : 'border', - items : [{ + items : [form,{ region : 'center', margins : '0 0 0 0', layout : 'fit', Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js =================================================================== diff -u -r12960 -r12965 --- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js (.../printConfig.js) (revision 12960) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js (.../printConfig.js) (revision 12965) @@ -1,4 +1,28 @@ - +var godownEntryOutListConfig = { + headerFooter : [ + // 页眉名称 + {label : "复大肿瘤医院退库单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]}, + {label : "退库日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]} + //{label : "科室：", dataIndex : 'depart', fontSize : 9, position : ["30","2%","90%",5]} + ], + //currentPageNumber : {label : "第#页", fontSize : 9, position : ["1cm","40%","90%",5]}, + //totalPageAmount : {label : "共&页", fontSize : 9, position : ["1cm","45%","90%",5]}, + goodsTable :{ + rowHeight : 20, + //position : ["50","1%","96%","6.0cm"], + fontSize:10, + position : ["1.5cm","0.2cm","99%","29cm"], + headRepeat : true, + columns : [ + {header : "单号", dataIndex : 'serialNumber', width : 60, align : 'center'}, + {header : "操作员", dataIndex : 'operator', width : 60, align : 'center'}, + {header : "退库时间", dataIndex : 'time', width : 110, align : 'center'}, + {header : "金额", dataIndex : 'totalPrice', width : 75, align : 'center'}, + {header : "供应商", dataIndex : 'supplierName', width : 285, align : 'center'}, + {header : "备注", dataIndex : 'remark', width : 160, align : 'center'} + ] + } +} var godownEntryListPrintConfig = { headerFooter : [ // 页眉名称 @@ -979,5 +1003,7 @@ idCardSmallLabel:idCardSmallLabelConfig, // ,diposableGoodsBatchStock:diposableGoodsBatchStockConfig // 入库单列表 - godownEntryList : godownEntryListPrintConfig + godownEntryList : godownEntryListPrintConfig, + //退库单列表 + godownEntryOutList : godownEntryOutListConfig }; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r12959 -r12965 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12959) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12965) @@ -1232,30 +1232,30 @@ } } // 打印入库单列表 -function printGodownEntryListInternal(printType){ - top.Ext.MessageBox.show({ - title:'请等待', - msg:'打印中……', - width:350, - progress:true, - closable:false - }); - //加载打印数据 - var map = {}; - map["code"] = Ext.getCmp('code').getValue(); - map["batchNumber"] = Ext.getCmp('batchNumber').getValue(); - map["startDate"] = $Id('startDate').value; - map["endDate"] = $Id('endDate').value; - GodownEntryTableManager.loadGodownEntryListPrintData(map,function(result){ - if(result && result != ""){ - var rs = Ext.decode(result); - if(rs.success = true){ - printGodownEntryList(rs,printType); - } - } - hideMessageBox(true); - }); -} +//function printGodownEntryListInternal(printType){ +// top.Ext.MessageBox.show({ +// title:'请等待', +// msg:'打印中……', +// width:350, +// progress:true, +// closable:false +// }); +// //加载打印数据 +// var map = {}; +// map["code"] = Ext.getCmp('code').getValue(); +// map["batchNumber"] = Ext.getCmp('batchNumber').getValue(); +// map["startDate"] = $Id('startDate').value; +// map["endDate"] = $Id('endDate').value; +// GodownEntryTableManager.loadGodownEntryListPrintData(map,function(result){ +// if(result && result != ""){ +// var rs = Ext.decode(result); +// if(rs.success = true){ +// printGodownEntryList(rs,printType); +// } +// } +// hideMessageBox(true); +// }); +//} // 打印，目前只支持单个打印 //function batchPrintGodownEntrys(ids, printType){ // if(ids == null) @@ -1529,17 +1529,19 @@ // }); } },'-',{ - text : '打印列表', // hidden : SSTS_WarehouseEntry_Delete, iconCls : 'icon_print', handler : function() { - top.Ext.MessageBox.confirm("请确认", "要打印入库单列表吗？", - function(btn) { - if (btn == 'yes') { - printGodownEntryListInternal(0); - } - }); + //加载打印数据 + var map = {}; + map["code"] = Ext.getCmp('code').getValue(); + map["batchNumber"] = Ext.getCmp('batchNumber').getValue(); + map["startDate"] = $Id('startDate').value; + map["endDate"] = $Id('endDate').value; + map["type"] = entityName; + + commonEntry.onPrintEntryList(map,entityName); } },'-', { text : '导入入库单EXCEL', @@ -1725,6 +1727,7 @@ $Id('code').value = ""; $Id('startDate').value = ""; $Id('endDate').value = ""; + Ext.getCmp('batchNumber').setValue(""); } }] }]