去除多余后端文件

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

@@ -1,139 +0,0 @@
-package com.ruoyi.web.controller.warehouse.warehouseBusiness;
-
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
-import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 仓库详情主表Controller
- *
- * @author ruoyi
- * @date 2020-12-11
- */
-@RestController
-@RequestMapping("/warehouseBusiness/goodsTransfer")
-public class GoodsTransferController extends BaseController {
-    @Autowired
-    private ITWarehouseBillsService itWarehouseBillsService;
-
-    /**
-     * 查询入库详情主表列表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TWarehouseBills tWarehouseBills) {
-        startPage();
-        tWarehouseBills.setfBilltype("HQZY");
-        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出入库详情主表列表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:export')")
-    @Log(title = "详情主表", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TWarehouseBills tWarehouseBills) {
-        List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
-        ExcelUtil<TWarehouseBills> util = new ExcelUtil<TWarehouseBills>(TWarehouseBills.class);
-        return util.exportExcel(list, "warehousebills");
-    }
-
-    /**
-     * 获取入库仓库详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:query')")
-    @GetMapping(value = "/{fId}")
-    public AjaxResult getInfo(@PathVariable("fId") Long fId) {
-        return AjaxResult.success(itWarehouseBillsService.selectTWarehousebillsById(fId));
-    }
-
-    /**
-     * 新增入库详情主表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:add')")
-    @Log(title = "详情主表", businessType = BusinessType.INSERT)
-    @PostMapping(value = "/add")
-    public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
-                          @RequestParam("tWhgenleg") String tWhgenleg,
-                          @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
-                          @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
-                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
-        String billsType = "HQZY";
-        if (StringUtils.isEmpty(tWarehouseBills)) {
-            return AjaxResult.error("提交失败：请检查主表数据");
-        }
-        if (tWarehousebillsitems.equals("[]")) {
-            return AjaxResult.error("提交失败：请检查库存明细数据");
-        }
-        if (tWhgenleg.equals("[]")) {
-            return AjaxResult.error("提交失败：请检查附件信息");
-        }
-        if (tWarehousebillsfeesDr.equals("[]")) {
-            return AjaxResult.error("提交失败：请检查收款明细数据");
-        }
-        if (tWarehousebillsfeesCr.equals("[]")) {
-            return AjaxResult.error("提交失败：请检查付款明细数据");
-        }
-        /*if (StringUtils.isEmpty(tWarehousebillsitems)) {
-            return AjaxResult.error("提交失败：请检货物明细数据");
-        }
-        if (StringUtils.isEmpty(tWarehousebillsfeesCr) || StringUtils.isEmpty(tWarehousebillsfeesDr)) {
-            return AjaxResult.error("提交失败：请检费用明细数据");
-        }*/
-        // 获取当前的用户
-        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,
-                tWarehousebillsfeesDr, tWarehousebillsitems, tWhgenleg, loginUser, billsType);
-    }
-
-    /**
-     * 修改入库详情主表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:edit')")
-    @Log(title = "详情主表", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TWarehouseBills tWarehouseBills) {
-        return toAjax(itWarehouseBillsService.updateTWarehousebills(tWarehouseBills));
-    }
-
-    /**
-     * 删除入库详情主表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:remove')")
-    @Log(title = "详情主表", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{fIds}")
-    public AjaxResult remove(@PathVariable Long[] fIds) {
-        return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
-    }
-
-    /**
-     *  撤销入库信息
-     */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:revoke')")
-    @Log(title = "详情主表", businessType = BusinessType.UPDATE)
-    @GetMapping("/get/{fId}")
-    public AjaxResult revoke(@PathVariable("fId") Long fId) {
-        String  billsType="HQZYRevoke";
-        // 获取当前的用户
-        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return toAjax(itWarehouseBillsService.revokeTWarehousebillsById(fId,loginUser,billsType));
-    }
-}

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

@@ -136,7 +136,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
     /**
      *  撤销货转信息
      */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:revoke')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/get/{fId}")
     public AjaxResult revoke(@PathVariable("fId") Long fId) {