[CODE]: 删除提示

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -254,6 +254,8 @@ public class TFeeServiceImpl implements ITFeeService {
             billnoDel.setBillType(tFee.getfBilltype());
             billnoDel.setBillNo(tFee.getfBillno());
             billnoDelMapper.insertBillnoDel(billnoDel);
+            // 删除从表
+            tFeeDoMapper.deleteByFPid(id);
         }
         return tFeeMapper.deleteTFeeByIds(fIds);
     }
@@ -410,14 +412,15 @@ public class TFeeServiceImpl implements ITFeeService {
     @Override
     public int queryRemove(Long fId) {
         TFee tFee=tFeeMapper.selectTFeeById(fId);
-        // 查询从表数据
         TFeeDo tFeeDo = new TFeeDo();
         tFeeDo.setfPid(tFee.getfId());
         List<TFeeDo> tFeeDoList=  tFeeDoMapper.selectTFeeDoList(tFeeDo);
-        if(tFeeDoList!=null && tFeeDoList.size()>0){
-            return 1;
-        }else{
+        if( StringUtils.isNull(tFee)){
             return 0;
+        } else if(StringUtils.isNotNull(tFee) && StringUtils.isEmpty(tFeeDoList) ){
+            return 1;
+        } else {
+            return 2;
         }
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseAgreementServiceImpl.java

@@ -328,6 +328,8 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             billnoDel.setBillType("WA");
             billnoDel.setBillNo(tWarehouseAgreement.getfBillno());
             billnoDelMapper.insertBillnoDel(billnoDel);
+            // 删除从表
+            tWarehouseAgreementitemsMapper.deleteByFPid(id);
         }
         return tWarehouseAgreementMapper.deleteTWarehouseAgreementByIds(fIds);
     }
@@ -350,10 +352,12 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
         TWarehouseAgreementitems tWarehouseAgreementitems = new TWarehouseAgreementitems();
         tWarehouseAgreementitems.setfPid(tWarehouseAgreement.getfId());
         List<TWarehouseAgreementitems> tWarehouseAgreementitemss = tWarehouseAgreementitemsMapper.selectTWarehouseAgreementitemsList(tWarehouseAgreementitems);
-        if (StringUtils.isNotEmpty(tWarehouseAgreementitemss)) {
-            return 1;
-        }else{
+        if( StringUtils.isNull(tWarehouseAgreement)){
             return 0;
+        } else if(StringUtils.isNotNull(tWarehouseAgreement) && StringUtils.isEmpty(tWarehouseAgreementitemss) ){
+            return 1;
+        } else {
+            return 2;
         }
     }