1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -612,13 +612,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     for (int j=0;j<purchaseOrderList.size();j++){
                         if (contractManagementInfoList.get(i).getContractNo().equals(purchaseOrderList.get(j).getContractNo())){
                             contractManagementInfoList.remove(contractManagementInfoList.get(i));
+                            break;
                         }
                       }
                     }
-                    if(!CollectionUtils.isEmpty(contractManagementInfoList)) {
-                        temp.add(contractManagementInfoList.get(i));
-                    }
+//                    if(!CollectionUtils.isEmpty(contractManagementInfoList)) {
+//                        temp.add(contractManagementInfoList.get(i));
+//
+//                    }
                 }
+                temp.addAll(contractManagementInfoList);
             }
             return temp;
         }
@@ -638,13 +641,15 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         for (int j=0;j<saleOrderList.size();j++){
                             if (contractManagementInfoList.get(i).getContractNo().equals(saleOrderList.get(j).getContractNo())){
                                 contractManagementInfoList.remove(contractManagementInfoList.get(i));
+                                break;
                             }
                         }
                     }
-                    if(!CollectionUtils.isEmpty(contractManagementInfoList)) {
-                        temp.add(contractManagementInfoList.get(i));
-                    }
+//                    if(!CollectionUtils.isEmpty(contractManagementInfoList)) {
+//                        temp.add(contractManagementInfoList.get(i));
+//                    }
                 }
+                temp.addAll(contractManagementInfoList);
             }
             return temp;
         }