Browse Source

账单明细数据导出问题,其他账务无法删除问题

liyuan 1 month ago
parent
commit
18e10d775d

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehousebillsfeesController.java

@@ -142,7 +142,7 @@ public class TWarehousebillsfeesController extends BaseController {
      */
     @GetMapping("/queryMenuExport")
     public AjaxResult queryMenuExport(TWarehousebillsfees tWarehousebillsfees) {
-        String excelName = "";
+        String excelName = "账单明细";
         if (ObjectUtils.isNotNull(tWarehousebillsfees.getfDc())){
             if (tWarehousebillsfees.getfDc().equals("D")) {
                 excelName = "账单明细-收";

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

@@ -2536,8 +2536,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TWarehousebillsfees fees = new TWarehousebillsfees();
         fees.setfPid(fId);
         List<TWarehousebillsfees> feesList = tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(fees);
-        if (StringUtils.isEmpty(feesList)) {
-            return AjaxResult.error("未找到费用信息,请确认是否存在");
+        if (!StringUtils.isEmpty(feesList)) {
+            return AjaxResult.error("存在费用信息,不可删除!");
         }
         for (TWarehousebillsfees fee : feesList) {
             if (StringUtils.isNotEmpty(fee.getfStatementNo()) || StringUtils.isNotEmpty(fee.getfStlamountNo())) {