优化集港删除接口

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

@@ -56,7 +56,6 @@ public class TContainerPortController extends BaseController {
      * @return
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:containerPort:edit')")
-    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/{fId}")
     @RepeatSubmit
     public AjaxResult getInfo (@PathVariable("fId") Long fId) {
@@ -74,7 +73,6 @@ public class TContainerPortController extends BaseController {
      * @return
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:containerPort:add')")
-    @DataScope(deptAlias = "d", userAlias = "u")
     @PostMapping("/saveContainerPort")
     @RepeatSubmit
     public AjaxResult saveContainerPort (@RequestParam("warehouseBills") String tWarehouseBills,
@@ -93,14 +91,30 @@ public class TContainerPortController extends BaseController {
      * @return
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:containerPort:add')")
-    @DataScope(deptAlias = "d", userAlias = "u")
     @PostMapping("/revokeContainerPort/{fId}")
     @RepeatSubmit
     public AjaxResult revokeContainerPort (@PathVariable("fId") Long fId) {
         if (StringUtils.isNull(fId)) {
             return AjaxResult.error("未找到主表保存信息，请确认");
         }
-        return itWarehouseBillsService.revokeContainerPort(fId);
+        String type = "revoke";
+        return itWarehouseBillsService.revokeContainerPort(fId, type);
+    }
+
+    /**
+     *  集港业务删除接口
+     * @param fId   主表业务
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:containerPort:remove')")
+    @PostMapping("/removeContainerPort/{fId}")
+    @RepeatSubmit
+    public AjaxResult removeContainerPort (@PathVariable("fId") Long fId) {
+        if (StringUtils.isNull(fId)) {
+            return AjaxResult.error("未找到主表保存信息，请确认");
+        }
+        String type = "remove";
+        return itWarehouseBillsService.revokeContainerPort(fId, type);
     }
 
     /**
@@ -111,7 +125,6 @@ public class TContainerPortController extends BaseController {
      * @return
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:containerPort:add')")
-    @DataScope(deptAlias = "d", userAlias = "u")
     @PostMapping("/addContainerPort")
     @RepeatSubmit
     public AjaxResult addContainerPort (@RequestParam("warehouseBills") String tWarehouseBills,

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

@@ -385,7 +385,8 @@ public interface ITWarehouseBillsService {
     /**
      *  集港业务撤销
      * @param fId       主表id
+     * @param type
      * @return
      */
-    public AjaxResult revokeContainerPort(Long fId);
+    public AjaxResult revokeContainerPort(Long fId, String type);
 }

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

@@ -1468,18 +1468,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      * 集港业务撤销
      *
      * @param fId 主表id
+     * @param type
      * @return
      */
     @Override
     @Transactional
-    public AjaxResult revokeContainerPort(Long fId) {
+    public AjaxResult revokeContainerPort(Long fId, String type) {
         TWarehouseBills warehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(fId);
         if (StringUtils.isNull(warehouseBills)) {
             return AjaxResult.error("未找到主表信息，请确认是否存在");
         }
-        if (warehouseBills.getfBillstatus() != 6L) {
-            return AjaxResult.error("主表状态有误，请确认状态是否已提交");
-        }
         TWarehousebillsfees warehousebillsfees = new TWarehousebillsfees();
         warehousebillsfees.setfPid(fId);
         List<TWarehousebillsfees> warehousebillsfeesList = tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(warehousebillsfees);
@@ -1491,10 +1489,25 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("费用信息存在已对账或已收费付费操作，无法撤销");
             }
-            fee.setfStatus("2");
-            fee.setUpdateTime(new Date());
-            fee.setUpdateBy(SecurityUtils.getUsername());
-            tWarehousebillsfeesMapper.updateTWarehousebillsfees(fee);
+            if ("remove".equals(type)) {
+                tWarehousebillsfeesMapper.deleteTWarehousebillsfeesById(fee.getfId());
+            } else {
+                fee.setfStatus("2");
+                fee.setUpdateTime(new Date());
+                fee.setUpdateBy(SecurityUtils.getUsername());
+                tWarehousebillsfeesMapper.updateTWarehousebillsfees(fee);
+            }
+        }
+        if ("remove".equals(type)) {
+            if (warehouseBills.getfBillstatus() != 2L) {
+                return AjaxResult.error("主表状态有误，请确认状态是否为暂存状态");
+            }
+            tWarehouseBillsMapper.deleteTWarehousebillsById(fId);
+            return AjaxResult.success();
+        } else {
+            if (warehouseBills.getfBillstatus() != 6L) {
+                return AjaxResult.error("主表状态有误，请确认状态是否已提交");
+            }
         }
         warehouseBills.setfBillstatus(2L);
         warehouseBills.setUpdateTime(new Date());