Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r35495 -r35672 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 35495) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 35672) @@ -7816,7 +7816,7 @@ sqlWheres.add(String.format(" %s ",SqlUtils.getNonStringFieldNotInCollectionsPredicate("po.id", TousseInstanceUtils.getTousseInstanceIds(scannedTousseInstances)))); //包实例产生的供应室的编码 String orgUnitCodingCondition = String.format("po.orgUnitCoding='%s'",AcegiHelper.getCurrentOrgUnitCode()); - sqlWheres.add(String.format(" %s ","orgUnitCoding='%s'",orgUnitCodingCondition)); + sqlWheres.add(String.format(" %s ",orgUnitCodingCondition)); // 非可追溯器械包,返回多个器械包实例 Collection tousseInstanceList = tousseInstanceManager .getUnTraceableTousseInstanceListByFictitiousTousseDefinition( Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r35411 -r35672 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 35411) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 35672) @@ -2915,7 +2915,7 @@ //如果不是一次性物品,即不追溯的各种类型的器械包时,要请求后台与系统实时库存数量进行对比 Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/invoiceAction!getUnTraceTousseStockByDepartCodingOrInvoicePlanId.do', - params: { invoicePlanId: selectedInvoicePlanId, departCoding: orgUnitCoding, tousseFixBarcode: barcode }, + params: { invoicePlanId: selectedInvoicePlanId, departCoding: orgUnitCoding, tousseFixBarcode: barcode , sourceWarehouseId: top.Ext.getCmp("sourceWarehouseId").getValue()}, success: function (response, options) { var obj = JSON.parse(response.responseText); if (obj.data && obj.data.stockAmount) {