Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java =================================================================== diff -u -r14204 -r14224 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java (.../TousseItem.java) (revision 14204) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java (.../TousseItem.java) (revision 14224) @@ -174,13 +174,31 @@ } public void setUrgentAmount(Integer urgentAmount) { - this.urgentAmount = urgentAmount; + if(urgentAmount == null){ + this.urgentAmount = 0; + }else{ + this.urgentAmount = urgentAmount; + } } public void setUrgent(String urgent) { this.urgent = urgent; } + public int safelyGetUrgentAmount() { + if (urgentAmount != null) { + return urgentAmount.intValue(); + } + return 0; + } + + public boolean urgent() { + if (Constants.STR_YES.equals(urgent)) { + return true; + } + return false; + } + public String getUnit() { return unit; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java =================================================================== diff -u -r13877 -r14224 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java (.../SubmitInvoiceContext.java) (revision 13877) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java (.../SubmitInvoiceContext.java) (revision 14224) @@ -29,6 +29,7 @@ */ public class SubmitInvoiceContext { private SupplyRoomConfig supplyRoomConfig; + private boolean sendOnlyUrgentGoods;// 只发送紧急物品 private String invoiceMode = ""; private String departCode = ""; private String sourceWarehouseId = ""; @@ -62,6 +63,14 @@ this.supplyRoomConfig = supplyRoomConfig; } + public boolean isSendOnlyUrgentGoods() { + return sendOnlyUrgentGoods; + } + + public void setSendOnlyUrgentGoods(boolean sendOnlyUrgentGoods) { + this.sendOnlyUrgentGoods = sendOnlyUrgentGoods; + } + public String getInvoiceMode() { return invoiceMode; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r14204 -r14224 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 14204) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 14224) @@ -297,7 +297,35 @@ public void setDeliverStatus(String deliverStatus) { this.deliverStatus = deliverStatus; } + + public boolean awaitDeliver() { + if (DELIVERSTATUS_AWAITDELIVER.equals(deliverStatus)) { + return true; + } + return false; + } + public boolean partDelivered() { + if (DELIVERSTATUS_PARTDELIVERED.equals(deliverStatus)) { + return true; + } + return false; + } + + public boolean delivered() { + if (DELIVERSTATUS_DELIVERED.equals(deliverStatus)) { + return true; + } + return false; + } + + public boolean deliverEnd() { + if (STATUS_END.equals(deliverStatus)) { + return true; + } + return false; + } + public String getType() { return type; }