[CODE]: 仓储业务删除返回提示

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/agreement/TWarehouseAgreementStorageController.java

@@ -103,7 +103,7 @@ public class TWarehouseAgreementStorageController extends BaseController {
     @Log(title = "仓储费", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
-        return toAjax(tWarehouseAgreementService.queryRemove(fId));
+        return tWarehouseAgreementService.queryRemove(fId);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/agreement/TWarehouseAgreementTaskController.java

@@ -103,7 +103,7 @@ public class TWarehouseAgreementTaskController extends BaseController {
     @Log(title = "仓储费", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
-        return toAjax(tWarehouseAgreementService.queryRemove(fId));
+        return tWarehouseAgreementService.queryRemove(fId);
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TChargeController.java

@@ -105,7 +105,7 @@ public class TChargeController extends BaseController {
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
-        return toAjax(tFeeService.queryRemove(fId));
+        return tFeeService.queryRemove(fId);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TContrastController.java

@@ -105,7 +105,7 @@ public class TContrastController extends BaseController {
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
-        return toAjax(tFeeService.queryRemove(fId));
+        return tFeeService.queryRemove(fId);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TPaymentController.java

@@ -105,7 +105,7 @@ public class TPaymentController extends BaseController {
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
-        return toAjax(tFeeService.queryRemove(fId));
+        return tFeeService.queryRemove(fId);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseGoodsTransferController.java

@@ -147,6 +147,14 @@ public class TWarehouseGoodsTransferController extends BaseController {
         return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
     }
 
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:remove')")
+    @Log(title = "详情主表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/queryRemove/{fId}")
+    public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
+        return itWarehouseBillsService.queryRemove(fId);
+    }
+
+
     /**
      *  撤销货转信息
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -143,6 +143,13 @@ public class TWarehouseInStockController extends BaseController {
         return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
     }
 
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:remove')")
+    @Log(title = "详情主表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/queryRemove/{fId}")
+    public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
+        return itWarehouseBillsService.queryRemove(fId);
+    }
+
     /**
      * 撤销入库信息
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseOutStockController.java

@@ -133,6 +133,14 @@ public class TWarehouseOutStockController extends BaseController {
         return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
     }
 
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:remove')")
+    @Log(title = "详情主表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/queryRemove/{fId}")
+    public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
+        return itWarehouseBillsService.queryRemove(fId);
+    }
+
+
     /**
      *  撤销出库信息
      */

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/ITFeeService.java

@@ -95,5 +95,5 @@ public interface ITFeeService {
 
     public AjaxResult revoke(String tfee, String tfeeDo ,LoginUser loginUser,String fBilltype);
 
-    public int queryRemove(Long fId);
+    public AjaxResult queryRemove(Long fId);
 }

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

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

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseAgreementService.java

@@ -69,5 +69,5 @@ public interface ITWarehouseAgreementService {
      */
     public int deleteTWarehouseAgreementById(Long fId);
 
-    public int queryRemove(Long fId);
+    public AjaxResult queryRemove(Long fId);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -68,6 +68,8 @@ public interface ITWarehouseBillsService {
      */
     public int deleteTWarehousebillsByIds(Long[] fIds);
 
+    public AjaxResult queryRemove(Long fId);
+
     /**
      * 删除详情主表信息
      *

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

@@ -328,8 +328,6 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             billnoDel.setBillType("WA");
             billnoDel.setBillNo(tWarehouseAgreement.getfBillno());
             billnoDelMapper.insertBillnoDel(billnoDel);
-            // 删除从表
-            tWarehouseAgreementitemsMapper.deleteByFPid(id);
         }
         return tWarehouseAgreementMapper.deleteTWarehouseAgreementByIds(fIds);
     }
@@ -346,18 +344,18 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
     }
 
     @Override
-    public int queryRemove(Long fId) {
+    public AjaxResult queryRemove(Long fId) {
         // 查询协议主表数据
         TWarehouseAgreement tWarehouseAgreement = tWarehouseAgreementMapper.selectTWarehouseAgreementById(fId);
         TWarehouseAgreementitems tWarehouseAgreementitems = new TWarehouseAgreementitems();
         tWarehouseAgreementitems.setfPid(tWarehouseAgreement.getfId());
         List<TWarehouseAgreementitems> tWarehouseAgreementitemss = tWarehouseAgreementitemsMapper.selectTWarehouseAgreementitemsList(tWarehouseAgreementitems);
         if( StringUtils.isNull(tWarehouseAgreement)){
-            return 0;
+            return AjaxResult.success("0");
         } else if(StringUtils.isNotNull(tWarehouseAgreement) && StringUtils.isEmpty(tWarehouseAgreementitemss) ){
-            return 1;
+            return AjaxResult.success("1");
         } else {
-            return 2;
+            return AjaxResult.success("2");
         }
     }
 

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

@@ -1339,6 +1339,37 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return tWarehouseBillsMapper.deleteTWarehousebillsByIds(fIds);
     }
 
+    @Override
+    public AjaxResult queryRemove(Long fId) {
+        // 查询主表明细
+        TWarehouseBills tWarehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(fId);
+
+        // 查询仓库明细从表数据
+        TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
+        tWarehousebillsitems.setfPid(tWarehousebills.getfId());
+        List<Map<String, Object>> mapList = tWarehousebillsitemsMapper.selectGoodsTransferitemsList(tWarehousebillsitems);
+
+        // 查询仓库费用明细表数据
+        TWarehousebillsfees tWarehousebillsfees = new TWarehousebillsfees();
+        tWarehousebillsfees.setfPid(tWarehousebills.getfId());
+        List<TWarehousebillsfees> warehousebillsfees = tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(tWarehousebillsfees);
+
+        // 查询附件表数据
+        TEnclosure enclosure = new TEnclosure();
+        enclosure.setfPid(tWarehousebills.getfId());
+        List<TEnclosure> enclosures = tEnclosureMapper.selectTEnclosureList(enclosure);
+        if( StringUtils.isNull(tWarehousebills)){
+            return AjaxResult.success("0");
+        } else if(StringUtils.isNotNull(tWarehousebills)
+                    && StringUtils.isEmpty(warehousebillsfees)
+                    && StringUtils.isEmpty(enclosures)
+                    && StringUtils.isEmpty(mapList) ){
+            return AjaxResult.success("1");
+        } else {
+            return AjaxResult.success("2");
+        }
+    }
+
     /**
      * 删除详情主表信息
      *

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -150,7 +150,13 @@
     </delete>
 
     <delete id="deleteTFeeByIds" parameterType="String">
-        delete from t_fee where f_id in
+        delete
+        f.*,
+        fd.*
+        from
+             t_fee  f
+        LEFT JOIN t_fee_do fd ON fd.f_pid = f.f_id
+        where f.f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">
             #{fId}
         </foreach>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseAgreementMapper.xml

@@ -167,7 +167,13 @@
     </delete>
 
     <delete id="deleteTWarehouseAgreementByIds" parameterType="String">
-        delete from t_warehouse_agreement where f_id in
+        delete
+        w.*,
+        wa.*
+        from
+             t_warehouse_agreement  w
+        LEFT JOIN t_warehouse_agreementitems wa ON wa.f_pid = w.f_id
+        where w.f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">
             #{fId}
         </foreach>