Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpressInvoiceApplicationGoodsVo.java =================================================================== diff -u -r20538 -r20542 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpressInvoiceApplicationGoodsVo.java (.../ExpressInvoiceApplicationGoodsVo.java) (revision 20538) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpressInvoiceApplicationGoodsVo.java (.../ExpressInvoiceApplicationGoodsVo.java) (revision 20542) @@ -17,7 +17,7 @@ */ private String depart; private String departCoding; - private int appAmount;// 待发货数量（部分发货） + private int count;// 待发货数量（部分发货） private Set departCodingSet = new HashSet(); public String getDepart() { @@ -36,12 +36,12 @@ this.departCoding = departCoding; } - public int getAppAmount() { - return appAmount; + public int getCount() { + return count; } - public void setAppAmount(int appAmount) { - this.appAmount = appAmount; + public void setCount(int count) { + this.count = count; } public Set getDepartCodingSet() { Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r20538 -r20542 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 20538) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 20542) @@ -4937,7 +4937,7 @@ datas.put(depart, vo); } vo.getDepartCodingSet().add(departCoding); - vo.setAppAmount(vo.getAppAmount()+notSendAmount); + vo.setCount(vo.getCount()+notSendAmount); if(!invoicePlan.readed()){ invoicePlanIds.add(invoicePlan.getId()); } Index: ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.js =================================================================== diff -u -r20529 -r20542 --- ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.js (.../expressInvoiceView.js) (revision 20529) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.js (.../expressInvoiceView.js) (revision 20542) @@ -12,6 +12,7 @@ var appFormType = ''; var invoiceDepartGroups = ''; var appDepartCode = ''; +var selTousseDefinitionId = null; //申请科室Store var appDepartJsonStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ @@ -89,6 +90,7 @@ var departCode = records[0].data['departCode']; var depart = records[0].data['depart']; openMode = INVOICE_FORM_OPEN_MODE_CLICKITEM; + selTousseDefinitionId = records[0].data['tousseDefinitionId']; addAndEditInvoicePlan(departCode,depart); } /** @@ -113,6 +115,7 @@ openInvoicePlanByBarcode(barcode); } function openInvoicePlanByBarcode(barcode){ + return; if(isUndefinedOrNullOrEmpty(barcode)){ showResult("请扫描科室条码或申请单条码"); return; @@ -252,6 +255,7 @@ reader : new Ext.data.JsonReader({ fields : [ {name : 'tousseName'} + ,{name : 'tousseDefinitionId'} ,{name : 'departAmount'} ,{name : 'invoicePlanAmount'} ,{name : 'appAmount'} @@ -449,9 +453,4 @@ //globalOnKeyDown(globalOnKeyDownProcessor); globalOnKeyDown(openInvoicePlanByBarcode); window.focus(); - - // 自动打开科室发货界面 - if(openMode == INVOICE_FORM_OPEN_MODE_CLICKRETURNRECORD && !isUndefinedOrNullOrEmpty(returnRecordId)){ - addAndEditInvoicePlan(param_departCode,param_depart); - } }); \ No newline at end of file Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r20538 -r20542 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 20538) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 20542) @@ -1256,7 +1256,11 @@ @Override public Collection getInvoicePlanListForExpressInvoiceWaitDeliverGoods( String orgUnitCoding, String applyDate, String tousseType,String tousseDefinitionId){ - List departCodes = Arrays.asList(StringUtils.split(orgUnitCoding, ';')); + + List departCodes = null; + if(StringUtils.isNotBlank(orgUnitCoding)){ + departCodes = Arrays.asList(StringUtils.split(orgUnitCoding, ';')); + } String sql = buildSqlForGetInvoicePlanByOrgUnitCodingsAndTousseType(departCodes, applyDate, tousseType); String tousseSql = String.format(" po.id in (select invoicePlan.id from TousseItem where (%s) )",SqlUtils.getNonStringFieldPredicate("tousseDefinitionId", tousseDefinitionId)); Index: ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceForm.js =================================================================== diff -u -r20509 -r20542 --- ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceForm.js (.../expressInvoiceForm.js) (revision 20509) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceForm.js (.../expressInvoiceForm.js) (revision 20542) @@ -1196,9 +1196,9 @@ var rd = new Ext.data.JsonReader( { fields : [ {name : 'id'}, - {name : 'barcode'}, - {name : 'name'}, - {name : 'ttsName'}, + {name : 'depart'}, + {name : 'departCoding'}, + {name : 'count'}, {name : 'tousseItems'}, {name : 'scannedMaterialAmount'}, {name : 'showTousseName'}, @@ -1265,7 +1265,7 @@ //申请物品 recyclingapplicationStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/invoiceAction!loadDepartApplicationAllGoodsByCondition.do', + url : WWWROOT + '/disinfectSystem/invoiceAction!loadExpressInvoiceWaitDeliverGoods.do', method : 'POST' }), reader : rd, @@ -1289,6 +1289,7 @@ recyclingapplicationStore.baseParams['invoicePlanId'] = selectedInvoicePlanId; recyclingapplicationStore.baseParams['applyDate'] = selectedApplyDate; recyclingapplicationStore.baseParams['tousseType'] = encodeURI(selectedTousseType); + recyclingapplicationStore.baseParams['tousseDefinitionId'] = selTousseDefinitionId; }); recyclingapplicationStore.load(); @@ -1299,31 +1300,10 @@ // sendOutGoodsStore.load(); var recyclingapplicationCm = new Ext.grid.ColumnModel([ - {header : "申请的物品",dataIndex : 'showTousseName',width : 180,menuDisabled: true}, - {header : "name",dataIndex : 'name',hidden : true,menuDisabled: true}, - {header : "待发",dataIndex : 'count',width : 50, menuDisabled: true/*, - editor : new Ext.form.TextField( { - allowBlank : false, - listeners : { - focus : function(thiz){ - thiz.selectText(); - } - } - })*/ - }, - {header : '加急',id : 'urgentAmount',dataIndex : 'urgentAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount}, + {header : "申请的科室",dataIndex : 'depart',width : 180,menuDisabled: true}, + {header : "待发",dataIndex : 'count',width : 50, menuDisabled: true}, {header : '实发',id : 'tempAmount',dataIndex : 'tempAmount',width : 50,value : 0, menuDisabled: true,renderer:formatScannedAmount}, - {header : '误差',id : 'errorAmount',dataIndex : 'errorAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount}, - {header : '库存',id : 'storage',dataIndex : 'storage',width : 50,value : 0, menuDisabled: true,renderer:formatStorage}, - {id : 'diposable',header : "是否一次性材料",dataIndex : 'diposable',hidden :true}, - {id :'applicationAmount',header : "最大发货数量",dataIndex : 'applicationAmount',hidden : true,width :150} -// {id : 'deleteItem',header:'删除',hidden :true,width :40,menuDisabled: true, -// renderer: function(v,p,record){ -// var str = ""; -// return str; -// }, -// dataIndex:'button' -// } + {header : '误差',id : 'errorAmount',dataIndex : 'errorAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount} ]); var recyclingErrorCm = new Ext.grid.ColumnModel([