[CODE]: 撤销协议

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

@@ -120,4 +120,19 @@ public class TWarehouseAgreementStorageController extends BaseController {
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return tWarehouseAgreementService.tWarehouseAgreementSubmit(agreement,agreementitems,loginUser,fFeetypeid);
     }
+
+    /**
+     *   撤销对账
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:agreementStorage:add')")
+    @Log(title = "仓储费", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/revoke")
+    @RepeatSubmit
+    public AjaxResult revoke(@RequestParam("agreement") String agreement,
+                                                 @RequestParam("agreementitems") String agreementitems) {
+        int fFeetypeid = 0;
+        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return tWarehouseAgreementService.revoke(agreement,agreementitems,loginUser,fFeetypeid);
+    }
 }

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

@@ -121,4 +121,19 @@ public class TWarehouseAgreementTaskController extends BaseController {
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return tWarehouseAgreementService.tWarehouseAgreementSubmit(agreement,agreementitems,loginUser,fFeetypeid);
     }
+
+    /**
+     *   撤销对账
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:agreementTask:add')")
+    @Log(title = "仓储费", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/revoke")
+    @RepeatSubmit
+    public AjaxResult revoke(@RequestParam("agreement") String agreement,
+                             @RequestParam("agreementitems") String agreementitems) {
+        int fFeetypeid = 1;
+        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return tWarehouseAgreementService.revoke(agreement,agreementitems,loginUser,fFeetypeid);
+    }
 }

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

@@ -45,6 +45,7 @@ public interface ITWarehouseAgreementService {
 
     public AjaxResult tWarehouseAgreementSubmit(String agreement, String agreementitems, LoginUser loginUser,int fFeetypeid);
 
+    public AjaxResult revoke(String agreement, String agreementitems, LoginUser loginUser,int fFeetypeid);
     /**
      * 修改仓储费
      *

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

@@ -310,6 +310,29 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
         }
     }
 
+    @Override
+    public AjaxResult revoke(String agreement, String agreementitems, LoginUser loginUser, int fFeetypeid) {
+        Long fPid = null;
+        TWarehouseAgreement tWarehouseAgreement = JSONArray.parseObject(agreement, TWarehouseAgreement.class);
+        fPid = tWarehouseAgreement.getfId();
+        tWarehouseAgreement.setUpdateBy(loginUser.getUser().getUserName());
+        tWarehouseAgreement.setUpdateTime(new Date());
+        tWarehouseAgreementMapper.updateTWarehouseAgreement(tWarehouseAgreement);
+        tWarehouseAgreementitemsMapper.deleteByFPid(fPid);
+        //  从表添加
+        if (StringUtils.isNotNull(agreementitems) && !"[]".equals(agreementitems)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(agreementitems);
+            List<TWarehouseAgreementitems> tWarehouseAgreementitemsList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehouseAgreementitems.class);
+            for (TWarehouseAgreementitems tWarehouseAgreementitems : tWarehouseAgreementitemsList) {
+                tWarehouseAgreementitems.setfPid(fPid);
+                tWarehouseAgreementitems.setCreateBy(loginUser.getUser().getUserName());
+                tWarehouseAgreementitems.setCreateTime(new Date());
+                tWarehouseAgreementitemsMapper.insertTWarehouseAgreementitems(tWarehouseAgreementitems);
+            }
+        }
+        return AjaxResult.success();
+    }
+
     /**
      * 根据协议主表id 更新对应明细表状态
      *