ソースを参照

费用协议生成文件

dongyongwei 4 年 前
コミット
19e1f167ad
30 ファイル変更3223 行追加0 行削除
  1. 103 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/feeagreement/TFeeAgreementTypeController.java
  2. 103 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/feeagreement/TWarehouseFeeAgreementTypeBusinessController.java
  3. 103 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/feeagreement/TWarehouseFeeAgreementTypeBusinessDetailController.java
  4. 103 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/feeagreement/TWarehouseFeeAgreementTypeBusinessDetailFormulaController.java
  5. 103 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/feeagreement/TWarehouseFeeAgreementTypeController.java
  6. 153 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/domain/TFeeAgreementType.java
  7. 205 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/domain/TWarehouseFeeAgreementType.java
  8. 223 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/domain/TWarehouseFeeAgreementTypeBusiness.java
  9. 266 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/domain/TWarehouseFeeAgreementTypeBusinessDetail.java
  10. 209 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/domain/TWarehouseFeeAgreementTypeBusinessDetailFormula.java
  11. 61 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/mapper/TFeeAgreementTypeMapper.java
  12. 61 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/mapper/TWarehouseFeeAgreementTypeBusinessDetailFormulaMapper.java
  13. 61 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/mapper/TWarehouseFeeAgreementTypeBusinessDetailMapper.java
  14. 61 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/mapper/TWarehouseFeeAgreementTypeBusinessMapper.java
  15. 61 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/mapper/TWarehouseFeeAgreementTypeMapper.java
  16. 61 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/ITFeeAgreementTypeService.java
  17. 61 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/ITWarehouseFeeAgreementTypeBusinessDetailFormulaService.java
  18. 61 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/ITWarehouseFeeAgreementTypeBusinessDetailService.java
  19. 61 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/ITWarehouseFeeAgreementTypeBusinessService.java
  20. 61 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/ITWarehouseFeeAgreementTypeService.java
  21. 93 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/impl/TFeeAgreementTypeServiceImpl.java
  22. 93 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/impl/TWarehouseFeeAgreementTypeBusinessDetailFormulaServiceImpl.java
  23. 93 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/impl/TWarehouseFeeAgreementTypeBusinessDetailServiceImpl.java
  24. 93 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/impl/TWarehouseFeeAgreementTypeBusinessServiceImpl.java
  25. 93 0
      ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/impl/TWarehouseFeeAgreementTypeServiceImpl.java
  26. 92 0
      ruoyi-warehouse/src/main/resources/mapper/feeagreement/TFeeAgreementTypeMapper.xml
  27. 112 0
      ruoyi-warehouse/src/main/resources/mapper/feeagreement/TWarehouseFeeAgreementTypeBusinessDetailFormulaMapper.xml
  28. 132 0
      ruoyi-warehouse/src/main/resources/mapper/feeagreement/TWarehouseFeeAgreementTypeBusinessDetailMapper.xml
  29. 117 0
      ruoyi-warehouse/src/main/resources/mapper/feeagreement/TWarehouseFeeAgreementTypeBusinessMapper.xml
  30. 124 0
      ruoyi-warehouse/src/main/resources/mapper/feeagreement/TWarehouseFeeAgreementTypeMapper.xml

+ 103 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/feeagreement/TFeeAgreementTypeController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller.warehouse.feeagreement;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.feeagreement.domain.TFeeAgreementType;
+import com.ruoyi.feeagreement.service.ITFeeAgreementTypeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 费用协议类型Controller
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+@RestController
+@RequestMapping("/feeagreement/feeagreementtype")
+public class TFeeAgreementTypeController extends BaseController
+{
+    @Autowired
+    private ITFeeAgreementTypeService tFeeAgreementTypeService;
+
+    /**
+     * 查询费用协议类型列表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:feeagreementtype:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TFeeAgreementType tFeeAgreementType)
+    {
+        startPage();
+        List<TFeeAgreementType> list = tFeeAgreementTypeService.selectTFeeAgreementTypeList(tFeeAgreementType);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出费用协议类型列表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:feeagreementtype:export')")
+    @Log(title = "费用协议类型", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TFeeAgreementType tFeeAgreementType)
+    {
+        List<TFeeAgreementType> list = tFeeAgreementTypeService.selectTFeeAgreementTypeList(tFeeAgreementType);
+        ExcelUtil<TFeeAgreementType> util = new ExcelUtil<TFeeAgreementType>(TFeeAgreementType.class);
+        return util.exportExcel(list, "feeagreementtype");
+    }
+
+    /**
+     * 获取费用协议类型详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:feeagreementtype:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tFeeAgreementTypeService.selectTFeeAgreementTypeById(fId));
+    }
+
+    /**
+     * 新增费用协议类型
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:feeagreementtype:add')")
+    @Log(title = "费用协议类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TFeeAgreementType tFeeAgreementType)
+    {
+        return toAjax(tFeeAgreementTypeService.insertTFeeAgreementType(tFeeAgreementType));
+    }
+
+    /**
+     * 修改费用协议类型
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:feeagreementtype:edit')")
+    @Log(title = "费用协议类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TFeeAgreementType tFeeAgreementType)
+    {
+        return toAjax(tFeeAgreementTypeService.updateTFeeAgreementType(tFeeAgreementType));
+    }
+
+    /**
+     * 删除费用协议类型
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:feeagreementtype:remove')")
+    @Log(title = "费用协议类型", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tFeeAgreementTypeService.deleteTFeeAgreementTypeByIds(fIds));
+    }
+}

+ 103 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/feeagreement/TWarehouseFeeAgreementTypeBusinessController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller.warehouse.feeagreement;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusiness;
+import com.ruoyi.feeagreement.service.ITWarehouseFeeAgreementTypeBusinessService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 费用协议从表Controller
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+@RestController
+@RequestMapping("/feeagreement/WarehouseFeeAgreementTypeBusiness")
+public class TWarehouseFeeAgreementTypeBusinessController extends BaseController
+{
+    @Autowired
+    private ITWarehouseFeeAgreementTypeBusinessService tWarehouseFeeAgreementTypeBusinessService;
+
+    /**
+     * 查询费用协议从表列表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusiness:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness)
+    {
+        startPage();
+        List<TWarehouseFeeAgreementTypeBusiness> list = tWarehouseFeeAgreementTypeBusinessService.selectTWarehouseFeeAgreementTypeBusinessList(tWarehouseFeeAgreementTypeBusiness);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出费用协议从表列表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusiness:export')")
+    @Log(title = "费用协议从表", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness)
+    {
+        List<TWarehouseFeeAgreementTypeBusiness> list = tWarehouseFeeAgreementTypeBusinessService.selectTWarehouseFeeAgreementTypeBusinessList(tWarehouseFeeAgreementTypeBusiness);
+        ExcelUtil<TWarehouseFeeAgreementTypeBusiness> util = new ExcelUtil<TWarehouseFeeAgreementTypeBusiness>(TWarehouseFeeAgreementTypeBusiness.class);
+        return util.exportExcel(list, "WarehouseFeeAgreementTypeBusiness");
+    }
+
+    /**
+     * 获取费用协议从表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusiness:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tWarehouseFeeAgreementTypeBusinessService.selectTWarehouseFeeAgreementTypeBusinessById(fId));
+    }
+
+    /**
+     * 新增费用协议从表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusiness:add')")
+    @Log(title = "费用协议从表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeBusinessService.insertTWarehouseFeeAgreementTypeBusiness(tWarehouseFeeAgreementTypeBusiness));
+    }
+
+    /**
+     * 修改费用协议从表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusiness:edit')")
+    @Log(title = "费用协议从表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeBusinessService.updateTWarehouseFeeAgreementTypeBusiness(tWarehouseFeeAgreementTypeBusiness));
+    }
+
+    /**
+     * 删除费用协议从表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusiness:remove')")
+    @Log(title = "费用协议从表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeBusinessService.deleteTWarehouseFeeAgreementTypeBusinessByIds(fIds));
+    }
+}

+ 103 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/feeagreement/TWarehouseFeeAgreementTypeBusinessDetailController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller.warehouse.feeagreement;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusinessDetail;
+import com.ruoyi.feeagreement.service.ITWarehouseFeeAgreementTypeBusinessDetailService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 费用协议从从表Controller
+ * 
+ * @author dongyongwei
+ * @date 2021-08-02
+ */
+@RestController
+@RequestMapping("/feeagreement/WarehouseFeeAgreementTypeBusinessDetail")
+public class TWarehouseFeeAgreementTypeBusinessDetailController extends BaseController
+{
+    @Autowired
+    private ITWarehouseFeeAgreementTypeBusinessDetailService tWarehouseFeeAgreementTypeBusinessDetailService;
+
+    /**
+     * 查询费用协议从从表列表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetail:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail)
+    {
+        startPage();
+        List<TWarehouseFeeAgreementTypeBusinessDetail> list = tWarehouseFeeAgreementTypeBusinessDetailService.selectTWarehouseFeeAgreementTypeBusinessDetailList(tWarehouseFeeAgreementTypeBusinessDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出费用协议从从表列表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetail:export')")
+    @Log(title = "费用协议从从表", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail)
+    {
+        List<TWarehouseFeeAgreementTypeBusinessDetail> list = tWarehouseFeeAgreementTypeBusinessDetailService.selectTWarehouseFeeAgreementTypeBusinessDetailList(tWarehouseFeeAgreementTypeBusinessDetail);
+        ExcelUtil<TWarehouseFeeAgreementTypeBusinessDetail> util = new ExcelUtil<TWarehouseFeeAgreementTypeBusinessDetail>(TWarehouseFeeAgreementTypeBusinessDetail.class);
+        return util.exportExcel(list, "WarehouseFeeAgreementTypeBusinessDetail");
+    }
+
+    /**
+     * 获取费用协议从从表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetail:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tWarehouseFeeAgreementTypeBusinessDetailService.selectTWarehouseFeeAgreementTypeBusinessDetailById(fId));
+    }
+
+    /**
+     * 新增费用协议从从表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetail:add')")
+    @Log(title = "费用协议从从表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeBusinessDetailService.insertTWarehouseFeeAgreementTypeBusinessDetail(tWarehouseFeeAgreementTypeBusinessDetail));
+    }
+
+    /**
+     * 修改费用协议从从表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetail:edit')")
+    @Log(title = "费用协议从从表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeBusinessDetailService.updateTWarehouseFeeAgreementTypeBusinessDetail(tWarehouseFeeAgreementTypeBusinessDetail));
+    }
+
+    /**
+     * 删除费用协议从从表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetail:remove')")
+    @Log(title = "费用协议从从表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeBusinessDetailService.deleteTWarehouseFeeAgreementTypeBusinessDetailByIds(fIds));
+    }
+}

+ 103 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/feeagreement/TWarehouseFeeAgreementTypeBusinessDetailFormulaController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller.warehouse.feeagreement;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusinessDetailFormula;
+import com.ruoyi.feeagreement.service.ITWarehouseFeeAgreementTypeBusinessDetailFormulaService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 费用协议从从从Controller
+ * 
+ * @author dongyongwei
+ * @date 2021-08-02
+ */
+@RestController
+@RequestMapping("/feeagreement/WarehouseFeeAgreementTypeBusinessDetailFormula")
+public class TWarehouseFeeAgreementTypeBusinessDetailFormulaController extends BaseController
+{
+    @Autowired
+    private ITWarehouseFeeAgreementTypeBusinessDetailFormulaService tWarehouseFeeAgreementTypeBusinessDetailFormulaService;
+
+    /**
+     * 查询费用协议从从从列表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula)
+    {
+        startPage();
+        List<TWarehouseFeeAgreementTypeBusinessDetailFormula> list = tWarehouseFeeAgreementTypeBusinessDetailFormulaService.selectTWarehouseFeeAgreementTypeBusinessDetailFormulaList(tWarehouseFeeAgreementTypeBusinessDetailFormula);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出费用协议从从从列表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:export')")
+    @Log(title = "费用协议从从从", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula)
+    {
+        List<TWarehouseFeeAgreementTypeBusinessDetailFormula> list = tWarehouseFeeAgreementTypeBusinessDetailFormulaService.selectTWarehouseFeeAgreementTypeBusinessDetailFormulaList(tWarehouseFeeAgreementTypeBusinessDetailFormula);
+        ExcelUtil<TWarehouseFeeAgreementTypeBusinessDetailFormula> util = new ExcelUtil<TWarehouseFeeAgreementTypeBusinessDetailFormula>(TWarehouseFeeAgreementTypeBusinessDetailFormula.class);
+        return util.exportExcel(list, "WarehouseFeeAgreementTypeBusinessDetailFormula");
+    }
+
+    /**
+     * 获取费用协议从从从详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tWarehouseFeeAgreementTypeBusinessDetailFormulaService.selectTWarehouseFeeAgreementTypeBusinessDetailFormulaById(fId));
+    }
+
+    /**
+     * 新增费用协议从从从
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:add')")
+    @Log(title = "费用协议从从从", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeBusinessDetailFormulaService.insertTWarehouseFeeAgreementTypeBusinessDetailFormula(tWarehouseFeeAgreementTypeBusinessDetailFormula));
+    }
+
+    /**
+     * 修改费用协议从从从
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:edit')")
+    @Log(title = "费用协议从从从", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeBusinessDetailFormulaService.updateTWarehouseFeeAgreementTypeBusinessDetailFormula(tWarehouseFeeAgreementTypeBusinessDetailFormula));
+    }
+
+    /**
+     * 删除费用协议从从从
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:remove')")
+    @Log(title = "费用协议从从从", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeBusinessDetailFormulaService.deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaByIds(fIds));
+    }
+}

+ 103 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/feeagreement/TWarehouseFeeAgreementTypeController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller.warehouse.feeagreement;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementType;
+import com.ruoyi.feeagreement.service.ITWarehouseFeeAgreementTypeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 费用协议主表Controller
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+@RestController
+@RequestMapping("/feeagreement/WarehouseFeeAgreementType")
+public class TWarehouseFeeAgreementTypeController extends BaseController
+{
+    @Autowired
+    private ITWarehouseFeeAgreementTypeService tWarehouseFeeAgreementTypeService;
+
+    /**
+     * 查询费用协议主表列表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementType:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TWarehouseFeeAgreementType tWarehouseFeeAgreementType)
+    {
+        startPage();
+        List<TWarehouseFeeAgreementType> list = tWarehouseFeeAgreementTypeService.selectTWarehouseFeeAgreementTypeList(tWarehouseFeeAgreementType);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出费用协议主表列表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementType:export')")
+    @Log(title = "费用协议主表", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TWarehouseFeeAgreementType tWarehouseFeeAgreementType)
+    {
+        List<TWarehouseFeeAgreementType> list = tWarehouseFeeAgreementTypeService.selectTWarehouseFeeAgreementTypeList(tWarehouseFeeAgreementType);
+        ExcelUtil<TWarehouseFeeAgreementType> util = new ExcelUtil<TWarehouseFeeAgreementType>(TWarehouseFeeAgreementType.class);
+        return util.exportExcel(list, "WarehouseFeeAgreementType");
+    }
+
+    /**
+     * 获取费用协议主表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementType:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tWarehouseFeeAgreementTypeService.selectTWarehouseFeeAgreementTypeById(fId));
+    }
+
+    /**
+     * 新增费用协议主表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementType:add')")
+    @Log(title = "费用协议主表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TWarehouseFeeAgreementType tWarehouseFeeAgreementType)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeService.insertTWarehouseFeeAgreementType(tWarehouseFeeAgreementType));
+    }
+
+    /**
+     * 修改费用协议主表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementType:edit')")
+    @Log(title = "费用协议主表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TWarehouseFeeAgreementType tWarehouseFeeAgreementType)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeService.updateTWarehouseFeeAgreementType(tWarehouseFeeAgreementType));
+    }
+
+    /**
+     * 删除费用协议主表
+     */
+    @PreAuthorize("@ss.hasPermi('feeagreement:WarehouseFeeAgreementType:remove')")
+    @Log(title = "费用协议主表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tWarehouseFeeAgreementTypeService.deleteTWarehouseFeeAgreementTypeByIds(fIds));
+    }
+}

+ 153 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/domain/TFeeAgreementType.java

@@ -0,0 +1,153 @@
+package com.ruoyi.feeagreement.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 费用协议类型对象 t_fee_agreement_type
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+public class TFeeAgreementType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long fId;
+
+    /** 父ID */
+    @Excel(name = "父ID")
+    private Long fParentId;
+
+    /** 费用协议类别名称 */
+    @Excel(name = "费用协议类别名称")
+    private String fName;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String fRemark;
+
+    /** 创建人ID */
+    @Excel(name = "创建人ID")
+    private Long fCreateBy;
+
+    /** 创建日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    /** 更新人ID */
+    @Excel(name = "更新人ID")
+    private Long fUpdateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUpdateTime;
+
+    /** 删除状态(0正常 1停用) */
+    @Excel(name = "删除状态", readConverterExp = "0=正常,1=停用")
+    private Integer fDelFlag;
+
+    public void setfId(Long fId) 
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfParentId(Long fParentId) 
+    {
+        this.fParentId = fParentId;
+    }
+
+    public Long getfParentId() 
+    {
+        return fParentId;
+    }
+    public void setfName(String fName) 
+    {
+        this.fName = fName;
+    }
+
+    public String getfName() 
+    {
+        return fName;
+    }
+    public void setfRemark(String fRemark) 
+    {
+        this.fRemark = fRemark;
+    }
+
+    public String getfRemark() 
+    {
+        return fRemark;
+    }
+    public void setfCreateBy(Long fCreateBy) 
+    {
+        this.fCreateBy = fCreateBy;
+    }
+
+    public Long getfCreateBy() 
+    {
+        return fCreateBy;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfUpdateBy(Long fUpdateBy) 
+    {
+        this.fUpdateBy = fUpdateBy;
+    }
+
+    public Long getfUpdateBy() 
+    {
+        return fUpdateBy;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfDelFlag(Integer fDelFlag) 
+    {
+        this.fDelFlag = fDelFlag;
+    }
+
+    public Integer getfDelFlag() 
+    {
+        return fDelFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fParentId", getfParentId())
+            .append("fName", getfName())
+            .append("fRemark", getfRemark())
+            .append("fCreateBy", getfCreateBy())
+            .append("fCreateTime", getfCreateTime())
+            .append("fUpdateBy", getfUpdateBy())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fDelFlag", getfDelFlag())
+            .toString();
+    }
+}

+ 205 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/domain/TWarehouseFeeAgreementType.java

@@ -0,0 +1,205 @@
+package com.ruoyi.feeagreement.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 费用协议主表对象 t_warehouse_fee_agreement_type
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+public class TWarehouseFeeAgreementType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long fId;
+
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private Long fCorpId;
+
+    /** 客户名称 **/
+    private String fCorpName;
+
+    public String getfCorpName() {
+        return fCorpName;
+    }
+
+    public void setfCorpName(String fCorpName) {
+        this.fCorpName = fCorpName;
+    }
+
+    /** 分类类型ID */
+    @Excel(name = "分类类型ID")
+    private Long fTFeeAgreementTypeFId;
+
+    /** 分类类型名称 */
+    private String fTFeeAgreementTypeName;
+
+    public String getfTFeeAgreementTypeName() {
+        return fTFeeAgreementTypeName;
+    }
+
+    public void setfTFeeAgreementTypeName(String fTFeeAgreementTypeName) {
+        this.fTFeeAgreementTypeName = fTFeeAgreementTypeName;
+    }
+
+    /** 有效期起 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期起", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBegindate;
+
+    /** 有效期至 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期至", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fEnddate;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String fRemark;
+
+    /** 创建人ID */
+    @Excel(name = "创建人ID")
+    private Long fCreateBy;
+
+    /** 创建日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    /** 更新人ID */
+    @Excel(name = "更新人ID")
+    private Long fUpdateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUpdateTime;
+
+    /** 删除状态(0正常 1停用) */
+    @Excel(name = "删除状态", readConverterExp = "0=正常,1=停用")
+    private Integer fDelFlag;
+
+    public void setfId(Long fId) 
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfCorpId(Long fCorpId) 
+    {
+        this.fCorpId = fCorpId;
+    }
+
+    public Long getfCorpId() 
+    {
+        return fCorpId;
+    }
+    public void setfTFeeAgreementTypeFId(Long fTFeeAgreementTypeFId) 
+    {
+        this.fTFeeAgreementTypeFId = fTFeeAgreementTypeFId;
+    }
+
+    public Long getfTFeeAgreementTypeFId() 
+    {
+        return fTFeeAgreementTypeFId;
+    }
+    public void setfBegindate(Date fBegindate) 
+    {
+        this.fBegindate = fBegindate;
+    }
+
+    public Date getfBegindate() 
+    {
+        return fBegindate;
+    }
+    public void setfEnddate(Date fEnddate) 
+    {
+        this.fEnddate = fEnddate;
+    }
+
+    public Date getfEnddate() 
+    {
+        return fEnddate;
+    }
+    public void setfRemark(String fRemark) 
+    {
+        this.fRemark = fRemark;
+    }
+
+    public String getfRemark() 
+    {
+        return fRemark;
+    }
+    public void setfCreateBy(Long fCreateBy) 
+    {
+        this.fCreateBy = fCreateBy;
+    }
+
+    public Long getfCreateBy() 
+    {
+        return fCreateBy;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfUpdateBy(Long fUpdateBy) 
+    {
+        this.fUpdateBy = fUpdateBy;
+    }
+
+    public Long getfUpdateBy() 
+    {
+        return fUpdateBy;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfDelFlag(Integer fDelFlag) 
+    {
+        this.fDelFlag = fDelFlag;
+    }
+
+    public Integer getfDelFlag() 
+    {
+        return fDelFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fCorpId", getfCorpId())
+            .append("fTFeeAgreementTypeFId", getfTFeeAgreementTypeFId())
+            .append("fBegindate", getfBegindate())
+            .append("fEnddate", getfEnddate())
+            .append("fRemark", getfRemark())
+            .append("fCreateBy", getfCreateBy())
+            .append("fCreateTime", getfCreateTime())
+            .append("fUpdateBy", getfUpdateBy())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fDelFlag", getfDelFlag())
+            .toString();
+    }
+}

+ 223 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/domain/TWarehouseFeeAgreementTypeBusiness.java

@@ -0,0 +1,223 @@
+package com.ruoyi.feeagreement.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 费用协议从表对象 t_warehouse_fee_agreement_type_business
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+public class TWarehouseFeeAgreementTypeBusiness extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long fId;
+
+    /** 主表id */
+    @Excel(name = "主表id")
+    private Long fWarehouseFeeAgreementTypeFId;
+
+    /** 分类类型ID */
+    @Excel(name = "分类类型ID")
+    private Long fTFeeAgreementTypeFId;
+
+    /** 业务类型父ID */
+    @Excel(name = "业务类型父ID")
+    private Long fTFeeAgreementFTypeParentId;
+
+    /** 费目 */
+    @Excel(name = "费目")
+    private Long fFeeItem;
+
+    /** 计算方法 */
+    @Excel(name = "计算方法")
+    private String fComputingMethod;
+
+    /** 收付类型 */
+    @Excel(name = "收付类型")
+    private String fReceiptPaymentType;
+
+    /** 取值 */
+    @Excel(name = "取值")
+    private Long fGetValue;
+
+    /** 删除状态(0正常 1停用) */
+    @Excel(name = "删除状态", readConverterExp = "0=正常,1=停用")
+    private Integer fDelFlag;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUpdateTime;
+
+    /** 更新人ID */
+    @Excel(name = "更新人ID")
+    private Long fUpdateBy;
+
+    /** 创建日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    /** 创建人ID */
+    @Excel(name = "创建人ID")
+    private Long fCreateBy;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String fRemark;
+
+    public void setfId(Long fId) 
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfWarehouseFeeAgreementTypeFId(Long fWarehouseFeeAgreementTypeFId) 
+    {
+        this.fWarehouseFeeAgreementTypeFId = fWarehouseFeeAgreementTypeFId;
+    }
+
+    public Long getfWarehouseFeeAgreementTypeFId() 
+    {
+        return fWarehouseFeeAgreementTypeFId;
+    }
+    public void setfTFeeAgreementTypeFId(Long fTFeeAgreementTypeFId) 
+    {
+        this.fTFeeAgreementTypeFId = fTFeeAgreementTypeFId;
+    }
+
+    public Long getfTFeeAgreementTypeFId() 
+    {
+        return fTFeeAgreementTypeFId;
+    }
+    public void setfTFeeAgreementFTypeParentId(Long fTFeeAgreementFTypeParentId) 
+    {
+        this.fTFeeAgreementFTypeParentId = fTFeeAgreementFTypeParentId;
+    }
+
+    public Long getfTFeeAgreementFTypeParentId() 
+    {
+        return fTFeeAgreementFTypeParentId;
+    }
+    public void setfFeeItem(Long fFeeItem) 
+    {
+        this.fFeeItem = fFeeItem;
+    }
+
+    public Long getfFeeItem() 
+    {
+        return fFeeItem;
+    }
+    public void setfComputingMethod(String fComputingMethod)
+    {
+        this.fComputingMethod = fComputingMethod;
+    }
+
+    public String getfComputingMethod()
+    {
+        return fComputingMethod;
+    }
+    public void setfReceiptPaymentType(String fReceiptPaymentType)
+    {
+        this.fReceiptPaymentType = fReceiptPaymentType;
+    }
+
+    public String getfReceiptPaymentType()
+    {
+        return fReceiptPaymentType;
+    }
+    public void setfGetValue(Long fGetValue) 
+    {
+        this.fGetValue = fGetValue;
+    }
+
+    public Long getfGetValue() 
+    {
+        return fGetValue;
+    }
+    public void setfDelFlag(Integer fDelFlag) 
+    {
+        this.fDelFlag = fDelFlag;
+    }
+
+    public Integer getfDelFlag() 
+    {
+        return fDelFlag;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfUpdateBy(Long fUpdateBy) 
+    {
+        this.fUpdateBy = fUpdateBy;
+    }
+
+    public Long getfUpdateBy() 
+    {
+        return fUpdateBy;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfCreateBy(Long fCreateBy) 
+    {
+        this.fCreateBy = fCreateBy;
+    }
+
+    public Long getfCreateBy() 
+    {
+        return fCreateBy;
+    }
+    public void setfRemark(String fRemark) 
+    {
+        this.fRemark = fRemark;
+    }
+
+    public String getfRemark() 
+    {
+        return fRemark;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fWarehouseFeeAgreementTypeFId", getfWarehouseFeeAgreementTypeFId())
+            .append("fTFeeAgreementTypeFId", getfTFeeAgreementTypeFId())
+            .append("fTFeeAgreementFTypeParentId", getfTFeeAgreementFTypeParentId())
+            .append("fFeeItem", getfFeeItem())
+            .append("fComputingMethod", getfComputingMethod())
+            .append("fReceiptPaymentType", getfReceiptPaymentType())
+            .append("fGetValue", getfGetValue())
+            .append("fDelFlag", getfDelFlag())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fUpdateBy", getfUpdateBy())
+            .append("fCreateTime", getfCreateTime())
+            .append("fCreateBy", getfCreateBy())
+            .append("fRemark", getfRemark())
+            .toString();
+    }
+}

+ 266 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/domain/TWarehouseFeeAgreementTypeBusinessDetail.java

@@ -0,0 +1,266 @@
+package com.ruoyi.feeagreement.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 费用协议从从表对象 t_warehouse_fee_agreement_type_business_detail
+ * 
+ * @author dongyongwei
+ * @date 2021-08-02
+ */
+public class TWarehouseFeeAgreementTypeBusinessDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long fId;
+
+    /** 主表id */
+    @Excel(name = "主表id")
+    private Long fWarehouseFeeAgreementTypeFId;
+
+    /** 从表id */
+    @Excel(name = "从表id")
+    private Long fWarehouseFeeAgreementTypeBusinessFId;
+
+    /** 计价单位 */
+    @Excel(name = "计价单位")
+    private Long fFeeUnitId;
+
+    /** 免费部分 */
+    @Excel(name = "免费部分")
+    private Long fFreeNum;
+
+    /** 尺寸 */
+    @Excel(name = "尺寸")
+    private Long fSize;
+
+    /** 箱型 */
+    @Excel(name = "箱型")
+    private Long fBoxModel;
+
+    /** 数量 */
+    @Excel(name = "数量")
+    private Long fNum;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private BigDecimal fPrice;
+
+    /** 币种 */
+    @Excel(name = "币种")
+    private String fCurrency;
+
+    /** 是否包干 Y是N否 */
+    @Excel(name = "是否包干 Y是N否")
+    private String fIsContract;
+
+    /** 删除状态(0正常 1停用) */
+    @Excel(name = "删除状态", readConverterExp = "0=正常,1=停用")
+    private Integer fDelFlag;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUpdateTime;
+
+    /** 更新人ID */
+    @Excel(name = "更新人ID")
+    private Long fUpdateBy;
+
+    /** 创建日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    /** 创建人ID */
+    @Excel(name = "创建人ID")
+    private Long fCreateBy;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String fRemark;
+
+    public void setfId(Long fId) 
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfWarehouseFeeAgreementTypeFId(Long fWarehouseFeeAgreementTypeFId) 
+    {
+        this.fWarehouseFeeAgreementTypeFId = fWarehouseFeeAgreementTypeFId;
+    }
+
+    public Long getfWarehouseFeeAgreementTypeFId() 
+    {
+        return fWarehouseFeeAgreementTypeFId;
+    }
+    public void setfWarehouseFeeAgreementTypeBusinessFId(Long fWarehouseFeeAgreementTypeBusinessFId) 
+    {
+        this.fWarehouseFeeAgreementTypeBusinessFId = fWarehouseFeeAgreementTypeBusinessFId;
+    }
+
+    public Long getfWarehouseFeeAgreementTypeBusinessFId() 
+    {
+        return fWarehouseFeeAgreementTypeBusinessFId;
+    }
+    public void setfFeeUnitId(Long fFeeUnitId) 
+    {
+        this.fFeeUnitId = fFeeUnitId;
+    }
+
+    public Long getfFeeUnitId() 
+    {
+        return fFeeUnitId;
+    }
+    public void setfFreeNum(Long fFreeNum) 
+    {
+        this.fFreeNum = fFreeNum;
+    }
+
+    public Long getfFreeNum() 
+    {
+        return fFreeNum;
+    }
+    public void setfSize(Long fSize) 
+    {
+        this.fSize = fSize;
+    }
+
+    public Long getfSize() 
+    {
+        return fSize;
+    }
+    public void setfBoxModel(Long fBoxModel) 
+    {
+        this.fBoxModel = fBoxModel;
+    }
+
+    public Long getfBoxModel() 
+    {
+        return fBoxModel;
+    }
+    public void setfNum(Long fNum) 
+    {
+        this.fNum = fNum;
+    }
+
+    public Long getfNum() 
+    {
+        return fNum;
+    }
+    public void setfPrice(BigDecimal fPrice) 
+    {
+        this.fPrice = fPrice;
+    }
+
+    public BigDecimal getfPrice() 
+    {
+        return fPrice;
+    }
+    public void setfCurrency(String fCurrency) 
+    {
+        this.fCurrency = fCurrency;
+    }
+
+    public String getfCurrency() 
+    {
+        return fCurrency;
+    }
+    public void setfIsContract(String fIsContract) 
+    {
+        this.fIsContract = fIsContract;
+    }
+
+    public String getfIsContract() 
+    {
+        return fIsContract;
+    }
+    public void setfDelFlag(Integer fDelFlag) 
+    {
+        this.fDelFlag = fDelFlag;
+    }
+
+    public Integer getfDelFlag() 
+    {
+        return fDelFlag;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfUpdateBy(Long fUpdateBy) 
+    {
+        this.fUpdateBy = fUpdateBy;
+    }
+
+    public Long getfUpdateBy() 
+    {
+        return fUpdateBy;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfCreateBy(Long fCreateBy) 
+    {
+        this.fCreateBy = fCreateBy;
+    }
+
+    public Long getfCreateBy() 
+    {
+        return fCreateBy;
+    }
+    public void setfRemark(String fRemark) 
+    {
+        this.fRemark = fRemark;
+    }
+
+    public String getfRemark() 
+    {
+        return fRemark;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fWarehouseFeeAgreementTypeFId", getfWarehouseFeeAgreementTypeFId())
+            .append("fWarehouseFeeAgreementTypeBusinessFId", getfWarehouseFeeAgreementTypeBusinessFId())
+            .append("fFeeUnitId", getfFeeUnitId())
+            .append("fFreeNum", getfFreeNum())
+            .append("fSize", getfSize())
+            .append("fBoxModel", getfBoxModel())
+            .append("fNum", getfNum())
+            .append("fPrice", getfPrice())
+            .append("fCurrency", getfCurrency())
+            .append("fIsContract", getfIsContract())
+            .append("fDelFlag", getfDelFlag())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fUpdateBy", getfUpdateBy())
+            .append("fCreateTime", getfCreateTime())
+            .append("fCreateBy", getfCreateBy())
+            .append("fRemark", getfRemark())
+            .toString();
+    }
+}

+ 209 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/domain/TWarehouseFeeAgreementTypeBusinessDetailFormula.java

@@ -0,0 +1,209 @@
+package com.ruoyi.feeagreement.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 费用协议从从从对象 t_warehouse_fee_agreement_type_business_detail_formula
+ * 
+ * @author dongyongwei
+ * @date 2021-08-02
+ */
+public class TWarehouseFeeAgreementTypeBusinessDetailFormula extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long fId;
+
+    /** 主表id */
+    @Excel(name = "主表id")
+    private Long fWarehouseFeeAgreementTypeFId;
+
+    /** 从表id */
+    @Excel(name = "从表id")
+    private Long fWarehouseFeeAgreementTypeBusinessFId;
+
+    /** 从从表id */
+    @Excel(name = "从从表id")
+    private Long fWarehouseFeeAgreementTypeBusinessDetailFId;
+
+    /** 属性 */
+    @Excel(name = "属性")
+    private Long fAttribute;
+
+    /** 公式 */
+    @Excel(name = "公式")
+    private Long fFormula;
+
+    /** 值 */
+    @Excel(name = "值")
+    private String fValue;
+
+    /** 删除状态(0正常 1停用) */
+    @Excel(name = "删除状态", readConverterExp = "0=正常,1=停用")
+    private Integer fDelFlag;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUpdateTime;
+
+    /** 更新人ID */
+    @Excel(name = "更新人ID")
+    private Long fUpdateBy;
+
+    /** 创建日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    /** 创建人ID */
+    @Excel(name = "创建人ID")
+    private Long fCreateBy;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String fRemark;
+
+    public void setfId(Long fId) 
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfWarehouseFeeAgreementTypeFId(Long fWarehouseFeeAgreementTypeFId) 
+    {
+        this.fWarehouseFeeAgreementTypeFId = fWarehouseFeeAgreementTypeFId;
+    }
+
+    public Long getfWarehouseFeeAgreementTypeFId() 
+    {
+        return fWarehouseFeeAgreementTypeFId;
+    }
+    public void setfWarehouseFeeAgreementTypeBusinessFId(Long fWarehouseFeeAgreementTypeBusinessFId) 
+    {
+        this.fWarehouseFeeAgreementTypeBusinessFId = fWarehouseFeeAgreementTypeBusinessFId;
+    }
+
+    public Long getfWarehouseFeeAgreementTypeBusinessFId() 
+    {
+        return fWarehouseFeeAgreementTypeBusinessFId;
+    }
+    public void setfWarehouseFeeAgreementTypeBusinessDetailFId(Long fWarehouseFeeAgreementTypeBusinessDetailFId) 
+    {
+        this.fWarehouseFeeAgreementTypeBusinessDetailFId = fWarehouseFeeAgreementTypeBusinessDetailFId;
+    }
+
+    public Long getfWarehouseFeeAgreementTypeBusinessDetailFId() 
+    {
+        return fWarehouseFeeAgreementTypeBusinessDetailFId;
+    }
+    public void setfAttribute(Long fAttribute) 
+    {
+        this.fAttribute = fAttribute;
+    }
+
+    public Long getfAttribute() 
+    {
+        return fAttribute;
+    }
+    public void setfFormula(Long fFormula) 
+    {
+        this.fFormula = fFormula;
+    }
+
+    public Long getfFormula() 
+    {
+        return fFormula;
+    }
+    public void setfValue(String fValue) 
+    {
+        this.fValue = fValue;
+    }
+
+    public String getfValue() 
+    {
+        return fValue;
+    }
+    public void setfDelFlag(Integer fDelFlag) 
+    {
+        this.fDelFlag = fDelFlag;
+    }
+
+    public Integer getfDelFlag() 
+    {
+        return fDelFlag;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfUpdateBy(Long fUpdateBy) 
+    {
+        this.fUpdateBy = fUpdateBy;
+    }
+
+    public Long getfUpdateBy() 
+    {
+        return fUpdateBy;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfCreateBy(Long fCreateBy) 
+    {
+        this.fCreateBy = fCreateBy;
+    }
+
+    public Long getfCreateBy() 
+    {
+        return fCreateBy;
+    }
+    public void setfRemark(String fRemark) 
+    {
+        this.fRemark = fRemark;
+    }
+
+    public String getfRemark() 
+    {
+        return fRemark;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fWarehouseFeeAgreementTypeFId", getfWarehouseFeeAgreementTypeFId())
+            .append("fWarehouseFeeAgreementTypeBusinessFId", getfWarehouseFeeAgreementTypeBusinessFId())
+            .append("fWarehouseFeeAgreementTypeBusinessDetailFId", getfWarehouseFeeAgreementTypeBusinessDetailFId())
+            .append("fAttribute", getfAttribute())
+            .append("fFormula", getfFormula())
+            .append("fValue", getfValue())
+            .append("fDelFlag", getfDelFlag())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fUpdateBy", getfUpdateBy())
+            .append("fCreateTime", getfCreateTime())
+            .append("fCreateBy", getfCreateBy())
+            .append("fRemark", getfRemark())
+            .toString();
+    }
+}

+ 61 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/mapper/TFeeAgreementTypeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.feeagreement.mapper;
+
+import java.util.List;
+import com.ruoyi.feeagreement.domain.TFeeAgreementType;
+
+/**
+ * 费用协议类型Mapper接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+public interface TFeeAgreementTypeMapper 
+{
+    /**
+     * 查询费用协议类型
+     * 
+     * @param fId 费用协议类型ID
+     * @return 费用协议类型
+     */
+    public TFeeAgreementType selectTFeeAgreementTypeById(Long fId);
+
+    /**
+     * 查询费用协议类型列表
+     * 
+     * @param tFeeAgreementType 费用协议类型
+     * @return 费用协议类型集合
+     */
+    public List<TFeeAgreementType> selectTFeeAgreementTypeList(TFeeAgreementType tFeeAgreementType);
+
+    /**
+     * 新增费用协议类型
+     * 
+     * @param tFeeAgreementType 费用协议类型
+     * @return 结果
+     */
+    public int insertTFeeAgreementType(TFeeAgreementType tFeeAgreementType);
+
+    /**
+     * 修改费用协议类型
+     * 
+     * @param tFeeAgreementType 费用协议类型
+     * @return 结果
+     */
+    public int updateTFeeAgreementType(TFeeAgreementType tFeeAgreementType);
+
+    /**
+     * 删除费用协议类型
+     * 
+     * @param fId 费用协议类型ID
+     * @return 结果
+     */
+    public int deleteTFeeAgreementTypeById(Long fId);
+
+    /**
+     * 批量删除费用协议类型
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTFeeAgreementTypeByIds(Long[] fIds);
+}

+ 61 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/mapper/TWarehouseFeeAgreementTypeBusinessDetailFormulaMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.feeagreement.mapper;
+
+import java.util.List;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusinessDetailFormula;
+
+/**
+ * 费用协议从从从Mapper接口
+ * 
+ * @author dongyongwei
+ * @date 2021-08-02
+ */
+public interface TWarehouseFeeAgreementTypeBusinessDetailFormulaMapper 
+{
+    /**
+     * 查询费用协议从从从
+     * 
+     * @param fId 费用协议从从从ID
+     * @return 费用协议从从从
+     */
+    public TWarehouseFeeAgreementTypeBusinessDetailFormula selectTWarehouseFeeAgreementTypeBusinessDetailFormulaById(Long fId);
+
+    /**
+     * 查询费用协议从从从列表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetailFormula 费用协议从从从
+     * @return 费用协议从从从集合
+     */
+    public List<TWarehouseFeeAgreementTypeBusinessDetailFormula> selectTWarehouseFeeAgreementTypeBusinessDetailFormulaList(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula);
+
+    /**
+     * 新增费用协议从从从
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetailFormula 费用协议从从从
+     * @return 结果
+     */
+    public int insertTWarehouseFeeAgreementTypeBusinessDetailFormula(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula);
+
+    /**
+     * 修改费用协议从从从
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetailFormula 费用协议从从从
+     * @return 结果
+     */
+    public int updateTWarehouseFeeAgreementTypeBusinessDetailFormula(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula);
+
+    /**
+     * 删除费用协议从从从
+     * 
+     * @param fId 费用协议从从从ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaById(Long fId);
+
+    /**
+     * 批量删除费用协议从从从
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaByIds(Long[] fIds);
+}

+ 61 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/mapper/TWarehouseFeeAgreementTypeBusinessDetailMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.feeagreement.mapper;
+
+import java.util.List;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusinessDetail;
+
+/**
+ * 费用协议从从表Mapper接口
+ * 
+ * @author dongyongwei
+ * @date 2021-08-02
+ */
+public interface TWarehouseFeeAgreementTypeBusinessDetailMapper 
+{
+    /**
+     * 查询费用协议从从表
+     * 
+     * @param fId 费用协议从从表ID
+     * @return 费用协议从从表
+     */
+    public TWarehouseFeeAgreementTypeBusinessDetail selectTWarehouseFeeAgreementTypeBusinessDetailById(Long fId);
+
+    /**
+     * 查询费用协议从从表列表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetail 费用协议从从表
+     * @return 费用协议从从表集合
+     */
+    public List<TWarehouseFeeAgreementTypeBusinessDetail> selectTWarehouseFeeAgreementTypeBusinessDetailList(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail);
+
+    /**
+     * 新增费用协议从从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetail 费用协议从从表
+     * @return 结果
+     */
+    public int insertTWarehouseFeeAgreementTypeBusinessDetail(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail);
+
+    /**
+     * 修改费用协议从从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetail 费用协议从从表
+     * @return 结果
+     */
+    public int updateTWarehouseFeeAgreementTypeBusinessDetail(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail);
+
+    /**
+     * 删除费用协议从从表
+     * 
+     * @param fId 费用协议从从表ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailById(Long fId);
+
+    /**
+     * 批量删除费用协议从从表
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailByIds(Long[] fIds);
+}

+ 61 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/mapper/TWarehouseFeeAgreementTypeBusinessMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.feeagreement.mapper;
+
+import java.util.List;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusiness;
+
+/**
+ * 费用协议从表Mapper接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+public interface TWarehouseFeeAgreementTypeBusinessMapper 
+{
+    /**
+     * 查询费用协议从表
+     * 
+     * @param fId 费用协议从表ID
+     * @return 费用协议从表
+     */
+    public TWarehouseFeeAgreementTypeBusiness selectTWarehouseFeeAgreementTypeBusinessById(Long fId);
+
+    /**
+     * 查询费用协议从表列表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusiness 费用协议从表
+     * @return 费用协议从表集合
+     */
+    public List<TWarehouseFeeAgreementTypeBusiness> selectTWarehouseFeeAgreementTypeBusinessList(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness);
+
+    /**
+     * 新增费用协议从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusiness 费用协议从表
+     * @return 结果
+     */
+    public int insertTWarehouseFeeAgreementTypeBusiness(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness);
+
+    /**
+     * 修改费用协议从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusiness 费用协议从表
+     * @return 结果
+     */
+    public int updateTWarehouseFeeAgreementTypeBusiness(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness);
+
+    /**
+     * 删除费用协议从表
+     * 
+     * @param fId 费用协议从表ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessById(Long fId);
+
+    /**
+     * 批量删除费用协议从表
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessByIds(Long[] fIds);
+}

+ 61 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/mapper/TWarehouseFeeAgreementTypeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.feeagreement.mapper;
+
+import java.util.List;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementType;
+
+/**
+ * 费用协议主表Mapper接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+public interface TWarehouseFeeAgreementTypeMapper 
+{
+    /**
+     * 查询费用协议主表
+     * 
+     * @param fId 费用协议主表ID
+     * @return 费用协议主表
+     */
+    public TWarehouseFeeAgreementType selectTWarehouseFeeAgreementTypeById(Long fId);
+
+    /**
+     * 查询费用协议主表列表
+     * 
+     * @param tWarehouseFeeAgreementType 费用协议主表
+     * @return 费用协议主表集合
+     */
+    public List<TWarehouseFeeAgreementType> selectTWarehouseFeeAgreementTypeList(TWarehouseFeeAgreementType tWarehouseFeeAgreementType);
+
+    /**
+     * 新增费用协议主表
+     * 
+     * @param tWarehouseFeeAgreementType 费用协议主表
+     * @return 结果
+     */
+    public int insertTWarehouseFeeAgreementType(TWarehouseFeeAgreementType tWarehouseFeeAgreementType);
+
+    /**
+     * 修改费用协议主表
+     * 
+     * @param tWarehouseFeeAgreementType 费用协议主表
+     * @return 结果
+     */
+    public int updateTWarehouseFeeAgreementType(TWarehouseFeeAgreementType tWarehouseFeeAgreementType);
+
+    /**
+     * 删除费用协议主表
+     * 
+     * @param fId 费用协议主表ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeById(Long fId);
+
+    /**
+     * 批量删除费用协议主表
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeByIds(Long[] fIds);
+}

+ 61 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/ITFeeAgreementTypeService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.feeagreement.service;
+
+import java.util.List;
+import com.ruoyi.feeagreement.domain.TFeeAgreementType;
+
+/**
+ * 费用协议类型Service接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+public interface ITFeeAgreementTypeService 
+{
+    /**
+     * 查询费用协议类型
+     * 
+     * @param fId 费用协议类型ID
+     * @return 费用协议类型
+     */
+    public TFeeAgreementType selectTFeeAgreementTypeById(Long fId);
+
+    /**
+     * 查询费用协议类型列表
+     * 
+     * @param tFeeAgreementType 费用协议类型
+     * @return 费用协议类型集合
+     */
+    public List<TFeeAgreementType> selectTFeeAgreementTypeList(TFeeAgreementType tFeeAgreementType);
+
+    /**
+     * 新增费用协议类型
+     * 
+     * @param tFeeAgreementType 费用协议类型
+     * @return 结果
+     */
+    public int insertTFeeAgreementType(TFeeAgreementType tFeeAgreementType);
+
+    /**
+     * 修改费用协议类型
+     * 
+     * @param tFeeAgreementType 费用协议类型
+     * @return 结果
+     */
+    public int updateTFeeAgreementType(TFeeAgreementType tFeeAgreementType);
+
+    /**
+     * 批量删除费用协议类型
+     * 
+     * @param fIds 需要删除的费用协议类型ID
+     * @return 结果
+     */
+    public int deleteTFeeAgreementTypeByIds(Long[] fIds);
+
+    /**
+     * 删除费用协议类型信息
+     * 
+     * @param fId 费用协议类型ID
+     * @return 结果
+     */
+    public int deleteTFeeAgreementTypeById(Long fId);
+}

+ 61 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/ITWarehouseFeeAgreementTypeBusinessDetailFormulaService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.feeagreement.service;
+
+import java.util.List;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusinessDetailFormula;
+
+/**
+ * 费用协议从从从Service接口
+ * 
+ * @author dongyongwei
+ * @date 2021-08-02
+ */
+public interface ITWarehouseFeeAgreementTypeBusinessDetailFormulaService 
+{
+    /**
+     * 查询费用协议从从从
+     * 
+     * @param fId 费用协议从从从ID
+     * @return 费用协议从从从
+     */
+    public TWarehouseFeeAgreementTypeBusinessDetailFormula selectTWarehouseFeeAgreementTypeBusinessDetailFormulaById(Long fId);
+
+    /**
+     * 查询费用协议从从从列表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetailFormula 费用协议从从从
+     * @return 费用协议从从从集合
+     */
+    public List<TWarehouseFeeAgreementTypeBusinessDetailFormula> selectTWarehouseFeeAgreementTypeBusinessDetailFormulaList(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula);
+
+    /**
+     * 新增费用协议从从从
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetailFormula 费用协议从从从
+     * @return 结果
+     */
+    public int insertTWarehouseFeeAgreementTypeBusinessDetailFormula(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula);
+
+    /**
+     * 修改费用协议从从从
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetailFormula 费用协议从从从
+     * @return 结果
+     */
+    public int updateTWarehouseFeeAgreementTypeBusinessDetailFormula(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula);
+
+    /**
+     * 批量删除费用协议从从从
+     * 
+     * @param fIds 需要删除的费用协议从从从ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaByIds(Long[] fIds);
+
+    /**
+     * 删除费用协议从从从信息
+     * 
+     * @param fId 费用协议从从从ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaById(Long fId);
+}

+ 61 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/ITWarehouseFeeAgreementTypeBusinessDetailService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.feeagreement.service;
+
+import java.util.List;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusinessDetail;
+
+/**
+ * 费用协议从从表Service接口
+ * 
+ * @author dongyongwei
+ * @date 2021-08-02
+ */
+public interface ITWarehouseFeeAgreementTypeBusinessDetailService 
+{
+    /**
+     * 查询费用协议从从表
+     * 
+     * @param fId 费用协议从从表ID
+     * @return 费用协议从从表
+     */
+    public TWarehouseFeeAgreementTypeBusinessDetail selectTWarehouseFeeAgreementTypeBusinessDetailById(Long fId);
+
+    /**
+     * 查询费用协议从从表列表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetail 费用协议从从表
+     * @return 费用协议从从表集合
+     */
+    public List<TWarehouseFeeAgreementTypeBusinessDetail> selectTWarehouseFeeAgreementTypeBusinessDetailList(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail);
+
+    /**
+     * 新增费用协议从从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetail 费用协议从从表
+     * @return 结果
+     */
+    public int insertTWarehouseFeeAgreementTypeBusinessDetail(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail);
+
+    /**
+     * 修改费用协议从从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetail 费用协议从从表
+     * @return 结果
+     */
+    public int updateTWarehouseFeeAgreementTypeBusinessDetail(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail);
+
+    /**
+     * 批量删除费用协议从从表
+     * 
+     * @param fIds 需要删除的费用协议从从表ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailByIds(Long[] fIds);
+
+    /**
+     * 删除费用协议从从表信息
+     * 
+     * @param fId 费用协议从从表ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailById(Long fId);
+}

+ 61 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/ITWarehouseFeeAgreementTypeBusinessService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.feeagreement.service;
+
+import java.util.List;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusiness;
+
+/**
+ * 费用协议从表Service接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+public interface ITWarehouseFeeAgreementTypeBusinessService 
+{
+    /**
+     * 查询费用协议从表
+     * 
+     * @param fId 费用协议从表ID
+     * @return 费用协议从表
+     */
+    public TWarehouseFeeAgreementTypeBusiness selectTWarehouseFeeAgreementTypeBusinessById(Long fId);
+
+    /**
+     * 查询费用协议从表列表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusiness 费用协议从表
+     * @return 费用协议从表集合
+     */
+    public List<TWarehouseFeeAgreementTypeBusiness> selectTWarehouseFeeAgreementTypeBusinessList(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness);
+
+    /**
+     * 新增费用协议从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusiness 费用协议从表
+     * @return 结果
+     */
+    public int insertTWarehouseFeeAgreementTypeBusiness(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness);
+
+    /**
+     * 修改费用协议从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusiness 费用协议从表
+     * @return 结果
+     */
+    public int updateTWarehouseFeeAgreementTypeBusiness(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness);
+
+    /**
+     * 批量删除费用协议从表
+     * 
+     * @param fIds 需要删除的费用协议从表ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessByIds(Long[] fIds);
+
+    /**
+     * 删除费用协议从表信息
+     * 
+     * @param fId 费用协议从表ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeBusinessById(Long fId);
+}

+ 61 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/ITWarehouseFeeAgreementTypeService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.feeagreement.service;
+
+import java.util.List;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementType;
+
+/**
+ * 费用协议主表Service接口
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+public interface ITWarehouseFeeAgreementTypeService 
+{
+    /**
+     * 查询费用协议主表
+     * 
+     * @param fId 费用协议主表ID
+     * @return 费用协议主表
+     */
+    public TWarehouseFeeAgreementType selectTWarehouseFeeAgreementTypeById(Long fId);
+
+    /**
+     * 查询费用协议主表列表
+     * 
+     * @param tWarehouseFeeAgreementType 费用协议主表
+     * @return 费用协议主表集合
+     */
+    public List<TWarehouseFeeAgreementType> selectTWarehouseFeeAgreementTypeList(TWarehouseFeeAgreementType tWarehouseFeeAgreementType);
+
+    /**
+     * 新增费用协议主表
+     * 
+     * @param tWarehouseFeeAgreementType 费用协议主表
+     * @return 结果
+     */
+    public int insertTWarehouseFeeAgreementType(TWarehouseFeeAgreementType tWarehouseFeeAgreementType);
+
+    /**
+     * 修改费用协议主表
+     * 
+     * @param tWarehouseFeeAgreementType 费用协议主表
+     * @return 结果
+     */
+    public int updateTWarehouseFeeAgreementType(TWarehouseFeeAgreementType tWarehouseFeeAgreementType);
+
+    /**
+     * 批量删除费用协议主表
+     * 
+     * @param fIds 需要删除的费用协议主表ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeByIds(Long[] fIds);
+
+    /**
+     * 删除费用协议主表信息
+     * 
+     * @param fId 费用协议主表ID
+     * @return 结果
+     */
+    public int deleteTWarehouseFeeAgreementTypeById(Long fId);
+}

+ 93 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/impl/TFeeAgreementTypeServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.feeagreement.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.feeagreement.mapper.TFeeAgreementTypeMapper;
+import com.ruoyi.feeagreement.domain.TFeeAgreementType;
+import com.ruoyi.feeagreement.service.ITFeeAgreementTypeService;
+
+/**
+ * 费用协议类型Service业务层处理
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+@Service
+public class TFeeAgreementTypeServiceImpl implements ITFeeAgreementTypeService 
+{
+    @Autowired
+    private TFeeAgreementTypeMapper tFeeAgreementTypeMapper;
+
+    /**
+     * 查询费用协议类型
+     * 
+     * @param fId 费用协议类型ID
+     * @return 费用协议类型
+     */
+    @Override
+    public TFeeAgreementType selectTFeeAgreementTypeById(Long fId)
+    {
+        return tFeeAgreementTypeMapper.selectTFeeAgreementTypeById(fId);
+    }
+
+    /**
+     * 查询费用协议类型列表
+     * 
+     * @param tFeeAgreementType 费用协议类型
+     * @return 费用协议类型
+     */
+    @Override
+    public List<TFeeAgreementType> selectTFeeAgreementTypeList(TFeeAgreementType tFeeAgreementType)
+    {
+        return tFeeAgreementTypeMapper.selectTFeeAgreementTypeList(tFeeAgreementType);
+    }
+
+    /**
+     * 新增费用协议类型
+     * 
+     * @param tFeeAgreementType 费用协议类型
+     * @return 结果
+     */
+    @Override
+    public int insertTFeeAgreementType(TFeeAgreementType tFeeAgreementType)
+    {
+        return tFeeAgreementTypeMapper.insertTFeeAgreementType(tFeeAgreementType);
+    }
+
+    /**
+     * 修改费用协议类型
+     * 
+     * @param tFeeAgreementType 费用协议类型
+     * @return 结果
+     */
+    @Override
+    public int updateTFeeAgreementType(TFeeAgreementType tFeeAgreementType)
+    {
+        return tFeeAgreementTypeMapper.updateTFeeAgreementType(tFeeAgreementType);
+    }
+
+    /**
+     * 批量删除费用协议类型
+     * 
+     * @param fIds 需要删除的费用协议类型ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTFeeAgreementTypeByIds(Long[] fIds)
+    {
+        return tFeeAgreementTypeMapper.deleteTFeeAgreementTypeByIds(fIds);
+    }
+
+    /**
+     * 删除费用协议类型信息
+     * 
+     * @param fId 费用协议类型ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTFeeAgreementTypeById(Long fId)
+    {
+        return tFeeAgreementTypeMapper.deleteTFeeAgreementTypeById(fId);
+    }
+}

+ 93 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/impl/TWarehouseFeeAgreementTypeBusinessDetailFormulaServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.feeagreement.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.feeagreement.mapper.TWarehouseFeeAgreementTypeBusinessDetailFormulaMapper;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusinessDetailFormula;
+import com.ruoyi.feeagreement.service.ITWarehouseFeeAgreementTypeBusinessDetailFormulaService;
+
+/**
+ * 费用协议从从从Service业务层处理
+ * 
+ * @author dongyongwei
+ * @date 2021-08-02
+ */
+@Service
+public class TWarehouseFeeAgreementTypeBusinessDetailFormulaServiceImpl implements ITWarehouseFeeAgreementTypeBusinessDetailFormulaService 
+{
+    @Autowired
+    private TWarehouseFeeAgreementTypeBusinessDetailFormulaMapper tWarehouseFeeAgreementTypeBusinessDetailFormulaMapper;
+
+    /**
+     * 查询费用协议从从从
+     * 
+     * @param fId 费用协议从从从ID
+     * @return 费用协议从从从
+     */
+    @Override
+    public TWarehouseFeeAgreementTypeBusinessDetailFormula selectTWarehouseFeeAgreementTypeBusinessDetailFormulaById(Long fId)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailFormulaMapper.selectTWarehouseFeeAgreementTypeBusinessDetailFormulaById(fId);
+    }
+
+    /**
+     * 查询费用协议从从从列表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetailFormula 费用协议从从从
+     * @return 费用协议从从从
+     */
+    @Override
+    public List<TWarehouseFeeAgreementTypeBusinessDetailFormula> selectTWarehouseFeeAgreementTypeBusinessDetailFormulaList(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailFormulaMapper.selectTWarehouseFeeAgreementTypeBusinessDetailFormulaList(tWarehouseFeeAgreementTypeBusinessDetailFormula);
+    }
+
+    /**
+     * 新增费用协议从从从
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetailFormula 费用协议从从从
+     * @return 结果
+     */
+    @Override
+    public int insertTWarehouseFeeAgreementTypeBusinessDetailFormula(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailFormulaMapper.insertTWarehouseFeeAgreementTypeBusinessDetailFormula(tWarehouseFeeAgreementTypeBusinessDetailFormula);
+    }
+
+    /**
+     * 修改费用协议从从从
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetailFormula 费用协议从从从
+     * @return 结果
+     */
+    @Override
+    public int updateTWarehouseFeeAgreementTypeBusinessDetailFormula(TWarehouseFeeAgreementTypeBusinessDetailFormula tWarehouseFeeAgreementTypeBusinessDetailFormula)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailFormulaMapper.updateTWarehouseFeeAgreementTypeBusinessDetailFormula(tWarehouseFeeAgreementTypeBusinessDetailFormula);
+    }
+
+    /**
+     * 批量删除费用协议从从从
+     * 
+     * @param fIds 需要删除的费用协议从从从ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaByIds(Long[] fIds)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailFormulaMapper.deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaByIds(fIds);
+    }
+
+    /**
+     * 删除费用协议从从从信息
+     * 
+     * @param fId 费用协议从从从ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaById(Long fId)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailFormulaMapper.deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaById(fId);
+    }
+}

+ 93 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/impl/TWarehouseFeeAgreementTypeBusinessDetailServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.feeagreement.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.feeagreement.mapper.TWarehouseFeeAgreementTypeBusinessDetailMapper;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusinessDetail;
+import com.ruoyi.feeagreement.service.ITWarehouseFeeAgreementTypeBusinessDetailService;
+
+/**
+ * 费用协议从从表Service业务层处理
+ * 
+ * @author dongyongwei
+ * @date 2021-08-02
+ */
+@Service
+public class TWarehouseFeeAgreementTypeBusinessDetailServiceImpl implements ITWarehouseFeeAgreementTypeBusinessDetailService 
+{
+    @Autowired
+    private TWarehouseFeeAgreementTypeBusinessDetailMapper tWarehouseFeeAgreementTypeBusinessDetailMapper;
+
+    /**
+     * 查询费用协议从从表
+     * 
+     * @param fId 费用协议从从表ID
+     * @return 费用协议从从表
+     */
+    @Override
+    public TWarehouseFeeAgreementTypeBusinessDetail selectTWarehouseFeeAgreementTypeBusinessDetailById(Long fId)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailMapper.selectTWarehouseFeeAgreementTypeBusinessDetailById(fId);
+    }
+
+    /**
+     * 查询费用协议从从表列表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetail 费用协议从从表
+     * @return 费用协议从从表
+     */
+    @Override
+    public List<TWarehouseFeeAgreementTypeBusinessDetail> selectTWarehouseFeeAgreementTypeBusinessDetailList(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailMapper.selectTWarehouseFeeAgreementTypeBusinessDetailList(tWarehouseFeeAgreementTypeBusinessDetail);
+    }
+
+    /**
+     * 新增费用协议从从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetail 费用协议从从表
+     * @return 结果
+     */
+    @Override
+    public int insertTWarehouseFeeAgreementTypeBusinessDetail(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailMapper.insertTWarehouseFeeAgreementTypeBusinessDetail(tWarehouseFeeAgreementTypeBusinessDetail);
+    }
+
+    /**
+     * 修改费用协议从从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusinessDetail 费用协议从从表
+     * @return 结果
+     */
+    @Override
+    public int updateTWarehouseFeeAgreementTypeBusinessDetail(TWarehouseFeeAgreementTypeBusinessDetail tWarehouseFeeAgreementTypeBusinessDetail)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailMapper.updateTWarehouseFeeAgreementTypeBusinessDetail(tWarehouseFeeAgreementTypeBusinessDetail);
+    }
+
+    /**
+     * 批量删除费用协议从从表
+     * 
+     * @param fIds 需要删除的费用协议从从表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailByIds(Long[] fIds)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailMapper.deleteTWarehouseFeeAgreementTypeBusinessDetailByIds(fIds);
+    }
+
+    /**
+     * 删除费用协议从从表信息
+     * 
+     * @param fId 费用协议从从表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseFeeAgreementTypeBusinessDetailById(Long fId)
+    {
+        return tWarehouseFeeAgreementTypeBusinessDetailMapper.deleteTWarehouseFeeAgreementTypeBusinessDetailById(fId);
+    }
+}

+ 93 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/impl/TWarehouseFeeAgreementTypeBusinessServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.feeagreement.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.feeagreement.mapper.TWarehouseFeeAgreementTypeBusinessMapper;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementTypeBusiness;
+import com.ruoyi.feeagreement.service.ITWarehouseFeeAgreementTypeBusinessService;
+
+/**
+ * 费用协议从表Service业务层处理
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+@Service
+public class TWarehouseFeeAgreementTypeBusinessServiceImpl implements ITWarehouseFeeAgreementTypeBusinessService 
+{
+    @Autowired
+    private TWarehouseFeeAgreementTypeBusinessMapper tWarehouseFeeAgreementTypeBusinessMapper;
+
+    /**
+     * 查询费用协议从表
+     * 
+     * @param fId 费用协议从表ID
+     * @return 费用协议从表
+     */
+    @Override
+    public TWarehouseFeeAgreementTypeBusiness selectTWarehouseFeeAgreementTypeBusinessById(Long fId)
+    {
+        return tWarehouseFeeAgreementTypeBusinessMapper.selectTWarehouseFeeAgreementTypeBusinessById(fId);
+    }
+
+    /**
+     * 查询费用协议从表列表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusiness 费用协议从表
+     * @return 费用协议从表
+     */
+    @Override
+    public List<TWarehouseFeeAgreementTypeBusiness> selectTWarehouseFeeAgreementTypeBusinessList(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness)
+    {
+        return tWarehouseFeeAgreementTypeBusinessMapper.selectTWarehouseFeeAgreementTypeBusinessList(tWarehouseFeeAgreementTypeBusiness);
+    }
+
+    /**
+     * 新增费用协议从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusiness 费用协议从表
+     * @return 结果
+     */
+    @Override
+    public int insertTWarehouseFeeAgreementTypeBusiness(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness)
+    {
+        return tWarehouseFeeAgreementTypeBusinessMapper.insertTWarehouseFeeAgreementTypeBusiness(tWarehouseFeeAgreementTypeBusiness);
+    }
+
+    /**
+     * 修改费用协议从表
+     * 
+     * @param tWarehouseFeeAgreementTypeBusiness 费用协议从表
+     * @return 结果
+     */
+    @Override
+    public int updateTWarehouseFeeAgreementTypeBusiness(TWarehouseFeeAgreementTypeBusiness tWarehouseFeeAgreementTypeBusiness)
+    {
+        return tWarehouseFeeAgreementTypeBusinessMapper.updateTWarehouseFeeAgreementTypeBusiness(tWarehouseFeeAgreementTypeBusiness);
+    }
+
+    /**
+     * 批量删除费用协议从表
+     * 
+     * @param fIds 需要删除的费用协议从表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseFeeAgreementTypeBusinessByIds(Long[] fIds)
+    {
+        return tWarehouseFeeAgreementTypeBusinessMapper.deleteTWarehouseFeeAgreementTypeBusinessByIds(fIds);
+    }
+
+    /**
+     * 删除费用协议从表信息
+     * 
+     * @param fId 费用协议从表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseFeeAgreementTypeBusinessById(Long fId)
+    {
+        return tWarehouseFeeAgreementTypeBusinessMapper.deleteTWarehouseFeeAgreementTypeBusinessById(fId);
+    }
+}

+ 93 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/feeagreement/service/impl/TWarehouseFeeAgreementTypeServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.feeagreement.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.feeagreement.mapper.TWarehouseFeeAgreementTypeMapper;
+import com.ruoyi.feeagreement.domain.TWarehouseFeeAgreementType;
+import com.ruoyi.feeagreement.service.ITWarehouseFeeAgreementTypeService;
+
+/**
+ * 费用协议主表Service业务层处理
+ * 
+ * @author dongyongwei
+ * @date 2021-07-30
+ */
+@Service
+public class TWarehouseFeeAgreementTypeServiceImpl implements ITWarehouseFeeAgreementTypeService 
+{
+    @Autowired
+    private TWarehouseFeeAgreementTypeMapper tWarehouseFeeAgreementTypeMapper;
+
+    /**
+     * 查询费用协议主表
+     * 
+     * @param fId 费用协议主表ID
+     * @return 费用协议主表
+     */
+    @Override
+    public TWarehouseFeeAgreementType selectTWarehouseFeeAgreementTypeById(Long fId)
+    {
+        return tWarehouseFeeAgreementTypeMapper.selectTWarehouseFeeAgreementTypeById(fId);
+    }
+
+    /**
+     * 查询费用协议主表列表
+     * 
+     * @param tWarehouseFeeAgreementType 费用协议主表
+     * @return 费用协议主表
+     */
+    @Override
+    public List<TWarehouseFeeAgreementType> selectTWarehouseFeeAgreementTypeList(TWarehouseFeeAgreementType tWarehouseFeeAgreementType)
+    {
+        return tWarehouseFeeAgreementTypeMapper.selectTWarehouseFeeAgreementTypeList(tWarehouseFeeAgreementType);
+    }
+
+    /**
+     * 新增费用协议主表
+     * 
+     * @param tWarehouseFeeAgreementType 费用协议主表
+     * @return 结果
+     */
+    @Override
+    public int insertTWarehouseFeeAgreementType(TWarehouseFeeAgreementType tWarehouseFeeAgreementType)
+    {
+        return tWarehouseFeeAgreementTypeMapper.insertTWarehouseFeeAgreementType(tWarehouseFeeAgreementType);
+    }
+
+    /**
+     * 修改费用协议主表
+     * 
+     * @param tWarehouseFeeAgreementType 费用协议主表
+     * @return 结果
+     */
+    @Override
+    public int updateTWarehouseFeeAgreementType(TWarehouseFeeAgreementType tWarehouseFeeAgreementType)
+    {
+        return tWarehouseFeeAgreementTypeMapper.updateTWarehouseFeeAgreementType(tWarehouseFeeAgreementType);
+    }
+
+    /**
+     * 批量删除费用协议主表
+     * 
+     * @param fIds 需要删除的费用协议主表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseFeeAgreementTypeByIds(Long[] fIds)
+    {
+        return tWarehouseFeeAgreementTypeMapper.deleteTWarehouseFeeAgreementTypeByIds(fIds);
+    }
+
+    /**
+     * 删除费用协议主表信息
+     * 
+     * @param fId 费用协议主表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseFeeAgreementTypeById(Long fId)
+    {
+        return tWarehouseFeeAgreementTypeMapper.deleteTWarehouseFeeAgreementTypeById(fId);
+    }
+}

+ 92 - 0
ruoyi-warehouse/src/main/resources/mapper/feeagreement/TFeeAgreementTypeMapper.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.feeagreement.mapper.TFeeAgreementTypeMapper">
+    
+    <resultMap type="TFeeAgreementType" id="TFeeAgreementTypeResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fParentId"    column="f_parent_id"    />
+        <result property="fName"    column="f_name"    />
+        <result property="fRemark"    column="f_remark"    />
+        <result property="fCreateBy"    column="f_create_by"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fUpdateBy"    column="f_update_by"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fDelFlag"    column="f_del_flag"    />
+    </resultMap>
+
+    <sql id="selectTFeeAgreementTypeVo">
+        select f_id, f_parent_id, f_name, f_remark, f_create_by, f_create_time, f_update_by, f_update_time, f_del_flag from t_fee_agreement_type
+    </sql>
+
+    <select id="selectTFeeAgreementTypeList" parameterType="TFeeAgreementType" resultMap="TFeeAgreementTypeResult">
+        <include refid="selectTFeeAgreementTypeVo"/>
+        <where>  
+            <if test="fParentId != null "> and f_parent_id = #{fParentId}</if>
+            <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
+            <if test="fRemark != null  and fRemark != ''"> and f_remark = #{fRemark}</if>
+            <if test="fCreateBy != null "> and f_create_by = #{fCreateBy}</if>
+            <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
+            <if test="fUpdateBy != null "> and f_update_by = #{fUpdateBy}</if>
+            <if test="fUpdateTime != null "> and f_update_time = #{fUpdateTime}</if>
+            <if test="fDelFlag != null "> and f_del_flag = #{fDelFlag}</if>
+        </where>
+    </select>
+    
+    <select id="selectTFeeAgreementTypeById" parameterType="Long" resultMap="TFeeAgreementTypeResult">
+        <include refid="selectTFeeAgreementTypeVo"/>
+        where f_id = #{fId}
+    </select>
+        
+    <insert id="insertTFeeAgreementType" parameterType="TFeeAgreementType" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_fee_agreement_type
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fParentId != null">f_parent_id,</if>
+            <if test="fName != null">f_name,</if>
+            <if test="fRemark != null">f_remark,</if>
+            <if test="fCreateBy != null">f_create_by,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fUpdateBy != null">f_update_by,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fDelFlag != null">f_del_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fParentId != null">#{fParentId},</if>
+            <if test="fName != null">#{fName},</if>
+            <if test="fRemark != null">#{fRemark},</if>
+            <if test="fCreateBy != null">#{fCreateBy},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fUpdateBy != null">#{fUpdateBy},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fDelFlag != null">#{fDelFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTFeeAgreementType" parameterType="TFeeAgreementType">
+        update t_fee_agreement_type
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fParentId != null">f_parent_id = #{fParentId},</if>
+            <if test="fName != null">f_name = #{fName},</if>
+            <if test="fRemark != null">f_remark = #{fRemark},</if>
+            <if test="fCreateBy != null">f_create_by = #{fCreateBy},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fUpdateBy != null">f_update_by = #{fUpdateBy},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fDelFlag != null">f_del_flag = #{fDelFlag},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTFeeAgreementTypeById" parameterType="Long">
+        delete from t_fee_agreement_type where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTFeeAgreementTypeByIds" parameterType="String">
+        delete from t_fee_agreement_type where f_id in 
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+    
+</mapper>

+ 112 - 0
ruoyi-warehouse/src/main/resources/mapper/feeagreement/TWarehouseFeeAgreementTypeBusinessDetailFormulaMapper.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.feeagreement.mapper.TWarehouseFeeAgreementTypeBusinessDetailFormulaMapper">
+    
+    <resultMap type="TWarehouseFeeAgreementTypeBusinessDetailFormula" id="TWarehouseFeeAgreementTypeBusinessDetailFormulaResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fWarehouseFeeAgreementTypeFId"    column="f_warehouse_fee_agreement_type_f_id"    />
+        <result property="fWarehouseFeeAgreementTypeBusinessFId"    column="f_warehouse_fee_agreement_type_business_f_id"    />
+        <result property="fWarehouseFeeAgreementTypeBusinessDetailFId"    column="f_warehouse_fee_agreement_type_business_detail_f_id"    />
+        <result property="fAttribute"    column="f_attribute"    />
+        <result property="fFormula"    column="f_formula"    />
+        <result property="fValue"    column="f_value"    />
+        <result property="fDelFlag"    column="f_del_flag"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fUpdateBy"    column="f_update_by"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fCreateBy"    column="f_create_by"    />
+        <result property="fRemark"    column="f_remark"    />
+    </resultMap>
+
+    <sql id="selectTWarehouseFeeAgreementTypeBusinessDetailFormulaVo">
+        select f_id, f_warehouse_fee_agreement_type_f_id, f_warehouse_fee_agreement_type_business_f_id, f_warehouse_fee_agreement_type_business_detail_f_id, f_attribute, f_formula, f_value, f_del_flag, f_update_time, f_update_by, f_create_time, f_create_by, f_remark from t_warehouse_fee_agreement_type_business_detail_formula
+    </sql>
+
+    <select id="selectTWarehouseFeeAgreementTypeBusinessDetailFormulaList" parameterType="TWarehouseFeeAgreementTypeBusinessDetailFormula" resultMap="TWarehouseFeeAgreementTypeBusinessDetailFormulaResult">
+        <include refid="selectTWarehouseFeeAgreementTypeBusinessDetailFormulaVo"/>
+        <where>  
+            <if test="fWarehouseFeeAgreementTypeFId != null "> and f_warehouse_fee_agreement_type_f_id = #{fWarehouseFeeAgreementTypeFId}</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessFId != null "> and f_warehouse_fee_agreement_type_business_f_id = #{fWarehouseFeeAgreementTypeBusinessFId}</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessDetailFId != null "> and f_warehouse_fee_agreement_type_business_detail_f_id = #{fWarehouseFeeAgreementTypeBusinessDetailFId}</if>
+            <if test="fAttribute != null "> and f_attribute = #{fAttribute}</if>
+            <if test="fFormula != null "> and f_formula = #{fFormula}</if>
+            <if test="fValue != null  and fValue != ''"> and f_value = #{fValue}</if>
+            <if test="fDelFlag != null "> and f_del_flag = #{fDelFlag}</if>
+            <if test="fUpdateTime != null "> and f_update_time = #{fUpdateTime}</if>
+            <if test="fUpdateBy != null "> and f_update_by = #{fUpdateBy}</if>
+            <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
+            <if test="fCreateBy != null "> and f_create_by = #{fCreateBy}</if>
+            <if test="fRemark != null  and fRemark != ''"> and f_remark = #{fRemark}</if>
+        </where>
+    </select>
+    
+    <select id="selectTWarehouseFeeAgreementTypeBusinessDetailFormulaById" parameterType="Long" resultMap="TWarehouseFeeAgreementTypeBusinessDetailFormulaResult">
+        <include refid="selectTWarehouseFeeAgreementTypeBusinessDetailFormulaVo"/>
+        where f_id = #{fId}
+    </select>
+        
+    <insert id="insertTWarehouseFeeAgreementTypeBusinessDetailFormula" parameterType="TWarehouseFeeAgreementTypeBusinessDetailFormula" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_warehouse_fee_agreement_type_business_detail_formula
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fWarehouseFeeAgreementTypeFId != null">f_warehouse_fee_agreement_type_f_id,</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessFId != null">f_warehouse_fee_agreement_type_business_f_id,</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessDetailFId != null">f_warehouse_fee_agreement_type_business_detail_f_id,</if>
+            <if test="fAttribute != null">f_attribute,</if>
+            <if test="fFormula != null">f_formula,</if>
+            <if test="fValue != null">f_value,</if>
+            <if test="fDelFlag != null">f_del_flag,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fUpdateBy != null">f_update_by,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fCreateBy != null">f_create_by,</if>
+            <if test="fRemark != null">f_remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fWarehouseFeeAgreementTypeFId != null">#{fWarehouseFeeAgreementTypeFId},</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessFId != null">#{fWarehouseFeeAgreementTypeBusinessFId},</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessDetailFId != null">#{fWarehouseFeeAgreementTypeBusinessDetailFId},</if>
+            <if test="fAttribute != null">#{fAttribute},</if>
+            <if test="fFormula != null">#{fFormula},</if>
+            <if test="fValue != null">#{fValue},</if>
+            <if test="fDelFlag != null">#{fDelFlag},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fUpdateBy != null">#{fUpdateBy},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fCreateBy != null">#{fCreateBy},</if>
+            <if test="fRemark != null">#{fRemark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTWarehouseFeeAgreementTypeBusinessDetailFormula" parameterType="TWarehouseFeeAgreementTypeBusinessDetailFormula">
+        update t_warehouse_fee_agreement_type_business_detail_formula
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fWarehouseFeeAgreementTypeFId != null">f_warehouse_fee_agreement_type_f_id = #{fWarehouseFeeAgreementTypeFId},</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessFId != null">f_warehouse_fee_agreement_type_business_f_id = #{fWarehouseFeeAgreementTypeBusinessFId},</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessDetailFId != null">f_warehouse_fee_agreement_type_business_detail_f_id = #{fWarehouseFeeAgreementTypeBusinessDetailFId},</if>
+            <if test="fAttribute != null">f_attribute = #{fAttribute},</if>
+            <if test="fFormula != null">f_formula = #{fFormula},</if>
+            <if test="fValue != null">f_value = #{fValue},</if>
+            <if test="fDelFlag != null">f_del_flag = #{fDelFlag},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fUpdateBy != null">f_update_by = #{fUpdateBy},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fCreateBy != null">f_create_by = #{fCreateBy},</if>
+            <if test="fRemark != null">f_remark = #{fRemark},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaById" parameterType="Long">
+        delete from t_warehouse_fee_agreement_type_business_detail_formula where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTWarehouseFeeAgreementTypeBusinessDetailFormulaByIds" parameterType="String">
+        delete from t_warehouse_fee_agreement_type_business_detail_formula where f_id in 
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+    
+</mapper>

+ 132 - 0
ruoyi-warehouse/src/main/resources/mapper/feeagreement/TWarehouseFeeAgreementTypeBusinessDetailMapper.xml

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.feeagreement.mapper.TWarehouseFeeAgreementTypeBusinessDetailMapper">
+    
+    <resultMap type="TWarehouseFeeAgreementTypeBusinessDetail" id="TWarehouseFeeAgreementTypeBusinessDetailResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fWarehouseFeeAgreementTypeFId"    column="f_warehouse_fee_agreement_type_f_id"    />
+        <result property="fWarehouseFeeAgreementTypeBusinessFId"    column="f_warehouse_fee_agreement_type_business_f_id"    />
+        <result property="fFeeUnitId"    column="f_fee_unit_id"    />
+        <result property="fFreeNum"    column="f_free_num"    />
+        <result property="fSize"    column="f_size"    />
+        <result property="fBoxModel"    column="f_box_model"    />
+        <result property="fNum"    column="f_num"    />
+        <result property="fPrice"    column="f_price"    />
+        <result property="fCurrency"    column="f_currency"    />
+        <result property="fIsContract"    column="f_is_contract"    />
+        <result property="fDelFlag"    column="f_del_flag"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fUpdateBy"    column="f_update_by"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fCreateBy"    column="f_create_by"    />
+        <result property="fRemark"    column="f_remark"    />
+    </resultMap>
+
+    <sql id="selectTWarehouseFeeAgreementTypeBusinessDetailVo">
+        select f_id, f_warehouse_fee_agreement_type_f_id, f_warehouse_fee_agreement_type_business_f_id, f_fee_unit_id, f_free_num, f_size, f_box_model, f_num, f_price, f_currency, f_is_contract, f_del_flag, f_update_time, f_update_by, f_create_time, f_create_by, f_remark from t_warehouse_fee_agreement_type_business_detail
+    </sql>
+
+    <select id="selectTWarehouseFeeAgreementTypeBusinessDetailList" parameterType="TWarehouseFeeAgreementTypeBusinessDetail" resultMap="TWarehouseFeeAgreementTypeBusinessDetailResult">
+        <include refid="selectTWarehouseFeeAgreementTypeBusinessDetailVo"/>
+        <where>  
+            <if test="fWarehouseFeeAgreementTypeFId != null "> and f_warehouse_fee_agreement_type_f_id = #{fWarehouseFeeAgreementTypeFId}</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessFId != null "> and f_warehouse_fee_agreement_type_business_f_id = #{fWarehouseFeeAgreementTypeBusinessFId}</if>
+            <if test="fFeeUnitId != null "> and f_fee_unit_id = #{fFeeUnitId}</if>
+            <if test="fFreeNum != null "> and f_free_num = #{fFreeNum}</if>
+            <if test="fSize != null "> and f_size = #{fSize}</if>
+            <if test="fBoxModel != null "> and f_box_model = #{fBoxModel}</if>
+            <if test="fNum != null "> and f_num = #{fNum}</if>
+            <if test="fPrice != null "> and f_price = #{fPrice}</if>
+            <if test="fCurrency != null  and fCurrency != ''"> and f_currency = #{fCurrency}</if>
+            <if test="fIsContract != null  and fIsContract != ''"> and f_is_contract = #{fIsContract}</if>
+            <if test="fDelFlag != null "> and f_del_flag = #{fDelFlag}</if>
+            <if test="fUpdateTime != null "> and f_update_time = #{fUpdateTime}</if>
+            <if test="fUpdateBy != null "> and f_update_by = #{fUpdateBy}</if>
+            <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
+            <if test="fCreateBy != null "> and f_create_by = #{fCreateBy}</if>
+            <if test="fRemark != null  and fRemark != ''"> and f_remark = #{fRemark}</if>
+        </where>
+    </select>
+    
+    <select id="selectTWarehouseFeeAgreementTypeBusinessDetailById" parameterType="Long" resultMap="TWarehouseFeeAgreementTypeBusinessDetailResult">
+        <include refid="selectTWarehouseFeeAgreementTypeBusinessDetailVo"/>
+        where f_id = #{fId}
+    </select>
+        
+    <insert id="insertTWarehouseFeeAgreementTypeBusinessDetail" parameterType="TWarehouseFeeAgreementTypeBusinessDetail" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_warehouse_fee_agreement_type_business_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fWarehouseFeeAgreementTypeFId != null">f_warehouse_fee_agreement_type_f_id,</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessFId != null">f_warehouse_fee_agreement_type_business_f_id,</if>
+            <if test="fFeeUnitId != null">f_fee_unit_id,</if>
+            <if test="fFreeNum != null">f_free_num,</if>
+            <if test="fSize != null">f_size,</if>
+            <if test="fBoxModel != null">f_box_model,</if>
+            <if test="fNum != null">f_num,</if>
+            <if test="fPrice != null">f_price,</if>
+            <if test="fCurrency != null">f_currency,</if>
+            <if test="fIsContract != null">f_is_contract,</if>
+            <if test="fDelFlag != null">f_del_flag,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fUpdateBy != null">f_update_by,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fCreateBy != null">f_create_by,</if>
+            <if test="fRemark != null">f_remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fWarehouseFeeAgreementTypeFId != null">#{fWarehouseFeeAgreementTypeFId},</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessFId != null">#{fWarehouseFeeAgreementTypeBusinessFId},</if>
+            <if test="fFeeUnitId != null">#{fFeeUnitId},</if>
+            <if test="fFreeNum != null">#{fFreeNum},</if>
+            <if test="fSize != null">#{fSize},</if>
+            <if test="fBoxModel != null">#{fBoxModel},</if>
+            <if test="fNum != null">#{fNum},</if>
+            <if test="fPrice != null">#{fPrice},</if>
+            <if test="fCurrency != null">#{fCurrency},</if>
+            <if test="fIsContract != null">#{fIsContract},</if>
+            <if test="fDelFlag != null">#{fDelFlag},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fUpdateBy != null">#{fUpdateBy},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fCreateBy != null">#{fCreateBy},</if>
+            <if test="fRemark != null">#{fRemark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTWarehouseFeeAgreementTypeBusinessDetail" parameterType="TWarehouseFeeAgreementTypeBusinessDetail">
+        update t_warehouse_fee_agreement_type_business_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fWarehouseFeeAgreementTypeFId != null">f_warehouse_fee_agreement_type_f_id = #{fWarehouseFeeAgreementTypeFId},</if>
+            <if test="fWarehouseFeeAgreementTypeBusinessFId != null">f_warehouse_fee_agreement_type_business_f_id = #{fWarehouseFeeAgreementTypeBusinessFId},</if>
+            <if test="fFeeUnitId != null">f_fee_unit_id = #{fFeeUnitId},</if>
+            <if test="fFreeNum != null">f_free_num = #{fFreeNum},</if>
+            <if test="fSize != null">f_size = #{fSize},</if>
+            <if test="fBoxModel != null">f_box_model = #{fBoxModel},</if>
+            <if test="fNum != null">f_num = #{fNum},</if>
+            <if test="fPrice != null">f_price = #{fPrice},</if>
+            <if test="fCurrency != null">f_currency = #{fCurrency},</if>
+            <if test="fIsContract != null">f_is_contract = #{fIsContract},</if>
+            <if test="fDelFlag != null">f_del_flag = #{fDelFlag},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fUpdateBy != null">f_update_by = #{fUpdateBy},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fCreateBy != null">f_create_by = #{fCreateBy},</if>
+            <if test="fRemark != null">f_remark = #{fRemark},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTWarehouseFeeAgreementTypeBusinessDetailById" parameterType="Long">
+        delete from t_warehouse_fee_agreement_type_business_detail where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTWarehouseFeeAgreementTypeBusinessDetailByIds" parameterType="String">
+        delete from t_warehouse_fee_agreement_type_business_detail where f_id in 
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+    
+</mapper>

+ 117 - 0
ruoyi-warehouse/src/main/resources/mapper/feeagreement/TWarehouseFeeAgreementTypeBusinessMapper.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.feeagreement.mapper.TWarehouseFeeAgreementTypeBusinessMapper">
+    
+    <resultMap type="TWarehouseFeeAgreementTypeBusiness" id="TWarehouseFeeAgreementTypeBusinessResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fWarehouseFeeAgreementTypeFId"    column="f_warehouse_fee_agreement_type_f_id"    />
+        <result property="fTFeeAgreementTypeFId"    column="f_t_fee_agreement_type_f_id"    />
+        <result property="fTFeeAgreementFTypeParentId"    column="f_t_fee_agreement_f_type_parent_id"    />
+        <result property="fFeeItem"    column="f_fee_item"    />
+        <result property="fComputingMethod"    column="f_computing_method"    />
+        <result property="fReceiptPaymentType"    column="f_receipt_payment_type"    />
+        <result property="fGetValue"    column="f_get_value"    />
+        <result property="fDelFlag"    column="f_del_flag"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fUpdateBy"    column="f_update_by"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fCreateBy"    column="f_create_by"    />
+        <result property="fRemark"    column="f_remark"    />
+    </resultMap>
+
+    <sql id="selectTWarehouseFeeAgreementTypeBusinessVo">
+        select f_id, f_warehouse_fee_agreement_type_f_id, f_t_fee_agreement_type_f_id, f_t_fee_agreement_f_type_parent_id, f_fee_item, f_computing_method, f_receipt_payment_type, f_get_value, f_del_flag, f_update_time, f_update_by, f_create_time, f_create_by, f_remark from t_warehouse_fee_agreement_type_business
+    </sql>
+
+    <select id="selectTWarehouseFeeAgreementTypeBusinessList" parameterType="TWarehouseFeeAgreementTypeBusiness" resultMap="TWarehouseFeeAgreementTypeBusinessResult">
+        <include refid="selectTWarehouseFeeAgreementTypeBusinessVo"/>
+        <where>  
+            <if test="fWarehouseFeeAgreementTypeFId != null "> and f_warehouse_fee_agreement_type_f_id = #{fWarehouseFeeAgreementTypeFId}</if>
+            <if test="fTFeeAgreementTypeFId != null "> and f_t_fee_agreement_type_f_id = #{fTFeeAgreementTypeFId}</if>
+            <if test="fTFeeAgreementFTypeParentId != null "> and f_t_fee_agreement_f_type_parent_id = #{fTFeeAgreementFTypeParentId}</if>
+            <if test="fFeeItem != null "> and f_fee_item = #{fFeeItem}</if>
+            <if test="fComputingMethod != null "> and f_computing_method = #{fComputingMethod}</if>
+            <if test="fReceiptPaymentType != null "> and f_receipt_payment_type = #{fReceiptPaymentType}</if>
+            <if test="fGetValue != null "> and f_get_value = #{fGetValue}</if>
+            <if test="fDelFlag != null "> and f_del_flag = #{fDelFlag}</if>
+            <if test="fUpdateTime != null "> and f_update_time = #{fUpdateTime}</if>
+            <if test="fUpdateBy != null "> and f_update_by = #{fUpdateBy}</if>
+            <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
+            <if test="fCreateBy != null "> and f_create_by = #{fCreateBy}</if>
+            <if test="fRemark != null  and fRemark != ''"> and f_remark = #{fRemark}</if>
+        </where>
+    </select>
+    
+    <select id="selectTWarehouseFeeAgreementTypeBusinessById" parameterType="Long" resultMap="TWarehouseFeeAgreementTypeBusinessResult">
+        <include refid="selectTWarehouseFeeAgreementTypeBusinessVo"/>
+        where f_id = #{fId}
+    </select>
+        
+    <insert id="insertTWarehouseFeeAgreementTypeBusiness" parameterType="TWarehouseFeeAgreementTypeBusiness" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_warehouse_fee_agreement_type_business
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fWarehouseFeeAgreementTypeFId != null">f_warehouse_fee_agreement_type_f_id,</if>
+            <if test="fTFeeAgreementTypeFId != null">f_t_fee_agreement_type_f_id,</if>
+            <if test="fTFeeAgreementFTypeParentId != null">f_t_fee_agreement_f_type_parent_id,</if>
+            <if test="fFeeItem != null">f_fee_item,</if>
+            <if test="fComputingMethod != null">f_computing_method,</if>
+            <if test="fReceiptPaymentType != null">f_receipt_payment_type,</if>
+            <if test="fGetValue != null">f_get_value,</if>
+            <if test="fDelFlag != null">f_del_flag,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fUpdateBy != null">f_update_by,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fCreateBy != null">f_create_by,</if>
+            <if test="fRemark != null">f_remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fWarehouseFeeAgreementTypeFId != null">#{fWarehouseFeeAgreementTypeFId},</if>
+            <if test="fTFeeAgreementTypeFId != null">#{fTFeeAgreementTypeFId},</if>
+            <if test="fTFeeAgreementFTypeParentId != null">#{fTFeeAgreementFTypeParentId},</if>
+            <if test="fFeeItem != null">#{fFeeItem},</if>
+            <if test="fComputingMethod != null">#{fComputingMethod},</if>
+            <if test="fReceiptPaymentType != null">#{fReceiptPaymentType},</if>
+            <if test="fGetValue != null">#{fGetValue},</if>
+            <if test="fDelFlag != null">#{fDelFlag},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fUpdateBy != null">#{fUpdateBy},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fCreateBy != null">#{fCreateBy},</if>
+            <if test="fRemark != null">#{fRemark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTWarehouseFeeAgreementTypeBusiness" parameterType="TWarehouseFeeAgreementTypeBusiness">
+        update t_warehouse_fee_agreement_type_business
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fWarehouseFeeAgreementTypeFId != null">f_warehouse_fee_agreement_type_f_id = #{fWarehouseFeeAgreementTypeFId},</if>
+            <if test="fTFeeAgreementTypeFId != null">f_t_fee_agreement_type_f_id = #{fTFeeAgreementTypeFId},</if>
+            <if test="fTFeeAgreementFTypeParentId != null">f_t_fee_agreement_f_type_parent_id = #{fTFeeAgreementFTypeParentId},</if>
+            <if test="fFeeItem != null">f_fee_item = #{fFeeItem},</if>
+            <if test="fComputingMethod != null">f_computing_method = #{fComputingMethod},</if>
+            <if test="fReceiptPaymentType != null">f_receipt_payment_type = #{fReceiptPaymentType},</if>
+            <if test="fGetValue != null">f_get_value = #{fGetValue},</if>
+            <if test="fDelFlag != null">f_del_flag = #{fDelFlag},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fUpdateBy != null">f_update_by = #{fUpdateBy},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fCreateBy != null">f_create_by = #{fCreateBy},</if>
+            <if test="fRemark != null">f_remark = #{fRemark},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTWarehouseFeeAgreementTypeBusinessById" parameterType="Long">
+        delete from t_warehouse_fee_agreement_type_business where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTWarehouseFeeAgreementTypeBusinessByIds" parameterType="String">
+        delete from t_warehouse_fee_agreement_type_business where f_id in 
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+    
+</mapper>

+ 124 - 0
ruoyi-warehouse/src/main/resources/mapper/feeagreement/TWarehouseFeeAgreementTypeMapper.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.feeagreement.mapper.TWarehouseFeeAgreementTypeMapper">
+
+    <resultMap type="TWarehouseFeeAgreementType" id="TWarehouseFeeAgreementTypeResult">
+        <result property="fId" column="f_id"/>
+        <result property="fCorpId" column="f_corp_id"/>
+        <result property="fTFeeAgreementTypeFId" column="f_t_fee_agreement_type_f_id"/>
+        <result property="fBegindate" column="f_begindate"/>
+        <result property="fEnddate" column="f_enddate"/>
+        <result property="fRemark" column="f_remark"/>
+        <result property="fCreateBy" column="f_create_by"/>
+        <result property="fCreateTime" column="f_create_time"/>
+        <result property="fUpdateBy" column="f_update_by"/>
+        <result property="fUpdateTime" column="f_update_time"/>
+        <result property="fDelFlag" column="f_del_flag"/>
+        <result property="fCorpName" column="f_corp_name"/>
+        <result property="fTFeeAgreementTypeName" column="f_t_fee_agreement_type_name"/>
+    </resultMap>
+
+    <sql id="selectTWarehouseFeeAgreementTypeVo">
+        select w.f_id,
+               w.f_corp_id,
+               w.f_t_fee_agreement_type_f_id,
+               w.f_begindate,
+               w.f_enddate,
+               w.f_remark,
+               w.f_create_by,
+               w.f_create_time,
+               w.f_update_by,
+               w.f_update_time,
+               w.f_del_flag,
+               c.f_name as f_corp_name,
+               f.f_name as f_t_fee_agreement_type_name
+        from t_warehouse_fee_agreement_type w
+                 left join t_corps c on c.f_id = w.f_corp_id
+                 left join t_fee_agreement_type f on f.f_id = w.f_t_fee_agreement_type_f_id
+
+    </sql>
+
+    <select id="selectTWarehouseFeeAgreementTypeList" parameterType="TWarehouseFeeAgreementType"
+            resultMap="TWarehouseFeeAgreementTypeResult">
+        <include refid="selectTWarehouseFeeAgreementTypeVo"/>
+        <where>
+            <if test="fCorpId != null ">and w.f_corp_id = #{fCorpId}</if>
+            <if test="fTFeeAgreementTypeFId != null ">and w.f_t_fee_agreement_type_f_id = #{fTFeeAgreementTypeFId}</if>
+            <if test="fBegindate != null ">and w.f_begindate = #{fBegindate}</if>
+            <if test="fEnddate != null ">and w.f_enddate = #{fEnddate}</if>
+            <if test="fRemark != null  and fRemark != ''">and w.f_remark = #{fRemark}</if>
+            <if test="fCreateBy != null ">and w.f_create_by = #{fCreateBy}</if>
+            <if test="fCreateTime != null ">and w.f_create_time = #{fCreateTime}</if>
+            <if test="fUpdateBy != null ">and w.f_update_by = #{fUpdateBy}</if>
+            <if test="fUpdateTime != null ">and w.f_update_time = #{fUpdateTime}</if>
+            <if test="fDelFlag != null ">and w.f_del_flag = #{fDelFlag}</if>
+        </where>
+    </select>
+
+    <select id="selectTWarehouseFeeAgreementTypeById" parameterType="Long" resultMap="TWarehouseFeeAgreementTypeResult">
+        <include refid="selectTWarehouseFeeAgreementTypeVo"/>
+        where w.f_id = #{fId}
+    </select>
+
+    <insert id="insertTWarehouseFeeAgreementType" parameterType="TWarehouseFeeAgreementType" useGeneratedKeys="true"
+            keyProperty="fId">
+        insert into t_warehouse_fee_agreement_type
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fCorpId != null">f_corp_id,</if>
+            <if test="fTFeeAgreementTypeFId != null">f_t_fee_agreement_type_f_id,</if>
+            <if test="fBegindate != null">f_begindate,</if>
+            <if test="fEnddate != null">f_enddate,</if>
+            <if test="fRemark != null">f_remark,</if>
+            <if test="fCreateBy != null">f_create_by,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fUpdateBy != null">f_update_by,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fDelFlag != null">f_del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fCorpId != null">#{fCorpId},</if>
+            <if test="fTFeeAgreementTypeFId != null">#{fTFeeAgreementTypeFId},</if>
+            <if test="fBegindate != null">#{fBegindate},</if>
+            <if test="fEnddate != null">#{fEnddate},</if>
+            <if test="fRemark != null">#{fRemark},</if>
+            <if test="fCreateBy != null">#{fCreateBy},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fUpdateBy != null">#{fUpdateBy},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fDelFlag != null">#{fDelFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTWarehouseFeeAgreementType" parameterType="TWarehouseFeeAgreementType">
+        update t_warehouse_fee_agreement_type
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fCorpId != null">f_corp_id = #{fCorpId},</if>
+            <if test="fTFeeAgreementTypeFId != null">f_t_fee_agreement_type_f_id = #{fTFeeAgreementTypeFId},</if>
+            <if test="fBegindate != null">f_begindate = #{fBegindate},</if>
+            <if test="fEnddate != null">f_enddate = #{fEnddate},</if>
+            <if test="fRemark != null">f_remark = #{fRemark},</if>
+            <if test="fCreateBy != null">f_create_by = #{fCreateBy},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fUpdateBy != null">f_update_by = #{fUpdateBy},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fDelFlag != null">f_del_flag = #{fDelFlag},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTWarehouseFeeAgreementTypeById" parameterType="Long">
+        delete
+        from t_warehouse_fee_agreement_type
+        where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTWarehouseFeeAgreementTypeByIds" parameterType="String">
+        delete from t_warehouse_fee_agreement_type where f_id in
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+
+</mapper>