Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r15459 -r15468 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 15459) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 15468) @@ -1470,6 +1470,13 @@ invoicePlan.setOrderByFiled(InvoicePlan.DELIVER_PARTDELIVERED); } } + // 手术预约单的特殊处理,手术预约单可以发不在申请物品列表中的物品,所以发货之后不会存在待发货状态,一定是部分发货或者已发货 + if(invoicePlan.isOperationReservationApplication()){ + if(invoicePlan.awaitDeliver()){ + invoicePlan.setDeliverStatus(InvoicePlan.DELIVERSTATUS_PARTDELIVERED); + invoicePlan.setOrderByFiled(InvoicePlan.DELIVER_PARTDELIVERED); + } + } /*计算发货状态*/ } /**