Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16454 -r16457 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16454) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16457) @@ -69,6 +69,7 @@ import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock; import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem; import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem; +import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecord; import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecordDiposableGoodsItem; @@ -2388,6 +2389,17 @@ } } /** + * 获取申请记录 + */ + public InvoicePlan getInvoicePlan(String invoicePlanId){ + if(StringUtils.isNumeric(invoicePlanId)){ + return (InvoicePlan) objectDao.getByProperty( + InvoicePlan.class.getSimpleName(), "id", Long.valueOf(invoicePlanId)); + }else{ + return null; + } + } + /** * 获取器械包篮筐条码 */ public String getClassifyBasketBarcodes(TousseInstance tousseInstance){ Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java =================================================================== diff -u -r16454 -r16457 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 16454) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 16457) @@ -14,6 +14,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; +import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; @@ -336,5 +337,9 @@ * 获取器械包篮筐条码 */ public String getClassifyBasketBarcodes(TousseInstance tousseInstance); + /** + * 获取申请记录 + */ + public InvoicePlan getInvoicePlan(String invoicePlanId); } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16454 -r16457 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16454) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16457) @@ -4960,12 +4960,15 @@ TousseInstance tousseInstance = tis.get(0); PackingTask packingTask = new PackingTask(); RecyclingRecord rr = tousseInstanceManager.getRecylingRecord(tousseInstance.getRecyclingRecordId() + ""); + InvoicePlan invoicePlan = tousseInstanceManager.getInvoicePlan(tousseInstance.getInvoicePlanID() + ""); if(rr != null){ - packingTask.setDepartment(tousseInstance.getDepart()); - packingTask.setDepartCoding(tousseInstance.getDepartCoding()); packingTask.setStartTime(rr.getRecyclingTime()); packingTask.setSourceId(rr.getId()); } + if(invoicePlan != null){ + packingTask.setDepartment(invoicePlan.getDepart()); + packingTask.setDepartCoding(tousseInstance.getDepartCoding()); + } // SourceId 要么是回收单id,要么是申请单id,没有回收单时,用申请单id. if(packingTask.getSourceId() == null){ packingTask.setSourceId(tousseInstance.getInvoicePlanID());