Merge remote-tracking branch 'origin/master'

src/main/java/com/imcs/admin/business/service/impl/ImportOrExportPolicyServiceImpl.java

@@ -258,7 +258,7 @@ public class ImportOrExportPolicyServiceImpl implements ImportOrExportPolicyServ
 
         List<WInventoryManagementGroup> palletCodeByMaterialCodes = wInventoryManagementDao.getPalletCodeByMaterialCodes(needMaterialCodes);
 
-        List<String> collect = palletCodeByMaterialCodes.stream().map(WInventoryManagementGroup::getWarehouseCode).collect(Collectors.toList());
+        List<String> collect = palletCodeByMaterialCodes.stream().map(WInventoryManagementGroup::getWarehouseCode).distinct().collect(Collectors.toList());
 
         // 查询出库策略
         List<ImportOrExportPolicyDto> importOrExportPolicys = importOrExportPolicyMapper.selectList(new LambdaQueryWrapper<ImportOrExportPolicyDto>().in(ImportOrExportPolicyDto::getWarehouseCode, collect).eq(ImportOrExportPolicyDto::getInOut, Status.IN.getCode()));

src/main/java/com/imcs/admin/common/wmspolicy/impl/ImportOrExportSj.java

@@ -165,11 +165,6 @@ public class ImportOrExportSj implements ImportOrExportPolicy {
         List<PolicyOutResult> manZu = ListUtils.newArrayList();
         List<PolicyOutResult> noManZu = ListUtils.newArrayList();
 
-        // 排序优先出内道
-        outPar.getWInventoryManagementGroupList().sort(((a,b)->{
-            return  a.getDistanceRoadwayNumber()-b.getDistanceRoadwayNumber();
-        }));
-
         for (WInventoryManagementGroup wInventoryManagementGroup : outPar.getWInventoryManagementGroupList()) {
             PolicyOutResult policyOutResult = BeanCopyUtil.copyPropertiesSet(wInventoryManagementGroup, PolicyOutResult::new);
             wInventoryManagementGroup.setAmount(wInventoryManagementGroup.getAmount() == null ? 0 : wInventoryManagementGroup.getAmount());
@@ -180,11 +175,13 @@ public class ImportOrExportSj implements ImportOrExportPolicy {
             }
         }
 
+        // 排序优先出内道
         manZu.sort(((o1,o2) -> {
             //从小到大
             return (o1.getDistanceRoadwayNumber()==null?0:o1.getDistanceRoadwayNumber()) - (o2.getDistanceRoadwayNumber()==null? 0:o2.getDistanceRoadwayNumber());
         }));
 
+        // 排序优先出内道
         noManZu.sort(((o1,o2) -> {
             //从小到大
             return (o1.getDistanceRoadwayNumber()==null?0:o1.getDistanceRoadwayNumber()) - (o2.getDistanceRoadwayNumber()==null? 0:o2.getDistanceRoadwayNumber());