Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r15936 -r15997 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15936) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15997) @@ -4417,8 +4417,14 @@ if(disposableGoodsBatchStock == null){ return buildErrorMsgJsonResult("批次库存为空!"); } + long storage = 0; + if(diposableGoods.isMiddlePackageUnitEnabled()){ + storage = disposableGoodsBatchStock.getStorage()/diposableGoods.getTransferScale(); + }else{ + storage = disposableGoodsBatchStock.getStorage(); + } // 验证库存 - if(disposableGoodsBatchStock.getStorage().intValue() <= 0){ + if(storage <= 0){ return buildErrorMsgJsonResult(String.format("[%s]库存不足!", name)); } // ***验证一次性物品*** @@ -4453,11 +4459,7 @@ data.addProperty("diposable", Constants.STR_YES); data.addProperty("batchNumber", disposableGoodsBatch.getBatchNumber()); - if(diposableGoods.isMiddlePackageUnitEnabled()){ - data.addProperty("storage", disposableGoodsBatchStock.getStorage()/diposableGoods.getTransferScale()); - }else{ - data.addProperty("storage", disposableGoodsBatchStock.getStorage()); - } + data.addProperty("storage", storage); data.addProperty("price", price); data.addProperty("fluctuationPrice", fluctuationPrice);