Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusAgreementReturnedCommissionDetailController.java

@@ -0,0 +1,178 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionDetail;
+import org.jeecg.modules.business.service.IBusAgreementReturnedCommissionDetailService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 返佣详情
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="返佣详情")
+@RestController
+@RequestMapping("/business/busAgreementReturnedCommissionDetail")
+@Slf4j
+public class BusAgreementReturnedCommissionDetailController extends JeecgController<BusAgreementReturnedCommissionDetail, IBusAgreementReturnedCommissionDetailService> {
+	@Autowired
+	private IBusAgreementReturnedCommissionDetailService busAgreementReturnedCommissionDetailService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busAgreementReturnedCommissionDetail
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "返佣详情-分页列表查询")
+	@ApiOperation(value="返佣详情-分页列表查询", notes="返佣详情-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusAgreementReturnedCommissionDetail>> queryPageList(BusAgreementReturnedCommissionDetail busAgreementReturnedCommissionDetail,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusAgreementReturnedCommissionDetail> queryWrapper = QueryGenerator.initQueryWrapper(busAgreementReturnedCommissionDetail, req.getParameterMap());
+		Page<BusAgreementReturnedCommissionDetail> page = new Page<BusAgreementReturnedCommissionDetail>(pageNo, pageSize);
+		IPage<BusAgreementReturnedCommissionDetail> pageList = busAgreementReturnedCommissionDetailService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busAgreementReturnedCommissionDetail
+	 * @return
+	 */
+	@AutoLog(value = "返佣详情-添加")
+	@ApiOperation(value="返佣详情-添加", notes="返佣详情-添加")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusAgreementReturnedCommissionDetail busAgreementReturnedCommissionDetail) {
+		busAgreementReturnedCommissionDetailService.save(busAgreementReturnedCommissionDetail);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busAgreementReturnedCommissionDetail
+	 * @return
+	 */
+	@AutoLog(value = "返佣详情-编辑")
+	@ApiOperation(value="返佣详情-编辑", notes="返佣详情-编辑")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusAgreementReturnedCommissionDetail busAgreementReturnedCommissionDetail) {
+		busAgreementReturnedCommissionDetailService.updateById(busAgreementReturnedCommissionDetail);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "返佣详情-通过id删除")
+	@ApiOperation(value="返佣详情-通过id删除", notes="返佣详情-通过id删除")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busAgreementReturnedCommissionDetailService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "返佣详情-批量删除")
+	@ApiOperation(value="返佣详情-批量删除", notes="返佣详情-批量删除")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busAgreementReturnedCommissionDetailService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "返佣详情-通过id查询")
+	@ApiOperation(value="返佣详情-通过id查询", notes="返佣详情-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusAgreementReturnedCommissionDetail> queryById(@RequestParam(name="id",required=true) String id) {
+		BusAgreementReturnedCommissionDetail busAgreementReturnedCommissionDetail = busAgreementReturnedCommissionDetailService.getById(id);
+		if(busAgreementReturnedCommissionDetail==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busAgreementReturnedCommissionDetail);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busAgreementReturnedCommissionDetail
+    */
+    //@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusAgreementReturnedCommissionDetail busAgreementReturnedCommissionDetail) {
+        return super.exportXls(request, busAgreementReturnedCommissionDetail, BusAgreementReturnedCommissionDetail.class, "返佣详情");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusAgreementReturnedCommissionDetail.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusAgreementReturnedCommissionPayTypeController.java

@@ -0,0 +1,178 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionPayType;
+import org.jeecg.modules.business.service.IBusAgreementReturnedCommissionPayTypeService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 返佣支付方式
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="返佣支付方式")
+@RestController
+@RequestMapping("/business/busAgreementReturnedCommissionPayType")
+@Slf4j
+public class BusAgreementReturnedCommissionPayTypeController extends JeecgController<BusAgreementReturnedCommissionPayType, IBusAgreementReturnedCommissionPayTypeService> {
+	@Autowired
+	private IBusAgreementReturnedCommissionPayTypeService busAgreementReturnedCommissionPayTypeService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busAgreementReturnedCommissionPayType
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "返佣支付方式-分页列表查询")
+	@ApiOperation(value="返佣支付方式-分页列表查询", notes="返佣支付方式-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusAgreementReturnedCommissionPayType>> queryPageList(BusAgreementReturnedCommissionPayType busAgreementReturnedCommissionPayType,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusAgreementReturnedCommissionPayType> queryWrapper = QueryGenerator.initQueryWrapper(busAgreementReturnedCommissionPayType, req.getParameterMap());
+		Page<BusAgreementReturnedCommissionPayType> page = new Page<BusAgreementReturnedCommissionPayType>(pageNo, pageSize);
+		IPage<BusAgreementReturnedCommissionPayType> pageList = busAgreementReturnedCommissionPayTypeService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busAgreementReturnedCommissionPayType
+	 * @return
+	 */
+	@AutoLog(value = "返佣支付方式-添加")
+	@ApiOperation(value="返佣支付方式-添加", notes="返佣支付方式-添加")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusAgreementReturnedCommissionPayType busAgreementReturnedCommissionPayType) {
+		busAgreementReturnedCommissionPayTypeService.save(busAgreementReturnedCommissionPayType);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busAgreementReturnedCommissionPayType
+	 * @return
+	 */
+	@AutoLog(value = "返佣支付方式-编辑")
+	@ApiOperation(value="返佣支付方式-编辑", notes="返佣支付方式-编辑")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusAgreementReturnedCommissionPayType busAgreementReturnedCommissionPayType) {
+		busAgreementReturnedCommissionPayTypeService.updateById(busAgreementReturnedCommissionPayType);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "返佣支付方式-通过id删除")
+	@ApiOperation(value="返佣支付方式-通过id删除", notes="返佣支付方式-通过id删除")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busAgreementReturnedCommissionPayTypeService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "返佣支付方式-批量删除")
+	@ApiOperation(value="返佣支付方式-批量删除", notes="返佣支付方式-批量删除")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busAgreementReturnedCommissionPayTypeService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "返佣支付方式-通过id查询")
+	@ApiOperation(value="返佣支付方式-通过id查询", notes="返佣支付方式-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusAgreementReturnedCommissionPayType> queryById(@RequestParam(name="id",required=true) String id) {
+		BusAgreementReturnedCommissionPayType busAgreementReturnedCommissionPayType = busAgreementReturnedCommissionPayTypeService.getById(id);
+		if(busAgreementReturnedCommissionPayType==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busAgreementReturnedCommissionPayType);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busAgreementReturnedCommissionPayType
+    */
+    //@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusAgreementReturnedCommissionPayType busAgreementReturnedCommissionPayType) {
+        return super.exportXls(request, busAgreementReturnedCommissionPayType, BusAgreementReturnedCommissionPayType.class, "返佣支付方式");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusAgreementReturnedCommissionPayType.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketAgreementReturnedCommissionController.java

@@ -0,0 +1,178 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusMarketAgreementReturnedCommission;
+import org.jeecg.modules.business.service.IBusMarketAgreementReturnedCommissionService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 已返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="已返佣记录")
+@RestController
+@RequestMapping("/business/busMarketAgreementReturnedCommission")
+@Slf4j
+public class BusMarketAgreementReturnedCommissionController extends JeecgController<BusMarketAgreementReturnedCommission, IBusMarketAgreementReturnedCommissionService> {
+	@Autowired
+	private IBusMarketAgreementReturnedCommissionService busMarketAgreementReturnedCommissionService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketAgreementReturnedCommission
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "已返佣记录-分页列表查询")
+	@ApiOperation(value="已返佣记录-分页列表查询", notes="已返佣记录-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketAgreementReturnedCommission>> queryPageList(BusMarketAgreementReturnedCommission busMarketAgreementReturnedCommission,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketAgreementReturnedCommission> queryWrapper = QueryGenerator.initQueryWrapper(busMarketAgreementReturnedCommission, req.getParameterMap());
+		Page<BusMarketAgreementReturnedCommission> page = new Page<BusMarketAgreementReturnedCommission>(pageNo, pageSize);
+		IPage<BusMarketAgreementReturnedCommission> pageList = busMarketAgreementReturnedCommissionService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busMarketAgreementReturnedCommission
+	 * @return
+	 */
+	@AutoLog(value = "已返佣记录-添加")
+	@ApiOperation(value="已返佣记录-添加", notes="已返佣记录-添加")
+	//@RequiresPermissions("business:bus_market_agreement_returned_commission_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketAgreementReturnedCommission busMarketAgreementReturnedCommission) {
+		busMarketAgreementReturnedCommissionService.save(busMarketAgreementReturnedCommission);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketAgreementReturnedCommission
+	 * @return
+	 */
+	@AutoLog(value = "已返佣记录-编辑")
+	@ApiOperation(value="已返佣记录-编辑", notes="已返佣记录-编辑")
+	//@RequiresPermissions("business:bus_market_agreement_returned_commission_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketAgreementReturnedCommission busMarketAgreementReturnedCommission) {
+		busMarketAgreementReturnedCommissionService.updateById(busMarketAgreementReturnedCommission);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "已返佣记录-通过id删除")
+	@ApiOperation(value="已返佣记录-通过id删除", notes="已返佣记录-通过id删除")
+	//@RequiresPermissions("business:bus_market_agreement_returned_commission_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketAgreementReturnedCommissionService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "已返佣记录-批量删除")
+	@ApiOperation(value="已返佣记录-批量删除", notes="已返佣记录-批量删除")
+	//@RequiresPermissions("business:bus_market_agreement_returned_commission_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketAgreementReturnedCommissionService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "已返佣记录-通过id查询")
+	@ApiOperation(value="已返佣记录-通过id查询", notes="已返佣记录-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusMarketAgreementReturnedCommission> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketAgreementReturnedCommission busMarketAgreementReturnedCommission = busMarketAgreementReturnedCommissionService.getById(id);
+		if(busMarketAgreementReturnedCommission==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketAgreementReturnedCommission);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketAgreementReturnedCommission
+    */
+    //@RequiresPermissions("business:bus_market_agreement_returned_commission_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketAgreementReturnedCommission busMarketAgreementReturnedCommission) {
+        return super.exportXls(request, busMarketAgreementReturnedCommission, BusMarketAgreementReturnedCommission.class, "已返佣记录");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_agreement_returned_commission_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketAgreementReturnedCommission.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketAgreementUnreturnedCommissionController.java

@@ -0,0 +1,191 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusMarketAgreementUnreturnedCommission;
+import org.jeecg.modules.business.service.IBusMarketAgreementUnreturnedCommissionService;
+import org.jeecg.modules.rooms.entity.CesRooms;
+import org.jeecg.modules.rooms.service.CesRoomsServiceImpl;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 未返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="未返佣记录")
+@RestController
+@RequestMapping("/business/busMarketAgreementUnreturnedCommission")
+@Slf4j
+public class BusMarketAgreementUnreturnedCommissionController extends JeecgController<BusMarketAgreementUnreturnedCommission, IBusMarketAgreementUnreturnedCommissionService> {
+	@Autowired
+	private IBusMarketAgreementUnreturnedCommissionService busMarketAgreementUnreturnedCommissionService;
+
+	 @Resource
+	 private CesRoomsServiceImpl roomsService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketAgreementUnreturnedCommission
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "未返佣记录-分页列表查询")
+	@ApiOperation(value="未返佣记录-分页列表查询", notes="未返佣记录-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketAgreementUnreturnedCommission>> queryPageList(BusMarketAgreementUnreturnedCommission busMarketAgreementUnreturnedCommission,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketAgreementUnreturnedCommission> queryWrapper = QueryGenerator.initQueryWrapper(busMarketAgreementUnreturnedCommission, req.getParameterMap());
+		Page<BusMarketAgreementUnreturnedCommission> page = new Page<BusMarketAgreementUnreturnedCommission>(pageNo, pageSize);
+		IPage<BusMarketAgreementUnreturnedCommission> pageList = busMarketAgreementUnreturnedCommissionService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item->{
+			CesRooms cesRooms = roomsService.getById(item.getRoomId());
+			if (cesRooms != null){
+				String _roomNumber = cesRooms.getPrefix()+cesRooms.getName();
+				item.setRoomNumber(_roomNumber);
+			}
+		});
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busMarketAgreementUnreturnedCommission
+	 * @return
+	 */
+	@AutoLog(value = "未返佣记录-添加")
+	@ApiOperation(value="未返佣记录-添加", notes="未返佣记录-添加")
+	//@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketAgreementUnreturnedCommission busMarketAgreementUnreturnedCommission) {
+		busMarketAgreementUnreturnedCommissionService.save(busMarketAgreementUnreturnedCommission);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketAgreementUnreturnedCommission
+	 * @return
+	 */
+	@AutoLog(value = "未返佣记录-编辑")
+	@ApiOperation(value="未返佣记录-编辑", notes="未返佣记录-编辑")
+	//@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketAgreementUnreturnedCommission busMarketAgreementUnreturnedCommission) {
+		busMarketAgreementUnreturnedCommissionService.updateById(busMarketAgreementUnreturnedCommission);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "未返佣记录-通过id删除")
+	@ApiOperation(value="未返佣记录-通过id删除", notes="未返佣记录-通过id删除")
+	//@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketAgreementUnreturnedCommissionService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "未返佣记录-批量删除")
+	@ApiOperation(value="未返佣记录-批量删除", notes="未返佣记录-批量删除")
+	//@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketAgreementUnreturnedCommissionService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "未返佣记录-通过id查询")
+	@ApiOperation(value="未返佣记录-通过id查询", notes="未返佣记录-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusMarketAgreementUnreturnedCommission> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketAgreementUnreturnedCommission busMarketAgreementUnreturnedCommission = busMarketAgreementUnreturnedCommissionService.getById(id);
+		if(busMarketAgreementUnreturnedCommission==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketAgreementUnreturnedCommission);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketAgreementUnreturnedCommission
+    */
+    //@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketAgreementUnreturnedCommission busMarketAgreementUnreturnedCommission) {
+        return super.exportXls(request, busMarketAgreementUnreturnedCommission, BusMarketAgreementUnreturnedCommission.class, "未返佣记录");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketAgreementUnreturnedCommission.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusAgreementReturnedCommissionDetail.java

@@ -0,0 +1,71 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 返佣详情
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_agreement_returned_commission_detail_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_agreement_returned_commission_detail_info对象", description="返佣详情")
+public class BusAgreementReturnedCommissionDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**关联已返佣记录*/
+	@Excel(name = "关联已返佣记录", width = 15)
+    @ApiModelProperty(value = "关联已返佣记录")
+    private String agreementReturnedId;
+	/**关联未返佣记录*/
+	@Excel(name = "关联未返佣记录", width = 15)
+    @ApiModelProperty(value = "关联未返佣记录")
+    private String agreementUnreturnedId;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusAgreementReturnedCommissionPayType.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 返佣支付方式
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_agreement_returned_commission_pay_type_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_agreement_returned_commission_pay_type_info对象", description="返佣支付方式")
+public class BusAgreementReturnedCommissionPayType implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**关联返佣记录*/
+	@Excel(name = "关联返佣记录", width = 15)
+    @ApiModelProperty(value = "关联返佣记录")
+    private String agreementReturnedId;
+	/**关联支付方式*/
+	@Excel(name = "关联支付方式", width = 15)
+    @ApiModelProperty(value = "关联支付方式")
+    private String payTypeId;
+	/**支付金额*/
+	@Excel(name = "支付金额", width = 15)
+    @ApiModelProperty(value = "支付金额")
+    private BigDecimal money;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketAgreementReturnedCommission.java

@@ -0,0 +1,84 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 已返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_agreement_returned_commission_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_agreement_returned_commission_info对象", description="已返佣记录")
+public class BusMarketAgreementReturnedCommission implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**关联协议*/
+	@Excel(name = "关联协议", width = 15)
+    @ApiModelProperty(value = "关联协议")
+    private String agreementId;
+//	/**关联返佣记录*/
+//	@Excel(name = "关联返佣记录", width = 15)
+//    @ApiModelProperty(value = "关联返佣记录")
+//    private String agreementUnreturnedId;
+	/**总金额*/
+	@Excel(name = "总金额", width = 15)
+    @ApiModelProperty(value = "总金额")
+    private BigDecimal sumMoney;
+	/**已返佣金*/
+	@Excel(name = "已返佣金", width = 15)
+    @ApiModelProperty(value = "已返佣金")
+    private BigDecimal returnedCommission;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketAgreementUnreturnedCommission.java

@@ -0,0 +1,110 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 未返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_agreement_unreturned_commission_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_agreement_unreturned_commission_info对象", description="未返佣记录")
+public class BusMarketAgreementUnreturnedCommission implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**关联协议*/
+	@Excel(name = "关联协议", width = 15)
+    @ApiModelProperty(value = "关联协议")
+    private String agreementId;
+	/**关联客户协议*/
+	@Excel(name = "关联客户协议", width = 15)
+    @ApiModelProperty(value = "关联客户协议")
+    private String customerId;
+	/**单据号*/
+	@Excel(name = "单据号", width = 15)
+    @ApiModelProperty(value = "单据号")
+    private String livingOrderNo;
+	/**房间号*/
+	@Excel(name = "房间号", width = 15)
+    @ApiModelProperty(value = "房间号")
+    private String roomId;
+	/**入住时间*/
+	@Excel(name = "入住时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "入住时间")
+    private Date businessDay;
+	/**需返佣金*/
+	@Excel(name = "需返佣金", width = 15)
+    @ApiModelProperty(value = "需返佣金")
+    private BigDecimal refundedCommission;
+	/**每日记佣(0-否；1-是)*/
+	@Excel(name = "每日记佣(0-否；1-是)", width = 15)
+    @ApiModelProperty(value = "每日记佣(0-否；1-是)")
+    private Integer commission;
+	/**记佣时间*/
+	@Excel(name = "记佣时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "记佣时间")
+    private Date commissionDate;
+	/**是否已返佣(0-否；1-是)*/
+	@Excel(name = "是否已返佣(0-否；1-是)", width = 15)
+    @ApiModelProperty(value = "是否已返佣(0-否；1-是)")
+    private Integer rebate;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    private transient String roomNumber;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusAgreementReturnedCommissionDetailMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionDetail;
+
+/**
+ * @Description: 返佣详情
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface BusAgreementReturnedCommissionDetailMapper extends BaseMapper<BusAgreementReturnedCommissionDetail> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusAgreementReturnedCommissionPayTypeMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionPayType;
+
+/**
+ * @Description: 返佣支付方式
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface BusAgreementReturnedCommissionPayTypeMapper extends BaseMapper<BusAgreementReturnedCommissionPayType> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketAgreementReturnedCommissionMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusMarketAgreementReturnedCommission;
+
+/**
+ * @Description: 已返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface BusMarketAgreementReturnedCommissionMapper extends BaseMapper<BusMarketAgreementReturnedCommission> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketAgreementUnreturnedCommissionMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusMarketAgreementUnreturnedCommission;
+
+/**
+ * @Description: 未返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface BusMarketAgreementUnreturnedCommissionMapper extends BaseMapper<BusMarketAgreementUnreturnedCommission> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAgreementReturnedCommissionDetailMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.demo.business.mapper.BusAgreementReturnedCommissionDetailMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAgreementReturnedCommissionPayTypeMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.business.mapper.BusAgreementReturnedCommissionPayTypeMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementReturnedCommissionMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.business.mapper.BusMarketAgreementReturnedCommissionMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementUnreturnedCommissionMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.business.mapper.BusMarketAgreementUnreturnedCommissionMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusAgreementReturnedCommissionDetailService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionDetail;
+
+/**
+ * @Description: 返佣详情
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IBusAgreementReturnedCommissionDetailService extends IService<BusAgreementReturnedCommissionDetail> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusAgreementReturnedCommissionPayTypeService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionPayType;
+
+/**
+ * @Description: 返佣支付方式
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IBusAgreementReturnedCommissionPayTypeService extends IService<BusAgreementReturnedCommissionPayType> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusMarketAgreementReturnedCommissionService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusMarketAgreementReturnedCommission;
+
+/**
+ * @Description: 已返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IBusMarketAgreementReturnedCommissionService extends IService<BusMarketAgreementReturnedCommission> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusMarketAgreementUnreturnedCommissionService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusMarketAgreementUnreturnedCommission;
+
+/**
+ * @Description: 未返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IBusMarketAgreementUnreturnedCommissionService extends IService<BusMarketAgreementUnreturnedCommission> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusAgreementReturnedCommissionDetailServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionDetail;
+import org.jeecg.modules.business.mapper.BusAgreementReturnedCommissionDetailMapper;
+import org.jeecg.modules.business.service.IBusAgreementReturnedCommissionDetailService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 返佣详情
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class BusAgreementReturnedCommissionDetailServiceImpl extends ServiceImpl<BusAgreementReturnedCommissionDetailMapper, BusAgreementReturnedCommissionDetail> implements IBusAgreementReturnedCommissionDetailService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusAgreementReturnedCommissionPayTypeServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionPayType;
+import org.jeecg.modules.business.mapper.BusAgreementReturnedCommissionPayTypeMapper;
+import org.jeecg.modules.business.service.IBusAgreementReturnedCommissionPayTypeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 返佣支付方式
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class BusAgreementReturnedCommissionPayTypeServiceImpl extends ServiceImpl<BusAgreementReturnedCommissionPayTypeMapper, BusAgreementReturnedCommissionPayType> implements IBusAgreementReturnedCommissionPayTypeService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMarketAgreementReturnedCommissionServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusMarketAgreementReturnedCommission;
+import org.jeecg.modules.business.mapper.BusMarketAgreementReturnedCommissionMapper;
+import org.jeecg.modules.business.service.IBusMarketAgreementReturnedCommissionService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 已返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class BusMarketAgreementReturnedCommissionServiceImpl extends ServiceImpl<BusMarketAgreementReturnedCommissionMapper, BusMarketAgreementReturnedCommission> implements IBusMarketAgreementReturnedCommissionService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMarketAgreementUnreturnedCommissionServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusMarketAgreementUnreturnedCommission;
+import org.jeecg.modules.business.mapper.BusMarketAgreementUnreturnedCommissionMapper;
+import org.jeecg.modules.business.service.IBusMarketAgreementUnreturnedCommissionService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 未返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class BusMarketAgreementUnreturnedCommissionServiceImpl extends ServiceImpl<BusMarketAgreementUnreturnedCommissionMapper, BusMarketAgreementUnreturnedCommission> implements IBusMarketAgreementUnreturnedCommissionService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcDepositoryController.java

@@ -0,0 +1,180 @@
+package org.jeecg.modules.kc.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.entity.KcDepository;
+import org.jeecg.modules.kc.service.IKcDepositoryService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: kc_depository
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="kc_depository")
+@RestController
+@RequestMapping("/kc/kcDepository")
+@Slf4j
+public class KcDepositoryController extends JeecgController<KcDepository, IKcDepositoryService> {
+	@Autowired
+	private IKcDepositoryService kcDepositoryService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param kcDepository
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "kc_depository-分页列表查询")
+	@ApiOperation(value="kc_depository-分页列表查询", notes="kc_depository-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KcDepository>> queryPageList(KcDepository kcDepository,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<KcDepository> queryWrapper = QueryGenerator.initQueryWrapper(kcDepository, req.getParameterMap());
+		Page<KcDepository> page = new Page<KcDepository>(pageNo, pageSize);
+		IPage<KcDepository> pageList = kcDepositoryService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param kcDepository
+	 * @return
+	 */
+	@AutoLog(value = "kc_depository-添加")
+	@ApiOperation(value="kc_depository-添加", notes="kc_depository-添加")
+	//@RequiresPermissions("kc:kc_depository:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody KcDepository kcDepository) {
+		kcDepository.setTenantId(TokenUtils.currentTenantId());
+		kcDepositoryService.save(kcDepository);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param kcDepository
+	 * @return
+	 */
+	@AutoLog(value = "kc_depository-编辑")
+	@ApiOperation(value="kc_depository-编辑", notes="kc_depository-编辑")
+	//@RequiresPermissions("kc:kc_depository:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody KcDepository kcDepository) {
+		kcDepositoryService.updateById(kcDepository);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "kc_depository-通过id删除")
+	@ApiOperation(value="kc_depository-通过id删除", notes="kc_depository-通过id删除")
+	//@RequiresPermissions("kc:kc_depository:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		kcDepositoryService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "kc_depository-批量删除")
+	@ApiOperation(value="kc_depository-批量删除", notes="kc_depository-批量删除")
+	//@RequiresPermissions("kc:kc_depository:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.kcDepositoryService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "kc_depository-通过id查询")
+	@ApiOperation(value="kc_depository-通过id查询", notes="kc_depository-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<KcDepository> queryById(@RequestParam(name="id",required=true) String id) {
+		KcDepository kcDepository = kcDepositoryService.getById(id);
+		if(kcDepository==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(kcDepository);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param kcDepository
+    */
+    //@RequiresPermissions("kc:kc_depository:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, KcDepository kcDepository) {
+        return super.exportXls(request, kcDepository, KcDepository.class, "kc_depository");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kc:kc_depository:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KcDepository.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcDepositoryInGoodsController.java

@@ -0,0 +1,182 @@
+package org.jeecg.modules.kc.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.entity.KcDepositoryInGoods;
+import org.jeecg.modules.kc.entity.KcGoods;
+import org.jeecg.modules.kc.entity.KcGoodsType;
+import org.jeecg.modules.kc.service.IKcDepositoryInGoodsService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.kc.service.IKcGoodsService;
+import org.jeecg.modules.rooms.entity.CesGoodsUnit;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: kc_depository_in_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="kc_depository_in_goods")
+@RestController
+@RequestMapping("/kc/kcDepositoryInGoods")
+@Slf4j
+public class KcDepositoryInGoodsController extends JeecgController<KcDepositoryInGoods, IKcDepositoryInGoodsService> {
+	@Autowired
+	private IKcDepositoryInGoodsService kcDepositoryInGoodsService;
+	@Autowired
+	private IKcGoodsService kcGoodsService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param kcDepositoryInGoods
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "kc_depository_in_goods-分页列表查询")
+	@ApiOperation(value="kc_depository_in_goods-分页列表查询", notes="kc_depository_in_goods-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KcDepositoryInGoods>> queryPageList(KcDepositoryInGoods kcDepositoryInGoods,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		Page<KcDepositoryInGoods> page = new Page<KcDepositoryInGoods>(pageNo, pageSize);
+		IPage<KcDepositoryInGoods> pageList = kcDepositoryInGoodsService.depositoryInGoodsList(page, kcDepositoryInGoods.getHotelId(), kcDepositoryInGoods.getGoodsName(), kcDepositoryInGoods.getDepositoryId());
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param kcDepositoryInGoods
+	 * @return
+	 */
+	@AutoLog(value = "kc_depository_in_goods-添加")
+	@ApiOperation(value="kc_depository_in_goods-添加", notes="kc_depository_in_goods-添加")
+	//@RequiresPermissions("kc:kc_depository_in_goods:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody KcDepositoryInGoods kcDepositoryInGoods) {
+		kcDepositoryInGoodsService.save(kcDepositoryInGoods);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param kcDepositoryInGoods
+	 * @return
+	 */
+	@AutoLog(value = "kc_depository_in_goods-编辑")
+	@ApiOperation(value="kc_depository_in_goods-编辑", notes="kc_depository_in_goods-编辑")
+	//@RequiresPermissions("kc:kc_depository_in_goods:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody KcDepositoryInGoods kcDepositoryInGoods) {
+		kcDepositoryInGoodsService.updateById(kcDepositoryInGoods);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "kc_depository_in_goods-通过id删除")
+	@ApiOperation(value="kc_depository_in_goods-通过id删除", notes="kc_depository_in_goods-通过id删除")
+	//@RequiresPermissions("kc:kc_depository_in_goods:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		kcDepositoryInGoodsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "kc_depository_in_goods-批量删除")
+	@ApiOperation(value="kc_depository_in_goods-批量删除", notes="kc_depository_in_goods-批量删除")
+	//@RequiresPermissions("kc:kc_depository_in_goods:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.kcDepositoryInGoodsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "kc_depository_in_goods-通过id查询")
+	@ApiOperation(value="kc_depository_in_goods-通过id查询", notes="kc_depository_in_goods-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<KcDepositoryInGoods> queryById(@RequestParam(name="id",required=true) String id) {
+		KcDepositoryInGoods kcDepositoryInGoods = kcDepositoryInGoodsService.getById(id);
+		if(kcDepositoryInGoods==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(kcDepositoryInGoods);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param kcDepositoryInGoods
+    */
+    //@RequiresPermissions("kc:kc_depository_in_goods:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, KcDepositoryInGoods kcDepositoryInGoods) {
+        return super.exportXls(request, kcDepositoryInGoods, KcDepositoryInGoods.class, "kc_depository_in_goods");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kc:kc_depository_in_goods:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KcDepositoryInGoods.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcGoodsController.java

@@ -0,0 +1,199 @@
+package org.jeecg.modules.kc.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.entity.KcGoods;
+import org.jeecg.modules.kc.entity.KcGoodsType;
+import org.jeecg.modules.kc.service.IKcGoodsService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.kc.service.IKcGoodsTypeService;
+import org.jeecg.modules.pos.entity.PosType;
+import org.jeecg.modules.rooms.entity.CesGoodsUnit;
+import org.jeecg.modules.rooms.service.CesGoodsUnitServiceImpl;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: kc_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="kc_goods")
+@RestController
+@RequestMapping("/kc/kcGoods")
+@Slf4j
+public class KcGoodsController extends JeecgController<KcGoods, IKcGoodsService> {
+	@Autowired
+	private IKcGoodsService kcGoodsService;
+	@Autowired
+	private CesGoodsUnitServiceImpl cesGoodsUnitService;
+	@Autowired
+	private IKcGoodsTypeService kcGoodsTypeService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param kcGoods
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "kc_goods-分页列表查询")
+	@ApiOperation(value="kc_goods-分页列表查询", notes="kc_goods-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KcGoods>> queryPageList(KcGoods kcGoods,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<KcGoods> queryWrapper = QueryGenerator.initQueryWrapper(kcGoods, req.getParameterMap());
+		Page<KcGoods> page = new Page<KcGoods>(pageNo, pageSize);
+		IPage<KcGoods> pageList = kcGoodsService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			CesGoodsUnit cesGoodsUnit = cesGoodsUnitService.getById(item.getGoodUnit());
+			if (cesGoodsUnit != null) {
+				item.setGoodsUnitName(cesGoodsUnit.getName());
+			}
+			KcGoodsType kcGoodsType = kcGoodsTypeService.getById(item.getGoodType());
+			if (kcGoodsType != null) {
+				item.setGoodTypeName(kcGoodsType.getName());
+			}
+		});
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param kcGoods
+	 * @return
+	 */
+	@AutoLog(value = "kc_goods-添加")
+	@ApiOperation(value="kc_goods-添加", notes="kc_goods-添加")
+	//@RequiresPermissions("kc:kc_goods:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody KcGoods kcGoods) {
+		kcGoods.setTenantId(TokenUtils.currentTenantId());
+		kcGoodsService.save(kcGoods);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param kcGoods
+	 * @return
+	 */
+	@AutoLog(value = "kc_goods-编辑")
+	@ApiOperation(value="kc_goods-编辑", notes="kc_goods-编辑")
+	//@RequiresPermissions("kc:kc_goods:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody KcGoods kcGoods) {
+		kcGoodsService.updateById(kcGoods);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "kc_goods-通过id删除")
+	@ApiOperation(value="kc_goods-通过id删除", notes="kc_goods-通过id删除")
+	//@RequiresPermissions("kc:kc_goods:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		kcGoodsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "kc_goods-批量删除")
+	@ApiOperation(value="kc_goods-批量删除", notes="kc_goods-批量删除")
+	//@RequiresPermissions("kc:kc_goods:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.kcGoodsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "kc_goods-通过id查询")
+	@ApiOperation(value="kc_goods-通过id查询", notes="kc_goods-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<KcGoods> queryById(@RequestParam(name="id",required=true) String id) {
+		KcGoods kcGoods = kcGoodsService.getById(id);
+		if(kcGoods==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(kcGoods);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param kcGoods
+    */
+    //@RequiresPermissions("kc:kc_goods:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, KcGoods kcGoods) {
+        return super.exportXls(request, kcGoods, KcGoods.class, "kc_goods");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kc:kc_goods:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KcGoods.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcGoodsTypeController.java

@@ -0,0 +1,265 @@
+package org.jeecg.modules.kc.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.EnumUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.Enum.ResultCode;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.entity.KcGoodsType;
+import org.jeecg.modules.kc.service.IKcGoodsTypeService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.rooms.DTO.CesStockTypeDto;
+import org.jeecg.modules.rooms.Enum.CouponEnums;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: kc_goods_type
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="kc_goods_type")
+@RestController
+@RequestMapping("/kc/kcGoodsType")
+@Slf4j
+public class KcGoodsTypeController extends JeecgController<KcGoodsType, IKcGoodsTypeService> {
+	@Autowired
+	private IKcGoodsTypeService kcGoodsTypeService;
+
+//	/**
+//	 * 分页列表查询
+//	 *
+//	 * @param kcGoodsType
+//	 * @param pageNo
+//	 * @param pageSize
+//	 * @param req
+//	 * @return
+//	 */
+//	//@AutoLog(value = "kc_goods_type-分页列表查询")
+//	@ApiOperation(value="kc_goods_type-分页列表查询", notes="kc_goods_type-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<KcGoodsType>> queryPageList(KcGoodsType kcGoodsType,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+//		QueryWrapper<KcGoodsType> queryWrapper = QueryGenerator.initQueryWrapper(kcGoodsType, req.getParameterMap());
+//		Page<KcGoodsType> page = new Page<KcGoodsType>(pageNo, pageSize);
+//		IPage<KcGoodsType> pageList = kcGoodsTypeService.page(page, queryWrapper);
+//		return Result.OK(pageList);
+//	}
+
+//	/**
+//	 *   添加
+//	 *
+//	 * @param kcGoodsType
+//	 * @return
+//	 */
+//	@AutoLog(value = "kc_goods_type-添加")
+//	@ApiOperation(value="kc_goods_type-添加", notes="kc_goods_type-添加")
+//	//@RequiresPermissions("kc:kc_goods_type:add")
+//	@PostMapping(value = "/add")
+//	public Result<String> add(@RequestBody KcGoodsType kcGoodsType) {
+//		kcGoodsTypeService.save(kcGoodsType);
+//		return Result.OK("添加成功！");
+//	}
+
+//	/**
+//	 *  编辑
+//	 *
+//	 * @param kcGoodsType
+//	 * @return
+//	 */
+//	@AutoLog(value = "kc_goods_type-编辑")
+//	@ApiOperation(value="kc_goods_type-编辑", notes="kc_goods_type-编辑")
+//	//@RequiresPermissions("kc:kc_goods_type:edit")
+//	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+//	public Result<String> edit(@RequestBody KcGoodsType kcGoodsType) {
+//		kcGoodsTypeService.updateById(kcGoodsType);
+//		return Result.OK("编辑成功!");
+//	}
+//
+//	/**
+//	 *   通过id删除
+//	 *
+//	 * @param id
+//	 * @return
+//	 */
+//	@AutoLog(value = "kc_goods_type-通过id删除")
+//	@ApiOperation(value="kc_goods_type-通过id删除", notes="kc_goods_type-通过id删除")
+//	//@RequiresPermissions("kc:kc_goods_type:delete")
+//	@DeleteMapping(value = "/delete")
+//	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+//		kcGoodsTypeService.removeById(id);
+//		return Result.OK("删除成功!");
+//	}
+
+//	/**
+//	 *  批量删除
+//	 *
+//	 * @param ids
+//	 * @return
+//	 */
+//	@AutoLog(value = "kc_goods_type-批量删除")
+//	@ApiOperation(value="kc_goods_type-批量删除", notes="kc_goods_type-批量删除")
+//	//@RequiresPermissions("kc:kc_goods_type:deleteBatch")
+//	@DeleteMapping(value = "/deleteBatch")
+//	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+//		this.kcGoodsTypeService.removeByIds(Arrays.asList(ids.split(",")));
+//		return Result.OK("批量删除成功!");
+//	}
+
+//	/**
+//	 * 通过id查询
+//	 *
+//	 * @param id
+//	 * @return
+//	 */
+//	//@AutoLog(value = "kc_goods_type-通过id查询")
+//	@ApiOperation(value="kc_goods_type-通过id查询", notes="kc_goods_type-通过id查询")
+//	@GetMapping(value = "/queryById")
+//	public Result<KcGoodsType> queryById(@RequestParam(name="id",required=true) String id) {
+//		KcGoodsType kcGoodsType = kcGoodsTypeService.getById(id);
+//		if(kcGoodsType==null) {
+//			return Result.error("未找到对应数据");
+//		}
+//		return Result.OK(kcGoodsType);
+//	}
+//
+//    /**
+//    * 导出excel
+//    *
+//    * @param request
+//    * @param kcGoodsType
+//    */
+//    //@RequiresPermissions("kc:kc_goods_type:exportXls")
+//    @RequestMapping(value = "/exportXls")
+//    public ModelAndView exportXls(HttpServletRequest request, KcGoodsType kcGoodsType) {
+//        return super.exportXls(request, kcGoodsType, KcGoodsType.class, "kc_goods_type");
+//    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kc:kc_goods_type:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KcGoodsType.class);
+    }
+
+	 @ApiOperation(value="分类查询", notes="分类查询")
+	 @GetMapping(value = "/tree")
+	 public Result tree(@RequestParam String hotelId){
+		 if(StringUtils.isBlank(hotelId)){
+			 return Result.error(ResultCode.PARAM_MISS);
+		 }
+		 try{
+			 return kcGoodsTypeService.tree(hotelId);
+		 }catch (Exception e){
+			 return Result.error(e.getMessage());
+		 }
+	 }
+
+	 @ApiOperation(value="顶级分类查询", notes="分类查询")
+	 @GetMapping(value = "/getTopTypes")
+	 public Result getTopTypes(@RequestParam String hotelId){
+		 if(StringUtils.isBlank(hotelId)){
+			 return Result.error(ResultCode.PARAM_MISS);
+		 }
+		 try{
+			 return kcGoodsTypeService.getTopTypes(hotelId);
+		 }catch (Exception e){
+			 return Result.error(e.getMessage());
+		 }
+	 }
+
+	 @ApiOperation(value="分类创建", notes="分类创建")
+	 @PostMapping(value = "/create")
+	 public Result create(@RequestBody KcGoodsType dto){
+		 if(StringUtils.isBlank(dto.getHotelId())){
+			 return Result.error(ResultCode.PARAM_MISS);
+		 }
+		 if(StringUtils.isBlank(dto.getName())){
+			 return Result.error(ResultCode.PARAM_MISS);
+		 }
+		 if(StringUtils.isBlank(dto.getParentId())){
+			 return Result.error(ResultCode.PARAM_MISS);
+		 }
+		 try{
+			 return kcGoodsTypeService.create(dto);
+		 }catch (Exception e){
+			 return Result.error(e.getMessage());
+		 }
+	 }
+
+
+	 @ApiOperation(value="分类修改", notes="分类修改")
+	 @PutMapping(value = "/modify")
+	 public Result modify(@RequestBody KcGoodsType dto){
+		 if(StringUtils.isBlank(dto.getId())){
+			 return Result.error(ResultCode.PARAM_MISS);
+		 }
+		 if(StringUtils.isBlank(dto.getHotelId())){
+			 return Result.error(ResultCode.PARAM_MISS);
+		 }
+		 if(StringUtils.isBlank(dto.getName())){
+			 return Result.error(ResultCode.PARAM_MISS);
+		 }
+		 if(StringUtils.isBlank(dto.getParentId())){
+			 return Result.error(ResultCode.PARAM_MISS);
+		 }
+		 try{
+			 return kcGoodsTypeService.modify(dto);
+		 }catch (Exception e){
+			 return Result.error(e.getMessage());
+		 }
+	 }
+
+
+	 @ApiOperation(value="分类删除", notes="分类删除")
+	 @DeleteMapping(value = "/delete")
+	 public Result delete(KcGoodsType dto) {
+		 if(StringUtils.isBlank(dto.getId())){
+			 return Result.error(ResultCode.PARAM_MISS);
+		 }
+		 try{
+			 return kcGoodsTypeService.delete(dto);
+		 }catch (Exception e){
+			 return Result.error(e.getMessage());
+		 }
+	 }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcStockController.java

@@ -0,0 +1,409 @@
+package org.jeecg.modules.kc.controller;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.entity.*;
+import org.jeecg.modules.kc.enums.OutBoundEnum;
+import org.jeecg.modules.kc.enums.StorageEnum;
+import org.jeecg.modules.kc.service.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.pos.entity.PosType;
+import org.jeecg.modules.rooms.entity.CesGoodsUnit;
+import org.jeecg.modules.rooms.service.CesGoodsUnitServiceImpl;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: kc_stock
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="kc_stock")
+@RestController
+@RequestMapping("/kc/kcStock")
+@Slf4j
+public class KcStockController extends JeecgController<KcStock, IKcStockService> {
+	@Autowired
+	private IKcStockService kcStockService;
+@Autowired
+private IKcSupplierInGoodsService kcSupplierInGoodsService;
+@Autowired
+private IKcGoodsService kcGoodsService;
+@Autowired
+private CesGoodsUnitServiceImpl cesGoodsUnitService;
+@Autowired
+private IKcDepositoryService kcDepositoryService;
+@Autowired
+private IKcSupplierService kcSupplierService;
+@Autowired
+private IKcStockDetailService kcStockDetailService;
+@Autowired
+private  IKcDepositoryInGoodsService kcDepositoryInGoodsService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param kcStock
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "kc_stock-分页列表查询")
+	@ApiOperation(value="kc_stock-分页列表查询", notes="kc_stock-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KcStock>> queryPageList(KcStock kcStock,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<KcStock> queryWrapper = QueryGenerator.initQueryWrapper(kcStock, req.getParameterMap());
+		Page<KcStock> page = new Page<KcStock>(pageNo, pageSize);
+		IPage<KcStock> pageList = kcStockService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			KcDepository kcDepository = kcDepositoryService.getById(item.getDepositoryId());
+			if (kcDepository != null) {
+				item.setDepositoryName(kcDepository.getName());
+			}
+			KcSupplier kcSupplier = kcSupplierService.getById(item.getSupplierId());
+			if (kcSupplier != null) {
+				item.setSupplierName(kcSupplier.getName());
+			}
+			if (item.getType().equals(2)) {
+				StorageEnum storageEnum = StorageEnum.val(item.getStockType());
+				if (storageEnum != null) {
+					item.setStockTypeName(storageEnum.getTitle());
+				}
+			}
+		});
+		return Result.OK(pageList);
+	}
+
+	 /**
+	  * 入库类型列表
+	  * @return
+	  */
+	 @ApiOperation(value="入库类型列表", notes="入库类型列表")
+	 @GetMapping(value = "/storageTypeList")
+	 public Result<List<DictModel>> storageTypeList() {
+		 return Result.OK(StorageEnum.getDictList());
+	 }
+
+	 /**
+	  * 出库类型列表
+	  * @return
+	  */
+	 @ApiOperation(value="出库类型列表", notes="出库类型列表")
+	 @GetMapping(value = "/outBoundTypeList")
+	 public Result<List<DictModel>> outBoundTypeList() {
+		 return Result.OK(OutBoundEnum.getDictList());
+	 }
+
+	 /**
+	  * 生成16位数字+prefix
+	  * @param prefix
+	  * @return
+	  */
+	 private String randomNumber(String prefix) {
+		 int first = new Random(10).nextInt(8) + 1;
+		 int hashCode = UUID.randomUUID().toString().hashCode();
+		 if (hashCode < 0) {
+			 hashCode = -hashCode;
+		 }
+		 return prefix + first + String.format("%015d", hashCode);
+	 }
+
+	/**
+	 *   出入库添加
+	 *
+	 * @param kcStock
+	 * @return
+	 */
+	@AutoLog(value = "出入库添加")
+	@ApiOperation(value="出入库添加", notes="出入库添加")
+	//@RequiresPermissions("kc:kc_stock:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody KcStock kcStock) {
+		if (ObjectUtils.isEmpty(kcStock.getStockDetailList())) {
+			return Result.error("请先选择商品");
+		}
+		kcStock.setTenantId(TokenUtils.currentTenantId());
+		kcStock.setStatus(0);
+		String prefix = "CK";
+		if (kcStock.getType().equals(2)) {
+			prefix = "RK";
+		} else if (kcStock.getType().equals(3)) {
+			prefix = "PD";
+		}
+		kcStock.setCode(randomNumber(prefix));
+		LoginUser user = TokenUtils.getAuthUser();
+		kcStock.setCreateAt(user.getRealname());
+		kcStock.setCreateTime(DateTime.now());
+		String stockInfo = "";
+		for (KcStockDetail kcStockDetail : kcStock.getStockDetailList()) {
+			KcSupplierInGoods kcSupplierInGoods = kcSupplierInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
+			if (kcSupplierInGoods != null) {
+				KcGoods kcGoods = kcGoodsService.getById(kcSupplierInGoods.getGoodsId());
+				if (kcGoods != null) {
+					kcStockDetail.setKcGoods(kcGoods);
+					CesGoodsUnit cesGoodsUnit = cesGoodsUnitService.getById(kcGoods.getGoodUnit());
+					if (cesGoodsUnit != null) {
+						stockInfo += kcGoods.getName() + kcStockDetail.getNum() + cesGoodsUnit.getName() + ",";
+					}
+				}
+			}
+		}
+		kcStock.setStockInfo(stockInfo);
+		kcStockService.save(kcStock);
+
+		for (KcStockDetail kcStockDetail : kcStock.getStockDetailList()) {
+			kcStockDetail.setHotelId(kcStock.getHotelId());
+			kcStockDetail.setTenantId(TokenUtils.currentTenantId());
+			kcStockDetail.setStockId(kcStock.getCode());
+			kcStockDetail.setId("");
+		}
+		kcStockDetailService.saveBatch(kcStock.getStockDetailList());
+
+		return Result.OK("添加成功！");
+	}
+
+	 /**
+	  * 出入库审核
+	  * @param kcStock
+	  * @return
+	  */
+	 @ApiOperation(value="审核", notes="审核")
+	 @PostMapping(value = "/audit")
+	 public Result<String> audit(@RequestBody KcStock kcStock) {
+		 kcStockService.updateById(kcStock);
+		 if (kcStock.getStatus().equals(1)) {
+			 if (kcStock.getType().equals(2)) {
+				 LambdaQueryWrapper<KcStockDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				 lambdaQueryWrapper.eq(KcStockDetail::getStockId, kcStock.getCode());
+				 List<KcStockDetail> stockDetailList = kcStockDetailService.list(lambdaQueryWrapper);
+				 if (ObjectUtils.isNotEmpty(stockDetailList)) {
+					 for (KcStockDetail kcStockDetail : stockDetailList) {
+						 KcSupplierInGoods kcSupplierInGoods = kcSupplierInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
+						 if (kcSupplierInGoods != null) {
+							 KcGoods kcGoods = kcGoodsService.getById(kcSupplierInGoods.getGoodsId());
+							 if (kcGoods != null) {
+								 kcStockDetail.setKcGoods(kcGoods);
+							 }
+						 }
+						 if (ObjectUtils.isNotEmpty(kcStockDetail.getKcGoods())) {
+							 LambdaQueryWrapper<KcDepositoryInGoods> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+							 lambdaQueryWrapper2.eq(KcDepositoryInGoods::getDepositoryId, kcStock.getDepositoryId());
+							 lambdaQueryWrapper2.eq(KcDepositoryInGoods::getGoodsId, kcStockDetail.getKcGoods().getId());
+							 KcDepositoryInGoods kcDepositoryInGoods = kcDepositoryInGoodsService.getOne(lambdaQueryWrapper2);
+							 if (kcDepositoryInGoods != null) {
+								 kcDepositoryInGoods.setNum(kcDepositoryInGoods.getNum() + kcStockDetail.getNum());
+							 } else {
+								 kcDepositoryInGoods = new KcDepositoryInGoods();
+								 kcDepositoryInGoods.setTenantId(kcStock.getTenantId());
+								 kcDepositoryInGoods.setHotelId(kcStock.getHotelId());
+								 kcDepositoryInGoods.setDepositoryId(kcStock.getDepositoryId());
+								 kcDepositoryInGoods.setGoodsId(kcStockDetail.getKcGoods().getId());
+								 kcDepositoryInGoods.setNum(kcStockDetail.getNum());
+							 }
+							 kcDepositoryInGoodsService.saveOrUpdate(kcDepositoryInGoods);
+						 }
+					 }
+				 }
+			 } else if (kcStock.getType().equals(1)) {
+				 LambdaQueryWrapper<KcStockDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				 lambdaQueryWrapper.eq(KcStockDetail::getStockId, kcStock.getCode());
+				 List<KcStockDetail> stockDetailList = kcStockDetailService.list(lambdaQueryWrapper);
+				 if (ObjectUtils.isNotEmpty(stockDetailList)) {
+					 for (KcStockDetail kcStockDetail : stockDetailList) {
+						 KcDepositoryInGoods depositoryInGoods = kcDepositoryInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
+						 if (depositoryInGoods != null) {
+							 if (depositoryInGoods != null) {
+								 Integer num = depositoryInGoods.getNum() - kcStockDetail.getNum();
+								 if (num < 0) num = 0;
+								 depositoryInGoods.setNum(num);
+								 kcDepositoryInGoodsService.updateById(depositoryInGoods);
+							 }
+						 }
+					 }
+				 }
+			 } else if (kcStock.getType().equals(3)) {
+				 LambdaQueryWrapper<KcStockDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				 lambdaQueryWrapper.eq(KcStockDetail::getStockId, kcStock.getCode());
+				 List<KcStockDetail> stockDetailList = kcStockDetailService.list(lambdaQueryWrapper);
+				 if (ObjectUtils.isNotEmpty(stockDetailList)) {
+					 for (KcStockDetail kcStockDetail : stockDetailList) {
+						 KcDepositoryInGoods depositoryInGoods = kcDepositoryInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
+						 if (depositoryInGoods != null) {
+							 if (depositoryInGoods != null) {
+								 Integer num = kcStockDetail.getNum();
+								 if (num < 0) num = 0;
+								 depositoryInGoods.setNum(num);
+								 kcDepositoryInGoodsService.updateById(depositoryInGoods);
+							 }
+						 }
+					 }
+				 }
+			 }
+		 }
+		 return Result.OK("审核成功!");
+	 }
+
+	/**
+	 *  编辑
+	 *
+	 * @param kcStock
+	 * @return
+	 */
+	@AutoLog(value = "kc_stock-编辑")
+	@ApiOperation(value="kc_stock-编辑", notes="kc_stock-编辑")
+	//@RequiresPermissions("kc:kc_stock:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody KcStock kcStock) {
+		if (ObjectUtils.isEmpty(kcStock.getStockDetailList())) {
+			return Result.error("请先选择商品");
+		}
+		String stockInfo = "";
+		for (KcStockDetail kcStockDetail : kcStock.getStockDetailList()) {
+			KcSupplierInGoods kcSupplierInGoods = kcSupplierInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
+			if (kcSupplierInGoods != null) {
+				KcGoods kcGoods = kcGoodsService.getById(kcSupplierInGoods.getGoodsId());
+				if (kcGoods != null) {
+					kcStockDetail.setKcGoods(kcGoods);
+					CesGoodsUnit cesGoodsUnit = cesGoodsUnitService.getById(kcGoods.getGoodUnit());
+					if (cesGoodsUnit != null) {
+						stockInfo += kcGoods.getName() + kcStockDetail.getNum() + cesGoodsUnit.getName() + ",";
+					}
+				}
+			}
+		}
+		kcStock.setStockInfo(stockInfo);
+		kcStockService.updateById(kcStock);
+
+		LambdaQueryWrapper<KcStockDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(KcStockDetail::getStockId, kcStock.getCode());
+		kcStockDetailService.remove(lambdaQueryWrapper);
+
+		for (KcStockDetail kcStockDetail : kcStock.getStockDetailList()) {
+			kcStockDetail.setHotelId(kcStock.getHotelId());
+			kcStockDetail.setTenantId(TokenUtils.currentTenantId());
+			kcStockDetail.setStockId(kcStock.getCode());
+			kcStockDetail.setId("");
+		}
+		kcStockDetailService.saveBatch(kcStock.getStockDetailList());
+
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "kc_stock-通过id删除")
+	@ApiOperation(value="kc_stock-通过id删除", notes="kc_stock-通过id删除")
+	//@RequiresPermissions("kc:kc_stock:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		KcStock kcStock = kcStockService.getById(id);
+		if (kcStock.getStatus().equals(1)) {
+			return Result.error("审核通过不能删除");
+		}
+		LambdaQueryWrapper<KcStockDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(KcStockDetail::getStockId, kcStock.getCode());
+		kcStockDetailService.remove(lambdaQueryWrapper);
+		kcStockService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "kc_stock-批量删除")
+	@ApiOperation(value="kc_stock-批量删除", notes="kc_stock-批量删除")
+	//@RequiresPermissions("kc:kc_stock:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.kcStockService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "kc_stock-通过id查询")
+	@ApiOperation(value="kc_stock-通过id查询", notes="kc_stock-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<KcStock> queryById(@RequestParam(name="id",required=true) String id) {
+		KcStock kcStock = kcStockService.getById(id);
+		if(kcStock==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(kcStock);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param kcStock
+    */
+    //@RequiresPermissions("kc:kc_stock:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, KcStock kcStock) {
+        return super.exportXls(request, kcStock, KcStock.class, "kc_stock");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kc:kc_stock:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KcStock.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcStockDetailController.java

@@ -0,0 +1,203 @@
+package org.jeecg.modules.kc.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.entity.*;
+import org.jeecg.modules.kc.enums.StorageEnum;
+import org.jeecg.modules.kc.service.IKcDepositoryInGoodsService;
+import org.jeecg.modules.kc.service.IKcGoodsService;
+import org.jeecg.modules.kc.service.IKcStockDetailService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.kc.service.IKcSupplierInGoodsService;
+import org.jeecg.modules.rooms.entity.CesGoodsUnit;
+import org.jeecg.modules.rooms.service.CesGoodsUnitServiceImpl;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: kc_stock_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="kc_stock_detail")
+@RestController
+@RequestMapping("/kc/kcStockDetail")
+@Slf4j
+public class KcStockDetailController extends JeecgController<KcStockDetail, IKcStockDetailService> {
+	@Autowired
+	private IKcStockDetailService kcStockDetailService;
+	@Autowired
+	private IKcGoodsService kcGoodsService;
+	@Autowired
+	private CesGoodsUnitServiceImpl cesGoodsUnitService;
+	@Autowired
+	private IKcSupplierInGoodsService kcSupplierInGoodsService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param kcStockDetail
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "kc_stock_detail-分页列表查询")
+	@ApiOperation(value="kc_stock_detail-分页列表查询", notes="kc_stock_detail-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KcStockDetail>> queryPageList(KcStockDetail kcStockDetail,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<KcStockDetail> queryWrapper = QueryGenerator.initQueryWrapper(kcStockDetail, req.getParameterMap());
+		Page<KcStockDetail> page = new Page<KcStockDetail>(pageNo, pageSize);
+		IPage<KcStockDetail> pageList = kcStockDetailService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			KcSupplierInGoods kcSupplierInGoods = kcSupplierInGoodsService.getById(item.getSupplierInGoodsId());
+			if (kcSupplierInGoods != null) {
+				KcGoods kcGoods = kcGoodsService.getById(kcSupplierInGoods.getGoodsId());
+				if (kcGoods != null) {
+					item.setSpec(kcGoods.getSpec());
+					item.setName(kcGoods.getName());
+					CesGoodsUnit cesGoodsUnit = cesGoodsUnitService.getById(kcGoods.getGoodUnit());
+					if (cesGoodsUnit != null) {
+						item.setGoodUnit(cesGoodsUnit.getName());
+					}
+				}
+			}
+		});
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param kcStockDetail
+	 * @return
+	 */
+	@AutoLog(value = "kc_stock_detail-添加")
+	@ApiOperation(value="kc_stock_detail-添加", notes="kc_stock_detail-添加")
+	//@RequiresPermissions("kc:kc_stock_detail:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody KcStockDetail kcStockDetail) {
+		kcStockDetailService.save(kcStockDetail);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param kcStockDetail
+	 * @return
+	 */
+	@AutoLog(value = "kc_stock_detail-编辑")
+	@ApiOperation(value="kc_stock_detail-编辑", notes="kc_stock_detail-编辑")
+	//@RequiresPermissions("kc:kc_stock_detail:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody KcStockDetail kcStockDetail) {
+		kcStockDetailService.updateById(kcStockDetail);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "kc_stock_detail-通过id删除")
+	@ApiOperation(value="kc_stock_detail-通过id删除", notes="kc_stock_detail-通过id删除")
+	//@RequiresPermissions("kc:kc_stock_detail:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		kcStockDetailService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "kc_stock_detail-批量删除")
+	@ApiOperation(value="kc_stock_detail-批量删除", notes="kc_stock_detail-批量删除")
+	//@RequiresPermissions("kc:kc_stock_detail:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.kcStockDetailService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "kc_stock_detail-通过id查询")
+	@ApiOperation(value="kc_stock_detail-通过id查询", notes="kc_stock_detail-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<KcStockDetail> queryById(@RequestParam(name="id",required=true) String id) {
+		KcStockDetail kcStockDetail = kcStockDetailService.getById(id);
+		if(kcStockDetail==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(kcStockDetail);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param kcStockDetail
+    */
+    //@RequiresPermissions("kc:kc_stock_detail:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, KcStockDetail kcStockDetail) {
+        return super.exportXls(request, kcStockDetail, KcStockDetail.class, "kc_stock_detail");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kc:kc_stock_detail:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KcStockDetail.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcSupplierController.java

@@ -0,0 +1,192 @@
+package org.jeecg.modules.kc.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.entity.KcSupplier;
+import org.jeecg.modules.kc.entity.KcSupplierInGoods;
+import org.jeecg.modules.kc.service.IKcSupplierInGoodsService;
+import org.jeecg.modules.kc.service.IKcSupplierService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: kc_supplier
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="kc_supplier")
+@RestController
+@RequestMapping("/kc/kcSupplier")
+@Slf4j
+public class KcSupplierController extends JeecgController<KcSupplier, IKcSupplierService> {
+	@Autowired
+	private IKcSupplierService kcSupplierService;
+	@Autowired
+	private IKcSupplierInGoodsService kcSupplierInGoodsService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param kcSupplier
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "kc_supplier-分页列表查询")
+	@ApiOperation(value="kc_supplier-分页列表查询", notes="kc_supplier-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KcSupplier>> queryPageList(KcSupplier kcSupplier,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<KcSupplier> queryWrapper = QueryGenerator.initQueryWrapper(kcSupplier, req.getParameterMap());
+		Page<KcSupplier> page = new Page<KcSupplier>(pageNo, pageSize);
+		IPage<KcSupplier> pageList = kcSupplierService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param kcSupplier
+	 * @return
+	 */
+	@AutoLog(value = "kc_supplier-添加")
+	@ApiOperation(value="kc_supplier-添加", notes="kc_supplier-添加")
+	//@RequiresPermissions("kc:kc_supplier:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody KcSupplier kcSupplier) {
+		kcSupplier.setTenantId(TokenUtils.currentTenantId());
+		kcSupplierService.save(kcSupplier);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param kcSupplier
+	 * @return
+	 */
+	@AutoLog(value = "kc_supplier-编辑")
+	@ApiOperation(value="kc_supplier-编辑", notes="kc_supplier-编辑")
+	//@RequiresPermissions("kc:kc_supplier:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody KcSupplier kcSupplier) {
+		kcSupplierService.updateById(kcSupplier);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "kc_supplier-通过id删除")
+	@ApiOperation(value="kc_supplier-通过id删除", notes="kc_supplier-通过id删除")
+	//@RequiresPermissions("kc:kc_supplier:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		LambdaQueryWrapper<KcSupplierInGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(KcSupplierInGoods::getSupplierId, id);
+		long count = kcSupplierInGoodsService.count(lambdaQueryWrapper);
+		if (count > 0) {
+			return Result.error("请先删除供货商品");
+		}
+		kcSupplierService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "kc_supplier-批量删除")
+	@ApiOperation(value="kc_supplier-批量删除", notes="kc_supplier-批量删除")
+	//@RequiresPermissions("kc:kc_supplier:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.kcSupplierService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "kc_supplier-通过id查询")
+	@ApiOperation(value="kc_supplier-通过id查询", notes="kc_supplier-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<KcSupplier> queryById(@RequestParam(name="id",required=true) String id) {
+		KcSupplier kcSupplier = kcSupplierService.getById(id);
+		if(kcSupplier==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(kcSupplier);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param kcSupplier
+    */
+    //@RequiresPermissions("kc:kc_supplier:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, KcSupplier kcSupplier) {
+        return super.exportXls(request, kcSupplier, KcSupplier.class, "kc_supplier");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kc:kc_supplier:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KcSupplier.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcSupplierInGoodsController.java

@@ -0,0 +1,260 @@
+package org.jeecg.modules.kc.controller;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.dto.SupplierInGoodsDto;
+import org.jeecg.modules.kc.entity.KcGoods;
+import org.jeecg.modules.kc.entity.KcGoodsType;
+import org.jeecg.modules.kc.entity.KcSupplier;
+import org.jeecg.modules.kc.entity.KcSupplierInGoods;
+import org.jeecg.modules.kc.service.IKcGoodsService;
+import org.jeecg.modules.kc.service.IKcGoodsTypeService;
+import org.jeecg.modules.kc.service.IKcSupplierInGoodsService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.rooms.entity.CesGoodsUnit;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: kc_supplier_in_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="kc_supplier_in_goods")
+@RestController
+@RequestMapping("/kc/kcSupplierInGoods")
+@Slf4j
+public class KcSupplierInGoodsController extends JeecgController<KcSupplierInGoods, IKcSupplierInGoodsService> {
+	@Autowired
+	private IKcSupplierInGoodsService kcSupplierInGoodsService;
+	@Autowired
+	private IKcGoodsService kcGoodsService;
+	@Autowired
+	private IKcGoodsTypeService kcGoodsTypeService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param kcSupplierInGoods
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "kc_supplier_in_goods-分页列表查询")
+	@ApiOperation(value="kc_supplier_in_goods-分页列表查询", notes="kc_supplier_in_goods-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KcSupplierInGoods>> queryPageList(KcSupplierInGoods kcSupplierInGoods,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		Page<KcSupplierInGoods> page = new Page<KcSupplierInGoods>(pageNo, pageSize);
+		IPage<KcSupplierInGoods> pageList = kcSupplierInGoodsService.supplierInGoodsList(page, kcSupplierInGoods.getHotelId(), kcSupplierInGoods.getGoodsName(), kcSupplierInGoods.getGoodsTypeId(), kcSupplierInGoods.getSupplierId());
+		return Result.OK(pageList);
+	}
+
+	 /**
+	  * 供货/待供货商品分页列表查询
+	  * @param kcGoods
+	  * @param pageNo
+	  * @param pageSize
+	  * @param supplierId 供应商id
+	  * @param inGoods 是否供货商品
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "kc_supplier_in_goods-分页列表查询")
+	 @ApiOperation(value="kc_supplier_in_goods-分页列表查询", notes="kc_supplier_in_goods-分页列表查询")
+	 @GetMapping(value = "/goodsList")
+	 public Result<IPage<KcGoods>> goodsList(KcGoods kcGoods,
+														   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+											 @RequestParam(name="supplierId",required = true) String supplierId,
+											 @RequestParam(name="inGoods",required = true) @JsonFormat() Boolean inGoods,
+														   HttpServletRequest req) {
+		 LambdaQueryWrapper<KcGoods> queryWrapper = QueryGenerator.initQueryWrapper(kcGoods, req.getParameterMap()).lambda();
+		 if (ObjectUtils.isEmpty(supplierId)) {
+			 return Result.error("请传入供应商id");
+		 }
+		 if (inGoods) {
+			 queryWrapper.exists("select 1 from kc_supplier_in_goods where goods_id=kc_goods.id and supplier_id=" + supplierId);
+		 } else {
+			 queryWrapper.notExists("select 1 from kc_supplier_in_goods where goods_id=kc_goods.id and supplier_id=" + supplierId);
+		 }
+		 Page<KcGoods> page = new Page<KcGoods>(pageNo, pageSize);
+		 IPage<KcGoods> pageList = kcGoodsService.page(page, queryWrapper);
+		 pageList.getRecords().forEach(item -> {
+			 KcGoodsType kcGoodsType = kcGoodsTypeService.getById(item.getGoodType());
+			 if (kcGoodsType != null) {
+				 item.setGoodTypeName(kcGoodsType.getName());
+			 }
+			 LambdaQueryWrapper<KcSupplierInGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			 lambdaQueryWrapper.eq(KcSupplierInGoods::getSupplierId, supplierId);
+			 lambdaQueryWrapper.eq(KcSupplierInGoods::getGoodsId, item.getId());
+			 KcSupplierInGoods kcSupplierInGoods = kcSupplierInGoodsService.getOne(lambdaQueryWrapper);
+			 if (kcSupplierInGoods != null) {
+				 item.setSupplierInGoodsId(kcSupplierInGoods.getId());
+			 }
+		 });
+		 return Result.OK(pageList);
+	 }
+
+	/**
+	 *   添加
+	 *
+	 * @param dto
+	 * @return
+	 */
+	@AutoLog(value = "kc_supplier_in_goods-添加")
+	@ApiOperation(value="kc_supplier_in_goods-添加", notes="kc_supplier_in_goods-添加")
+	//@RequiresPermissions("kc:kc_supplier_in_goods:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody SupplierInGoodsDto dto) {
+		if (ObjectUtils.isEmpty(dto.getGoodsIds())) {
+			return Result.error("请先选择商品");
+		}
+		List<KcSupplierInGoods> list = new ArrayList<>();
+		for (String goodsId : dto.getGoodsIds()) {
+			LambdaQueryWrapper<KcSupplierInGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(KcSupplierInGoods::getGoodsId, goodsId);
+			lambdaQueryWrapper.eq(KcSupplierInGoods::getSupplierId, dto.getSupplierId());
+			Long count = kcSupplierInGoodsService.count(lambdaQueryWrapper);
+			if (count <= 0) {
+				KcSupplierInGoods kcSupplierInGoods = new KcSupplierInGoods();
+				kcSupplierInGoods.setTenantId(TokenUtils.currentTenantId());
+				kcSupplierInGoods.setHotelId(dto.getHotelId());
+				kcSupplierInGoods.setGoodsId(goodsId);
+				kcSupplierInGoods.setPrice(BigDecimal.ZERO);
+				kcSupplierInGoods.setSupplierId(dto.getSupplierId());
+				list.add(kcSupplierInGoods);
+			}
+		}
+		kcSupplierInGoodsService.saveBatch(list);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param kcSupplierInGoods
+	 * @return
+	 */
+	@AutoLog(value = "kc_supplier_in_goods-编辑")
+	@ApiOperation(value="kc_supplier_in_goods-编辑", notes="kc_supplier_in_goods-编辑")
+	//@RequiresPermissions("kc:kc_supplier_in_goods:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody KcSupplierInGoods kcSupplierInGoods) {
+		kcSupplierInGoodsService.updateById(kcSupplierInGoods);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "kc_supplier_in_goods-通过id删除")
+	@ApiOperation(value="kc_supplier_in_goods-通过id删除", notes="kc_supplier_in_goods-通过id删除")
+	//@RequiresPermissions("kc:kc_supplier_in_goods:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		kcSupplierInGoodsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "kc_supplier_in_goods-批量删除")
+	@ApiOperation(value="kc_supplier_in_goods-批量删除", notes="kc_supplier_in_goods-批量删除")
+	//@RequiresPermissions("kc:kc_supplier_in_goods:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.kcSupplierInGoodsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "kc_supplier_in_goods-通过id查询")
+	@ApiOperation(value="kc_supplier_in_goods-通过id查询", notes="kc_supplier_in_goods-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<KcSupplierInGoods> queryById(@RequestParam(name="id",required=true) String id) {
+		KcSupplierInGoods kcSupplierInGoods = kcSupplierInGoodsService.getById(id);
+		if(kcSupplierInGoods==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(kcSupplierInGoods);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param kcSupplierInGoods
+    */
+    //@RequiresPermissions("kc:kc_supplier_in_goods:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, KcSupplierInGoods kcSupplierInGoods) {
+        return super.exportXls(request, kcSupplierInGoods, KcSupplierInGoods.class, "kc_supplier_in_goods");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kc:kc_supplier_in_goods:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KcSupplierInGoods.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/dto/SupplierInGoodsDto.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.kc.dto;
+
+import lombok.Data;
+import org.jeecg.modules.fw.entity.FwRoomLock;
+
+import java.util.List;
+
+@Data
+public class SupplierInGoodsDto {
+    private List<String> goodsIds;
+    private String hotelId;
+    private String supplierId;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/entity/KcDepository.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.kc.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: kc_depository
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("kc_depository")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kc_depository对象", description="kc_depository")
+public class KcDepository implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**仓库名称*/
+	@Excel(name = "仓库名称", width = 15)
+    @ApiModelProperty(value = "仓库名称")
+    private String name;
+	/**仓库地址*/
+	@Excel(name = "仓库地址", width = 15)
+    @ApiModelProperty(value = "仓库地址")
+    private String address;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/entity/KcDepositoryInGoods.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.kc.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: kc_depository_in_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("kc_depository_in_goods")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kc_depository_in_goods对象", description="kc_depository_in_goods")
+public class KcDepositoryInGoods implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**仓库id*/
+	@Excel(name = "仓库id", width = 15)
+    @ApiModelProperty(value = "仓库id")
+    private String depositoryId;
+	/**商品id*/
+	@Excel(name = "商品id", width = 15)
+    @ApiModelProperty(value = "商品id")
+    private String goodsId;
+	/**总数*/
+	@Excel(name = "总数", width = 15)
+    @ApiModelProperty(value = "总数")
+    private Integer num;
+
+	@TableField(exist = false)
+	private String goodsName;
+	@TableField(exist = false)
+	private Integer stockWarning;
+	@TableField(exist = false)
+	private String goodsUnitName;
+	@TableField(exist = false)
+	private String goodsSpec;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/entity/KcGoods.java

@@ -0,0 +1,104 @@
+package org.jeecg.modules.kc.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: kc_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("kc_goods")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kc_goods对象", description="kc_goods")
+public class KcGoods implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**酒店ID*/
+	@Excel(name = "酒店ID", width = 15)
+    @ApiModelProperty(value = "酒店ID")
+    private String hotelId;
+	/**商品名称*/
+	@Excel(name = "商品名称", width = 15)
+    @ApiModelProperty(value = "商品名称")
+    private String name;
+	/**商品分类Id*/
+	@Excel(name = "商品分类Id", width = 15)
+    @ApiModelProperty(value = "商品分类Id")
+    private String goodType;
+	/**商品单位*/
+	@Excel(name = "商品单位", width = 15)
+    @ApiModelProperty(value = "商品单位")
+    private String goodUnit;
+	/**条码*/
+	@Excel(name = "条码", width = 15)
+    @ApiModelProperty(value = "条码")
+    private String barCode;
+	/**商品规格*/
+	@Excel(name = "商品规格", width = 15)
+    @ApiModelProperty(value = "商品规格")
+    private String spec;
+	/**售卖周期*/
+	@Excel(name = "售卖周期", width = 15)
+    @ApiModelProperty(value = "售卖周期")
+    private Integer sellDay;
+	/**采购最高价格*/
+	@Excel(name = "采购最高价格", width = 15)
+    @ApiModelProperty(value = "采购最高价格")
+    private BigDecimal maxPrice;
+	/**成本价*/
+	@Excel(name = "成本价", width = 15)
+    @ApiModelProperty(value = "成本价")
+    private BigDecimal costPrice;
+	/**最高库存*/
+	@Excel(name = "最高库存", width = 15)
+    @ApiModelProperty(value = "最高库存")
+    private Integer maxSotck;
+	/**最低库存*/
+	@Excel(name = "最低库存", width = 15)
+    @ApiModelProperty(value = "最低库存")
+    private Integer minSotck;
+	/**库存预警数*/
+	@Excel(name = "库存预警数", width = 15)
+    @ApiModelProperty(value = "库存预警数")
+    private Integer stockWarning;
+	/**是否启用*/
+	@Excel(name = "是否启用", width = 15)
+    @ApiModelProperty(value = "是否启用")
+    private Boolean isEnable;
+
+	@TableField(exist = false)
+    @ApiModelProperty(value = "单位名称")
+	private String goodsUnitName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "分类名称")
+    private String goodTypeName;
+
+    @TableField(exist = false)
+    private String supplierInGoodsId;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/entity/KcGoodsType.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.kc.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: kc_goods_type
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("kc_goods_type")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kc_goods_type对象", description="kc_goods_type")
+public class KcGoodsType implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**酒店ID*/
+	@Excel(name = "酒店ID", width = 15)
+    @ApiModelProperty(value = "酒店ID")
+    private String hotelId;
+	/**分类名称*/
+	@Excel(name = "分类名称", width = 15)
+    @ApiModelProperty(value = "分类名称")
+    private String name;
+	/**上级ID*/
+	@Excel(name = "上级ID", width = 15)
+    @ApiModelProperty(value = "上级ID")
+    private String parentId;
+	/**是否启用*/
+	@Excel(name = "是否启用", width = 15)
+    @ApiModelProperty(value = "是否启用")
+    private Boolean state;
+	/**逻辑删除字段*/
+	@Excel(name = "逻辑删除字段", width = 15)
+    @ApiModelProperty(value = "逻辑删除字段")
+    private Boolean invalid;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/entity/KcStock.java

@@ -0,0 +1,112 @@
+package org.jeecg.modules.kc.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: kc_stock
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("kc_stock")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kc_stock对象", description="kc_stock")
+public class KcStock implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**仓库id*/
+	@Excel(name = "仓库id", width = 15)
+    @ApiModelProperty(value = "仓库id")
+    private String depositoryId;
+	/**类型 1出库 2入库 3盘点*/
+	@Excel(name = "类型 1出库 2入库 3盘点", width = 15)
+    @ApiModelProperty(value = "类型 1出库 2入库 3盘点")
+    private Integer type;
+	/**出入库类型*/
+	@Excel(name = "出入库类型", width = 15)
+    @ApiModelProperty(value = "出入库类型")
+    private Integer stockType;
+	/**供应商id*/
+	@Excel(name = "供应商id", width = 15)
+    @ApiModelProperty(value = "供应商id")
+    private String supplierId;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+	/**入库内容*/
+	@Excel(name = "入库内容", width = 15)
+    @ApiModelProperty(value = "入库内容")
+    private String stockInfo;
+	/**单号*/
+	@Excel(name = "单号", width = 15)
+    @ApiModelProperty(value = "单号")
+    private String code;
+	/**制单人*/
+	@Excel(name = "制单人", width = 15)
+    @ApiModelProperty(value = "制单人")
+    private String createAt;
+	/**审核人*/
+	@Excel(name = "审核人", width = 15)
+    @ApiModelProperty(value = "审核人")
+    private String verifyAt;
+	/**审核时间*/
+	@Excel(name = "审核时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "审核时间")
+    private Date verifyTime;
+	/**审核备注*/
+	@Excel(name = "审核备注", width = 15)
+    @ApiModelProperty(value = "审核备注")
+    private String verifyRemarks;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+	@TableField(exist = false)
+	private List<KcStockDetail> stockDetailList;
+
+
+    @TableField(exist = false)
+    private String depositoryName;
+    @TableField(exist = false)
+    private String stockTypeName;
+    @TableField(exist = false)
+    private String supplierName;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/entity/KcStockDetail.java

@@ -0,0 +1,71 @@
+package org.jeecg.modules.kc.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: kc_stock_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("kc_stock_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kc_stock_detail对象", description="kc_stock_detail")
+public class KcStockDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**库存id*/
+	@Excel(name = "库存id", width = 15)
+    @ApiModelProperty(value = "库存id")
+    private String stockId;
+	/**入库供货商品/出库仓库商品id*/
+	@Excel(name = "入库供货商品/出库仓库商品id", width = 15)
+    @ApiModelProperty(value = "入库供货商品/出库仓库商品id")
+    private String supplierInGoodsId;
+	/**成本价*/
+	@Excel(name = "成本价", width = 15)
+    @ApiModelProperty(value = "成本价")
+    private BigDecimal price;
+	/**出入库数量*/
+	@Excel(name = "出入库数量", width = 15)
+    @ApiModelProperty(value = "出入库数量")
+    private Integer num;
+
+    @TableField(exist = false)
+    private KcGoods kcGoods;
+
+    @TableField(exist = false)
+    private String goodUnit;
+    @TableField(exist = false)
+    private String spec;
+    @TableField(exist = false)
+    private String name;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/entity/KcSupplier.java

@@ -0,0 +1,83 @@
+package org.jeecg.modules.kc.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: kc_supplier
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("kc_supplier")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kc_supplier对象", description="kc_supplier")
+public class KcSupplier implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private String name;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private String address;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private String contactName;
+	/**手机号*/
+	@Excel(name = "手机号", width = 15)
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+	/**开户名称*/
+	@Excel(name = "开户名称", width = 15)
+    @ApiModelProperty(value = "开户名称")
+    private String accountName;
+	/**开户银行*/
+	@Excel(name = "开户银行", width = 15)
+    @ApiModelProperty(value = "开户银行")
+    private String accountBank;
+	/**银行账号*/
+	@Excel(name = "银行账号", width = 15)
+    @ApiModelProperty(value = "银行账号")
+    private String bankCardNo;
+	/**发票抬头*/
+	@Excel(name = "发票抬头", width = 15)
+    @ApiModelProperty(value = "发票抬头")
+    private String invoiceTitle;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/entity/KcSupplierInGoods.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.kc.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: kc_supplier_in_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("kc_supplier_in_goods")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kc_supplier_in_goods对象", description="kc_supplier_in_goods")
+public class KcSupplierInGoods implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**供应商id*/
+	@Excel(name = "供应商id", width = 15)
+    @ApiModelProperty(value = "供应商id")
+    private String supplierId;
+	/**商品id*/
+	@Excel(name = "商品id", width = 15)
+    @ApiModelProperty(value = "商品id")
+    private String goodsId;
+	/**供应价*/
+	@Excel(name = "供应价", width = 15)
+    @ApiModelProperty(value = "供应价")
+    private BigDecimal price;
+
+	@TableField(exist = false)
+	private String goodsName;
+
+    @TableField(exist = false)
+    private String goodsTypeId;
+
+    @TableField(exist = false)
+    private String goodsTypeName;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/enums/OutBoundEnum.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.kc.enums;
+
+import org.jeecg.common.system.annotation.EnumDict;
+import org.jeecg.common.system.vo.DictModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@EnumDict("outBoundEnum")
+public enum OutBoundEnum {
+
+    deficit(1, "亏盘出库"),
+    allot(2, "调拨出库"),
+    other(3, "其他出库"),
+    sale(4, "销售出库"),
+    assets(5, "固资出库"),
+    mallBuy(6, "商城购买出库");
+
+    Integer key;
+
+    String title;
+
+    OutBoundEnum(Integer key, String title) {
+        this.key = key;
+        this.title = title;
+    }
+
+    public Integer getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 获取字典数据
+     *
+     * @return
+     */
+    public static List<DictModel> getDictList() {
+        List<DictModel> list = new ArrayList<>();
+        DictModel dictModel = null;
+        for (OutBoundEnum e : OutBoundEnum.values()) {
+            dictModel = new DictModel();
+            dictModel.setValue(e.key.toString());
+            dictModel.setText(e.title);
+            list.add(dictModel);
+        }
+        return list;
+    }
+
+    public static OutBoundEnum val(Integer key) {
+        for (OutBoundEnum bld : values()) {
+            if (bld.key == key) {
+                return bld;
+            }
+        }
+        return null;
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/enums/StorageEnum.java

@@ -0,0 +1,64 @@
+package org.jeecg.modules.kc.enums;
+
+import org.jeecg.common.system.annotation.EnumDict;
+import org.jeecg.common.system.vo.DictModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@EnumDict("storageEnum")
+public enum StorageEnum {
+
+    buy(1, "采购入库"),
+    saleReturn(2, "销售退货"),
+    profit(3, "盘盈入库"),
+    other(4, "其他入库"),
+    allot(5, "调拨入库"),
+    assets(6, "固资入库"),
+    mallReturn(7,"商城退货入库");
+
+    Integer key;
+
+    String title;
+
+    StorageEnum(Integer key, String title) {
+        this.key = key;
+        this.title = title;
+    }
+
+    public Integer getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 获取字典数据
+     *
+     * @return
+     */
+    public static List<DictModel> getDictList() {
+        List<DictModel> list = new ArrayList<>();
+        DictModel dictModel = null;
+        for (StorageEnum e : StorageEnum.values()) {
+            dictModel = new DictModel();
+            dictModel.setValue(e.key.toString());
+            dictModel.setText(e.title);
+            list.add(dictModel);
+        }
+        return list;
+    }
+
+    public static StorageEnum val(Integer key) {
+        for (StorageEnum bld : values()) {
+            if (bld.key == key) {
+                return bld;
+            }
+        }
+        return null;
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/KcDepositoryInGoodsMapper.java

@@ -0,0 +1,36 @@
+package org.jeecg.modules.kc.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.kc.entity.KcDepositoryInGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.kc.entity.KcSupplierInGoods;
+
+/**
+ * @Description: kc_depository_in_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface KcDepositoryInGoodsMapper extends BaseMapper<KcDepositoryInGoods> {
+
+    /**
+     * 仓库库存商品列表
+     * @param page
+     * @param hotelId
+     * @param goodsName
+     * @param depositoryId
+     * @return
+     */
+    @Select("<script>select sg.*,g.name as goods_name,g.stock_warning,gt.name as goods_unit_name,g.spec as goods_spec from kc_depository_in_goods sg inner join kc_goods g on g.id=sg.goods_id\n" +
+            "left join ces_goods_unit gt on gt.id=g.good_unit\n" +
+            "where 1=1\n" +
+            "<if test='depositoryId != null and depositoryId !=\"\"'> and sg.depository_id = #{depositoryId} </if>"+
+            "<if test='hotelId != null and hotelId !=\"\"'> and sg.hotel_id = #{hotelId} </if>"+
+            "<if test='goodsName != null and goodsName !=\"\"'> and g.name like concat('%',#{goodsName},'%') </if>"+
+            "</script>")
+    public List<KcDepositoryInGoods> depositoryInGoodsList(Page<KcDepositoryInGoods> page, String hotelId, String goodsName,String depositoryId);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/KcDepositoryMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.kc.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.kc.entity.KcDepository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: kc_depository
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface KcDepositoryMapper extends BaseMapper<KcDepository> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/KcGoodsMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.kc.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.kc.entity.KcGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: kc_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface KcGoodsMapper extends BaseMapper<KcGoods> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/KcGoodsTypeMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.kc.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.kc.entity.KcGoodsType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: kc_goods_type
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface KcGoodsTypeMapper extends BaseMapper<KcGoodsType> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/KcStockDetailMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.kc.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.kc.entity.KcStockDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: kc_stock_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface KcStockDetailMapper extends BaseMapper<KcStockDetail> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/KcStockMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.kc.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.kc.entity.KcStock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: kc_stock
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface KcStockMapper extends BaseMapper<KcStock> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/KcSupplierInGoodsMapper.java

@@ -0,0 +1,38 @@
+package org.jeecg.modules.kc.mapper;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.business.entity.BusMarketMealCouponsUsed;
+import org.jeecg.modules.kc.entity.KcSupplierInGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: kc_supplier_in_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface KcSupplierInGoodsMapper extends BaseMapper<KcSupplierInGoods> {
+
+    /**
+     * 供货商品
+     * @param page
+     * @param hotelId
+     * @param goodsName
+     * @param goodsTypeId
+     * @return
+     */
+    @Select("<script>select sg.*,g.name as goods_name,gt.name as goods_type_name from kc_supplier_in_goods sg inner join kc_goods g on g.id=sg.goods_id\n" +
+            "left join kc_goods_type gt on gt.id=g.good_type\n" +
+            "where 1=1\n" +
+            "<if test='supplierId != null and supplierId !=\"\"'> and sg.supplier_id = #{supplierId} </if>"+
+            "<if test='hotelId != null and hotelId !=\"\"'> and sg.hotel_id = #{hotelId} </if>"+
+            "<if test='goodsName != null and goodsName !=\"\"'> and g.name like concat('%',#{goodsName},'%') </if>"+
+            "<if test='goodsTypeId != null and goodsTypeId !=\"\"'> and gt.id = #{goodsTypeId} </if>"+
+            "</script>")
+    public List<KcSupplierInGoods> supplierInGoodsList(Page<KcSupplierInGoods> page, String hotelId, String goodsName,String goodsTypeId,String supplierId);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/KcSupplierMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.kc.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.kc.entity.KcSupplier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: kc_supplier
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface KcSupplierMapper extends BaseMapper<KcSupplier> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/xml/KcDepositoryInGoodsMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.kc.mapper.KcDepositoryInGoodsMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/xml/KcDepositoryMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.kc.mapper.KcDepositoryMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/xml/KcGoodsMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.kc.mapper.KcGoodsMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/xml/KcGoodsTypeMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.kc.mapper.KcGoodsTypeMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/xml/KcStockDetailMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.kc.mapper.KcStockDetailMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/xml/KcStockMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.kc.mapper.KcStockMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/xml/KcSupplierInGoodsMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.kc.mapper.KcSupplierInGoodsMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/xml/KcSupplierMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.kc.mapper.KcSupplierMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/IKcDepositoryInGoodsService.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.kc.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.kc.entity.KcDepositoryInGoods;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: kc_depository_in_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IKcDepositoryInGoodsService extends IService<KcDepositoryInGoods> {
+    /**
+     * 仓库库存商品列表
+     * @param page
+     * @param hotelId
+     * @param goodsName
+     * @param depositoryId
+     * @return
+     */
+    public Page<KcDepositoryInGoods> depositoryInGoodsList(Page<KcDepositoryInGoods> page, String hotelId, String goodsName, String depositoryId);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/IKcDepositoryService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.kc.service;
+
+import org.jeecg.modules.kc.entity.KcDepository;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: kc_depository
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IKcDepositoryService extends IService<KcDepository> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/IKcGoodsService.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.kc.service;
+
+import cn.hutool.core.lang.tree.Tree;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.kc.entity.KcGoods;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Description: kc_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IKcGoodsService extends IService<KcGoods> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/IKcGoodsTypeService.java

@@ -0,0 +1,45 @@
+package org.jeecg.modules.kc.service;
+
+import cn.hutool.core.lang.tree.Tree;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.kc.entity.KcGoodsType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Description: kc_goods_type
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IKcGoodsTypeService extends IService<KcGoodsType> {
+    /**
+     * 获取商品库存分类
+     * @param hotelId
+     * @return
+     */
+    public Result tree(String hotelId);
+
+    public List<Tree<String>> treeList(String hotelId);
+    public Result getTopTypes(String hotelId);
+    /**
+     * 创建分类
+     * @param kcGoodsType
+     * @return
+     */
+    public Result create(KcGoodsType kcGoodsType);
+    /**
+     * 修改分类
+     * @param kcGoodsType
+     * @return
+     */
+    public Result modify(KcGoodsType kcGoodsType);
+    public Result delete(KcGoodsType kcGoodsType);
+    /**
+     * 根据IDS 查询分类数据
+     * @param ids
+     * @return
+     */
+    public List<KcGoodsType> fetchByIds(List<String> ids);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/IKcStockDetailService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.kc.service;
+
+import org.jeecg.modules.kc.entity.KcStockDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: kc_stock_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IKcStockDetailService extends IService<KcStockDetail> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/IKcStockService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.kc.service;
+
+import org.jeecg.modules.kc.entity.KcStock;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: kc_stock
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IKcStockService extends IService<KcStock> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/IKcSupplierInGoodsService.java

@@ -0,0 +1,28 @@
+package org.jeecg.modules.kc.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.business.entity.BusMarketMealCouponsUsed;
+import org.jeecg.modules.kc.entity.KcSupplierInGoods;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Description: kc_supplier_in_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IKcSupplierInGoodsService extends IService<KcSupplierInGoods> {
+
+    /**
+     * 供货商品
+     * @param page
+     * @param hotelId
+     * @param goodsName
+     * @param goodsTypeId
+     * @param supplierId
+     * @return
+     */
+    public Page<KcSupplierInGoods> supplierInGoodsList(Page<KcSupplierInGoods> page, String hotelId, String goodsName, String goodsTypeId, String supplierId);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/IKcSupplierService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.kc.service;
+
+import org.jeecg.modules.kc.entity.KcSupplier;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: kc_supplier
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IKcSupplierService extends IService<KcSupplier> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/impl/KcDepositoryInGoodsServiceImpl.java

@@ -0,0 +1,38 @@
+package org.jeecg.modules.kc.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.kc.entity.KcDepositoryInGoods;
+import org.jeecg.modules.kc.entity.KcSupplierInGoods;
+import org.jeecg.modules.kc.mapper.KcDepositoryInGoodsMapper;
+import org.jeecg.modules.kc.mapper.KcSupplierInGoodsMapper;
+import org.jeecg.modules.kc.service.IKcDepositoryInGoodsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description: kc_depository_in_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class KcDepositoryInGoodsServiceImpl extends ServiceImpl<KcDepositoryInGoodsMapper, KcDepositoryInGoods> implements IKcDepositoryInGoodsService {
+    @Resource
+    private KcDepositoryInGoodsMapper kcDepositoryInGoodsMapper;
+
+    /**
+     * 仓库库存商品列表
+     * @param page
+     * @param hotelId
+     * @param goodsName
+     * @param depositoryId
+     * @return
+     */
+    public Page<KcDepositoryInGoods> depositoryInGoodsList(Page<KcDepositoryInGoods> page, String hotelId, String goodsName,String depositoryId){
+        return page.setRecords(kcDepositoryInGoodsMapper.depositoryInGoodsList(page, hotelId, goodsName,depositoryId));
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/impl/KcDepositoryServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.kc.service.impl;
+
+import org.jeecg.modules.kc.entity.KcDepository;
+import org.jeecg.modules.kc.mapper.KcDepositoryMapper;
+import org.jeecg.modules.kc.service.IKcDepositoryService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: kc_depository
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class KcDepositoryServiceImpl extends ServiceImpl<KcDepositoryMapper, KcDepository> implements IKcDepositoryService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/impl/KcGoodsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.kc.service.impl;
+
+import org.jeecg.modules.kc.entity.KcGoods;
+import org.jeecg.modules.kc.mapper.KcGoodsMapper;
+import org.jeecg.modules.kc.service.IKcGoodsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: kc_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class KcGoodsServiceImpl extends ServiceImpl<KcGoodsMapper, KcGoods> implements IKcGoodsService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/impl/KcGoodsTypeServiceImpl.java

@@ -0,0 +1,149 @@
+package org.jeecg.modules.kc.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNode;
+import cn.hutool.core.lang.tree.TreeUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.kc.entity.KcGoodsType;
+import org.jeecg.modules.kc.mapper.KcGoodsTypeMapper;
+import org.jeecg.modules.kc.service.IKcGoodsTypeService;
+import org.jeecg.modules.rooms.DTO.CesStockTypeDto;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: kc_goods_type
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class KcGoodsTypeServiceImpl extends ServiceImpl<KcGoodsTypeMapper, KcGoodsType> implements IKcGoodsTypeService {
+    @Resource
+    private KcGoodsTypeMapper kcGoodsTypeMapper;
+    /**
+     * 获取商品库存分类
+     * @param hotelId
+     * @return
+     */
+    public Result tree(String hotelId){
+        List<TreeNode<String>> nodeList = CollUtil.newArrayList();
+        //查询数据
+        List<KcGoodsType> list = kcGoodsTypeMapper.selectList(Wrappers.<KcGoodsType>lambdaQuery()
+                .eq(KcGoodsType::getHotelId,hotelId)
+                .eq(KcGoodsType::getInvalid,false));
+        list.forEach(v -> {
+            nodeList.add(new TreeNode<>(v.getId(),v.getParentId(),v.getName(),0));
+        });
+        if(CollUtil.isEmpty(nodeList)) return Result.OK(new ArrayList<>());
+        List<Tree<String>> treeList = TreeUtil.build(nodeList, "0");
+        return Result.OK(treeList);
+    }
+
+    public List<Tree<String>> treeList(String hotelId){
+        List<TreeNode<String>> nodeList = CollUtil.newArrayList();
+        //查询数据
+        List<KcGoodsType> list = kcGoodsTypeMapper.selectList(Wrappers.<KcGoodsType>lambdaQuery()
+                .eq(KcGoodsType::getHotelId,hotelId)
+                .eq(KcGoodsType::getInvalid,false));
+        list.forEach(v -> {
+            nodeList.add(new TreeNode<>(v.getId(),v.getParentId(),v.getName(),0));
+        });
+        if(CollUtil.isEmpty(nodeList)) return new ArrayList<>();
+        List<Tree<String>> treeList = TreeUtil.build(nodeList, "0");
+        return treeList;
+    }
+
+
+    /**
+     * 获取顶级分类
+     * @return
+     */
+    public Result getTopTypes(String hotelId){
+        //查询数据
+        List<KcGoodsType> list = kcGoodsTypeMapper.selectList(Wrappers.<KcGoodsType>lambdaQuery()
+                .eq(KcGoodsType::getHotelId,hotelId)
+                .eq(KcGoodsType::getState,true)
+                .eq(KcGoodsType::getParentId,"0")
+                .eq(KcGoodsType::getInvalid,false));
+        return Result.OK(list);
+    }
+
+    /**
+     * 创建分类
+     * @param kcGoodsType
+     * @return
+     */
+    public Result create(KcGoodsType kcGoodsType){
+        LambdaQueryWrapper<KcGoodsType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(KcGoodsType::getName,kcGoodsType.getName());
+        queryWrapper.eq(KcGoodsType::getHotelId, kcGoodsType.getHotelId());
+        queryWrapper.eq(KcGoodsType::getInvalid,true);
+
+        KcGoodsType cesStockType = kcGoodsTypeMapper.selectOne(queryWrapper);
+        if(!ObjectUtils.isEmpty(cesStockType)) return Result.error("已有相同名称的分类!");
+
+        kcGoodsType.setInvalid(false);
+        kcGoodsTypeMapper.insert(kcGoodsType);
+        return Result.OK("保存成功!");
+    }
+
+
+    /**
+     * 修改分类
+     * @param kcGoodsType
+     * @return
+     */
+    public Result modify(KcGoodsType kcGoodsType){
+        KcGoodsType cesStockType = kcGoodsTypeMapper.selectById(kcGoodsType.getId());
+        if(ObjectUtils.isEmpty(cesStockType)) return Result.error("数据未找到！");
+
+        LambdaQueryWrapper<KcGoodsType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ne(KcGoodsType::getId,cesStockType.getId());
+        queryWrapper.eq(KcGoodsType::getName,cesStockType.getName());
+        queryWrapper.eq(KcGoodsType::getHotelId, cesStockType.getHotelId());
+        queryWrapper.eq(KcGoodsType::getInvalid,false);
+
+        KcGoodsType exit = kcGoodsTypeMapper.selectOne(queryWrapper);
+        if(!ObjectUtils.isEmpty(exit)) return Result.error("已有相同名称的分类!");
+        kcGoodsTypeMapper.updateById(kcGoodsType);
+        return Result.OK("修改成功!");
+    }
+
+
+    public Result delete(KcGoodsType kcGoodsType){
+        KcGoodsType cesStockType = kcGoodsTypeMapper.selectById(kcGoodsType.getId());
+        if(ObjectUtils.isEmpty(cesStockType)) return Result.error("数据未找到！");
+        cesStockType.setInvalid(true);
+        kcGoodsTypeMapper.updateById(cesStockType);
+        return Result.OK("删除成功!");
+    }
+
+
+    /**
+     * 根据IDS 查询分类数据
+     * @param ids
+     * @return
+     */
+    public List<KcGoodsType> fetchByIds(List<String> ids){
+        if(CollectionUtil.isEmpty(ids)) return new ArrayList<>();
+        List<KcGoodsType> list = kcGoodsTypeMapper.selectList(Wrappers.<KcGoodsType>lambdaQuery().eq(KcGoodsType::getInvalid,false).in(KcGoodsType::getId,ids));
+
+        return  list;
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/impl/KcStockDetailServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.kc.service.impl;
+
+import org.jeecg.modules.kc.entity.KcStockDetail;
+import org.jeecg.modules.kc.mapper.KcStockDetailMapper;
+import org.jeecg.modules.kc.service.IKcStockDetailService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: kc_stock_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class KcStockDetailServiceImpl extends ServiceImpl<KcStockDetailMapper, KcStockDetail> implements IKcStockDetailService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/impl/KcStockServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.kc.service.impl;
+
+import org.jeecg.modules.kc.entity.KcStock;
+import org.jeecg.modules.kc.mapper.KcStockMapper;
+import org.jeecg.modules.kc.service.IKcStockService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: kc_stock
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class KcStockServiceImpl extends ServiceImpl<KcStockMapper, KcStock> implements IKcStockService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/impl/KcSupplierInGoodsServiceImpl.java

@@ -0,0 +1,32 @@
+package org.jeecg.modules.kc.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.business.entity.BusMarketMealCouponsUsed;
+import org.jeecg.modules.business.mapper.BusMarketCouponsCashUsedMapper;
+import org.jeecg.modules.kc.entity.KcSupplierInGoods;
+import org.jeecg.modules.kc.mapper.KcSupplierInGoodsMapper;
+import org.jeecg.modules.kc.service.IKcSupplierInGoodsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Description: kc_supplier_in_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class KcSupplierInGoodsServiceImpl extends ServiceImpl<KcSupplierInGoodsMapper, KcSupplierInGoods> implements IKcSupplierInGoodsService {
+
+    @Resource
+    private KcSupplierInGoodsMapper kcSupplierInGoodsMapper;
+
+    public Page<KcSupplierInGoods> supplierInGoodsList(Page<KcSupplierInGoods> page, String hotelId, String goodsName, String goodsTypeId, String supplierId){
+        return page.setRecords(kcSupplierInGoodsMapper.supplierInGoodsList(page, hotelId, goodsName,goodsTypeId,supplierId));
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/service/impl/KcSupplierServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.kc.service.impl;
+
+import org.jeecg.modules.kc.entity.KcSupplier;
+import org.jeecg.modules.kc.mapper.KcSupplierMapper;
+import org.jeecg.modules.kc.service.IKcSupplierService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: kc_supplier
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class KcSupplierServiceImpl extends ServiceImpl<KcSupplierMapper, KcSupplier> implements IKcSupplierService {
+
+}