Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java =================================================================== diff -u -r36053 -r36058 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java (.../InvoiceOptimizeManagerImpl.java) (revision 36053) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java (.../InvoiceOptimizeManagerImpl.java) (revision 36058) @@ -1733,7 +1733,8 @@ * @param warehouseId */ @SuppressWarnings("unchecked") - void sortDisposableGoodsIdentificationList(List identificationList,List disposableGoodsBatchList,List disposableGoodsList,Long warehouseId){ + void sortDisposableGoodsIdentificationList(List identificationList, + List disposableGoodsBatchList,List disposableGoodsList,Long warehouseId){ List disposablePriorInvoicePriceList = null; //根据批次库存集合查询对应的优先发货价格的配置(DGSHLYY-24) if(CssdUtils.getSystemSetConfigByNameBool("enableDisposableGoodsCanBeShippedFirstFunction")){ @@ -1755,7 +1756,7 @@ } //如果项目有开启优先发货价格的配置项且对应所发货的一次性物品或一次性物品批次有相应的默认发货价格时,根据所配置的优先发货价格对一次性物品标识数据集合进行排序 if(CollectionUtils.isNotEmpty(disposablePriorInvoicePriceList)){ - //价格的集合(暂时不用了) + //价格的集合(仅用于扫描批次条码发货时优先发货价格时用) List priceLsit = disposablePriorInvoicePriceList.stream().map(DisposablePriorInvoicePrice::getPrice).collect(Collectors.toList()); //批次库存id对应的优先发货价格的map(如果相同的优先发货价格有多个批次库存都设置了优先发货时以前面的为准) Map> priorInvoiceToBatchStockIdListToPriceMap = new HashMap>();