Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r15471 -r15472 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15471) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15472) @@ -1830,45 +1830,45 @@ } private void writebackForGDSY(List invoiceList) { -// if(StringUtils.equalsIgnoreCase(CssdUtils.getConfigProperty("project"), "gdsy") && writeBackInventoryDao != null){ -// if(CollectionUtils.isNotEmpty(invoiceList)){ -// try{ -// for (Invoice invoice : invoiceList) { -// -// /*4 -// */ -// //发货单的发货科室-供应室 -// OrgUnit invoiceCssdOrgUnit = (OrgUnit)objectDao.getByProperty(OrgUnit.class.getSimpleName(), "orgUnitCoding", invoice.getOrgUnitCoding()); -// //发货单接收科室-申请单的临床科室 -// OrgUnit invoiceClinicOrgUnit = (OrgUnit)objectDao.getByProperty(OrgUnit.class.getSimpleName(), "orgUnitCoding", invoice.getInvoicePlan().getDepartCoding()); -// String xmlParam = "4" + invoiceCssdOrgUnit.getIdFromHisSync() + "" -// + "" + invoiceClinicOrgUnit.getIdFromHisSync() + "" -// + "INVOICE_" + invoice.getSerialNumber() + ""; -// -// if(CollectionUtils.isNotEmpty(invoice.getInvoiceItem())){ -// for(InvoiceItem invoiceItem : invoice.getInvoiceItem()){ -// if(Constants.STR_YES.equals(invoiceItem.getDiposable()) && DatabaseUtil.isPoIdValid(invoiceItem.getDisposableGoodsId())){ -// DisposableGoods disposableGoods = diposableGoodsManager.getDisposableGoodsById(String.valueOf(invoiceItem.getDisposableGoodsId())); -// DisposableGoodsBatch disposableGoodsBatch = diposableGoodsManager.getDisposableGoodsBatchById(invoiceItem.getDisposableGoodsBatchId()); -// xmlParam += "" + disposableGoods.getIdFromHisSync() + "" -// + "" + disposableGoodsBatch.getBatchIdFromHisSync() + "" -// + "" + invoiceItem.getAmount() + ""; -// } -// } -// xmlParam += ""; -// String result = writeBackInventoryDao.insertWriteBackForCommon(xmlParam); -// JSONObject jsonReturn = JSONObject.fromObject(result); -// if(!jsonReturn.optBoolean("success")){ -// throw new RuntimeException(jsonReturn.optString("message")); -// } -// } -// } -// }catch(Exception e){ -// e.printStackTrace(); -// throw new RuntimeException(e); -// } -// } -// } + if(StringUtils.equalsIgnoreCase(CssdUtils.getConfigProperty("project"), "gdsy") && writeBackInventoryDao != null){ + if(CollectionUtils.isNotEmpty(invoiceList)){ + try{ + for (Invoice invoice : invoiceList) { + + /*4 + */ + //发货单的发货科室-供应室 + OrgUnit invoiceCssdOrgUnit = (OrgUnit)objectDao.getByProperty(OrgUnit.class.getSimpleName(), "orgUnitCoding", invoice.getOrgUnitCoding()); + //发货单接收科室-申请单的临床科室 + OrgUnit invoiceClinicOrgUnit = (OrgUnit)objectDao.getByProperty(OrgUnit.class.getSimpleName(), "orgUnitCoding", invoice.getDepartCoding()); + String xmlParam = "4" + invoiceCssdOrgUnit.getIdFromHisSync() + "" + + "" + invoiceClinicOrgUnit.getIdFromHisSync() + "" + + "INVOICE_" + invoice.getSerialNumber() + ""; + + if(CollectionUtils.isNotEmpty(invoice.getInvoiceItem())){ + for(InvoiceItem invoiceItem : invoice.getInvoiceItem()){ + if(Constants.STR_YES.equals(invoiceItem.getDiposable()) && DatabaseUtil.isPoIdValid(invoiceItem.getDisposableGoodsId())){ + DisposableGoods disposableGoods = diposableGoodsManager.getDisposableGoodsById(String.valueOf(invoiceItem.getDisposableGoodsId())); + DisposableGoodsBatch disposableGoodsBatch = diposableGoodsManager.getDisposableGoodsBatchById(invoiceItem.getDisposableGoodsBatchId()); + xmlParam += "" + disposableGoods.getIdFromHisSync() + "" + + "" + disposableGoodsBatch.getBatchIdFromHisSync() + "" + + "" + invoiceItem.getAmount() + ""; + } + } + xmlParam += ""; + String result = writeBackInventoryDao.insertWriteBackForCommon(xmlParam); + JSONObject jsonReturn = JSONObject.fromObject(result); + if(!jsonReturn.optBoolean("success")){ + throw new RuntimeException(jsonReturn.optString("message")); + } + } + } + }catch(Exception e){ + e.printStackTrace(); + throw new RuntimeException(e); + } + } + } } public void submitInvoiceForCustom(JSONObject params) {