diff --git a/admin/src/api/cmmeetingroom.js b/admin/src/api/cmmeetingroom.js new file mode 100644 index 0000000..ada787d --- /dev/null +++ b/admin/src/api/cmmeetingroom.js @@ -0,0 +1,63 @@ + +import request from '@/utils/request' + +/** + * 新增cmmeetingroom + * @param pram + */ +export function cmmeetingroomCreateApi(data) { + return request({ + url: `autogencode/cmmeetingroom/save`, + method: 'POST', + data + }) +} + +/** + * cmmeetingroom更新 + * @param pram + */ +export function cmmeetingroomUpdateApi(data) { + return request({ + url: `autogencode/cmmeetingroom/update`, + method: 'POST', + data + }) +} + +/** + * cmmeetingroom详情 + * @param pram + */ +export function cmmeetingroomDetailApi(id) { + return request({ + url: `autogencode/cmmeetingroom/info/${id}`, + method: 'GET' + }) +} + +/** + * cmmeetingroom批量删除 + * @param ids + */ +export function cmmeetingroomDeleteApi(ids) { + return request({ + url: `autogencode/cmmeetingroom/delete`, + method: 'POST', + data: ids + }) +} + + +/** + * cmmeetingroom列表 + * @param pram + */ +export function cmmeetingroomListApi(params) { + return request({ + url: `autogencode/cmmeetingroom/list`, + method: 'GET', + params + }) +} + diff --git a/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue b/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue index 7ddb09c..5f85085 100644 --- a/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue +++ b/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue @@ -28,7 +28,33 @@ -
+
{{ scope.row.stockName }}
+ + + + + + + + +
{{ scope.row.shelfName }}
+ + + + + + + + +
{{ scope.row.locationName }}
+ + + + + @@ -231,20 +257,7 @@ - - - - - - - - - - - - - +
@@ -260,7 +273,9 @@ diff --git a/admin/src/views/cm/meeting/room/index.vue b/admin/src/views/cm/meeting/room/index.vue new file mode 100644 index 0000000..667d695 --- /dev/null +++ b/admin/src/views/cm/meeting/room/index.vue @@ -0,0 +1,289 @@ + + + diff --git a/admin/src/views/pm/check/in/pmcheckin-add-and-update.vue b/admin/src/views/pm/check/in/pmcheckin-add-and-update.vue index 2d91b9d..a898a79 100644 --- a/admin/src/views/pm/check/in/pmcheckin-add-and-update.vue +++ b/admin/src/views/pm/check/in/pmcheckin-add-and-update.vue @@ -7,19 +7,6 @@ - - - - - - - @@ -34,8 +21,6 @@ - - @@ -62,6 +47,22 @@ + + + + + + + + + + queryWrapper, CmMeetingRoom request) { + if (request == null) { + return; + } + + // 根据实体类字段自动生成查询条件 + + // 主键ID + if (request.getId() != null) { + queryWrapper.eq(CmMeetingRoom::getId, request.getId()); + } + + // 会议室名称 + if (StrUtil.isNotBlank(request.getRoomName())) { + queryWrapper.eq(CmMeetingRoom::getRoomName, request.getRoomName()); + } + + // 会议室位置 + if (StrUtil.isNotBlank(request.getRoomLocation())) { + queryWrapper.eq(CmMeetingRoom::getRoomLocation, request.getRoomLocation()); + } + + // 容纳人数 + if (request.getCapacity() != null) { + queryWrapper.eq(CmMeetingRoom::getCapacity, request.getCapacity()); + } + + // 总座位数 + if (request.getTotalSeats() != null) { + queryWrapper.eq(CmMeetingRoom::getTotalSeats, request.getTotalSeats()); + } + + // 固定座位数 + if (request.getFixedSeats() != null) { + queryWrapper.eq(CmMeetingRoom::getFixedSeats, request.getFixedSeats()); + } + + // 可移动座位数 + if (request.getMovableSeats() != null) { + queryWrapper.eq(CmMeetingRoom::getMovableSeats, request.getMovableSeats()); + } + + // 座位布局类型（圆桌式/剧院式/课桌式等） + if (StrUtil.isNotBlank(request.getSeatLayout())) { + queryWrapper.eq(CmMeetingRoom::getSeatLayout, request.getSeatLayout()); + } + + // 配套设备 + if (StrUtil.isNotBlank(request.getEquipmentConfig())) { + queryWrapper.eq(CmMeetingRoom::getEquipmentConfig, request.getEquipmentConfig()); + } + + // 收费标准 + if (StrUtil.isNotBlank(request.getChargeStandard())) { + queryWrapper.eq(CmMeetingRoom::getChargeStandard, request.getChargeStandard()); + } + + // 可预约时间段 + if (StrUtil.isNotBlank(request.getReserveTimeRange())) { + queryWrapper.eq(CmMeetingRoom::getReserveTimeRange, request.getReserveTimeRange()); + } + + // 文件id + if (request.getFileId() != null) { + queryWrapper.eq(CmMeetingRoom::getFileId, request.getFileId()); + } + + // 会议室状态 + if (request.getRoomStatus() != null) { + queryWrapper.eq(CmMeetingRoom::getRoomStatus, request.getRoomStatus()); + } + + // 会议室描述 + if (StrUtil.isNotBlank(request.getDescription())) { + queryWrapper.eq(CmMeetingRoom::getDescription, request.getDescription()); + } + + // 备注 + if (StrUtil.isNotBlank(request.getRemark())) { + queryWrapper.eq(CmMeetingRoom::getRemark, request.getRemark()); + } + + // 删除标志（0代表存在 2代表删除） + if (StrUtil.isNotBlank(request.getDelFlag())) { + queryWrapper.eq(CmMeetingRoom::getDelFlag, request.getDelFlag()); + } + + // 创建部门 + if (request.getCreateDept() != null) { + queryWrapper.eq(CmMeetingRoom::getCreateDept, request.getCreateDept()); + } + + // 创建人 + if (request.getCreateBy() != null) { + queryWrapper.eq(CmMeetingRoom::getCreateBy, request.getCreateBy()); + } + + // 创建时间 + if (request.getCreateTime() != null) { + queryWrapper.eq(CmMeetingRoom::getCreateTime, request.getCreateTime()); + } + + // 修改人 + if (request.getUpdateBy() != null) { + queryWrapper.eq(CmMeetingRoom::getUpdateBy, request.getUpdateBy()); + } + + // 修改时间 + if (request.getUpdateTime() != null) { + queryWrapper.eq(CmMeetingRoom::getUpdateTime, request.getUpdateTime()); + } + + // 租户ID + if (StrUtil.isNotBlank(request.getTenantId())) { + queryWrapper.eq(CmMeetingRoom::getTenantId, request.getTenantId()); + } + + } + + + /** + * 分页显示会议室信息表 + * @param request 搜索条件 + * @param pageParamRequest 分页参数 + */ + @ApiOperation(value = "分页列表") + @RequestMapping(value = "/list", method = RequestMethod.GET) + public CommonResult> getList(@Validated CmMeetingRoom request, @Validated PageParamRequest pageParamRequest) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + + // 应用搜索条件 + condition(queryWrapper, request); + + CommonPage page = CommonPage.restPage(cmMeetingRoomService.pageList(queryWrapper, pageParamRequest)); + return CommonResult.success(page); + } + + + /** + * 详情数据 + */ + @RequestMapping(value = "/info/{id}", method = RequestMethod.GET) + public CommonResult info(@PathVariable("id") Long id){ + CmMeetingRoom cmMeetingRoom = cmMeetingRoomService.getById(id); + + return CommonResult.success(cmMeetingRoom); + } + + /** + * 新增数据 + */ + @RequestMapping(value = "/save", method = RequestMethod.POST) + public CommonResult save(@RequestBody CmMeetingRoom cmMeetingRoom){ + if (cmMeetingRoomService.save(cmMeetingRoom)) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + + /** + * 修改数据 + */ + @RequestMapping(value = "/update", method = RequestMethod.POST) + public CommonResult update(@RequestBody CmMeetingRoom cmMeetingRoom){ + if (cmMeetingRoomService.updateById(cmMeetingRoom)) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + + /** + * 删除:根据id集合 + */ + @RequestMapping(value = "/delete", method = RequestMethod.POST) + public CommonResult delete(@RequestBody Long[] ids){ + if (cmMeetingRoomService.removeByIds(Arrays.asList(ids))) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + +} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/CmMeetingRoomDao.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/CmMeetingRoomDao.java new file mode 100644 index 0000000..1213cdb --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/CmMeetingRoomDao.java @@ -0,0 +1,13 @@ +package com.zbkj.modules.autogencode.dao; + +import com.zbkj.modules.autogencode.entity.CmMeetingRoom; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会议室信息表 DAO 映射层 + */ +@Mapper +public interface CmMeetingRoomDao extends BaseMapper { + +} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillStock.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillStock.java index 7df78d0..a20e818 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillStock.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillStock.java @@ -31,6 +31,7 @@ public class CkBillStock implements Serializable { */ @ApiModelProperty(value = "出入库类型") private String inoutType; + /** * 库场ID */ @@ -46,6 +47,36 @@ public class CkBillStock implements Serializable { */ @ApiModelProperty(value = "库场名称") private String stockName; + /** + * 货架ID + */ + @ApiModelProperty(value = "货架ID") + private Long shelfId; + /** + * 货架代码 + */ + @ApiModelProperty(value = "货架代码") + private String shelfCode; + /** + * 货架名称 + */ + @ApiModelProperty(value = "货架名称") + private String shelfName; + /** + * 货位ID + */ + @ApiModelProperty(value = "货位ID") + private Long locationId; + /** + * 货位代码 + */ + @ApiModelProperty(value = "货位代码") + private String locationCode; + /** + * 货位名称 + */ + @ApiModelProperty(value = "货位名称") + private String locationName; /** * 单据编号 */ diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CmMeetingRoom.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CmMeetingRoom.java new file mode 100644 index 0000000..a643a1d --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CmMeetingRoom.java @@ -0,0 +1,129 @@ +package com.zbkj.modules.autogencode.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; + + import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +@Data +@TableName("cm_meeting_room") +public class CmMeetingRoom implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ApiModelProperty(value = "主键ID") + @TableId + private Long id; + /** + * 会议室名称 + */ + @ApiModelProperty(value = "会议室名称") + private String roomName; + /** + * 会议室位置 + */ + @ApiModelProperty(value = "会议室位置") + private String roomLocation; + /** + * 容纳人数 + */ + @ApiModelProperty(value = "容纳人数") + private Integer capacity; + /** + * 总座位数 + */ + @ApiModelProperty(value = "总座位数") + private Integer totalSeats; + /** + * 固定座位数 + */ + @ApiModelProperty(value = "固定座位数") + private Integer fixedSeats; + /** + * 可移动座位数 + */ + @ApiModelProperty(value = "可移动座位数") + private Integer movableSeats; + /** + * 座位布局类型（圆桌式/剧院式/课桌式等） + */ + @ApiModelProperty(value = "座位布局类型（圆桌式/剧院式/课桌式等）") + private String seatLayout; + /** + * 配套设备 + */ + @ApiModelProperty(value = "配套设备") + private String equipmentConfig; + /** + * 收费标准 + */ + @ApiModelProperty(value = "收费标准") + private String chargeStandard; + /** + * 可预约时间段 + */ + @ApiModelProperty(value = "可预约时间段") + private String reserveTimeRange; + /** + * 文件id + */ + @ApiModelProperty(value = "文件id") + private Long fileId; + /** + * 会议室状态 + */ + @ApiModelProperty(value = "会议室状态") + private Integer roomStatus; + /** + * 会议室描述 + */ + @ApiModelProperty(value = "会议室描述") + private String description; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）") + private String delFlag; + /** + * 创建部门 + */ + @ApiModelProperty(value = "创建部门") + private Long createDept; + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private Long createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + /** + * 修改人 + */ + @ApiModelProperty(value = "修改人") + private Long updateBy; + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + private Date updateTime; + /** + * 租户ID + */ + @ApiModelProperty(value = "租户ID") + private String tenantId; + +} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/CmMeetingRoomService.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/CmMeetingRoomService.java new file mode 100644 index 0000000..15b8e99 --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/CmMeetingRoomService.java @@ -0,0 +1,25 @@ +package com.zbkj.modules.autogencode.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zbkj.modules.autogencode.entity.CmMeetingRoom; +import com.zbkj.common.request.PageParamRequest; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + + +import java.util.List; +import java.util.Map; + +/** + * 会议室信息表 业务接口 + * +---------------------------------------------------------------------- + */ +public interface CmMeetingRoomService extends IService { + + /** + * CmMeetingRoom 列表查询 + * @param pageParamRequest 分页参数对象 + * @return + */ + List pageList(LambdaQueryWrapper queryWrapper, PageParamRequest pageParamRequest); +} + diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/CmMeetingRoomServiceImpl.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/CmMeetingRoomServiceImpl.java new file mode 100644 index 0000000..695470e --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/CmMeetingRoomServiceImpl.java @@ -0,0 +1,42 @@ +package com.zbkj.modules.autogencode.service.impl; + +import com.github.pagehelper.PageHelper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import com.zbkj.modules.autogencode.dao.CmMeetingRoomDao; +import com.zbkj.modules.autogencode.entity.CmMeetingRoom; +import com.zbkj.modules.autogencode.service.CmMeetingRoomService; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; + +import javax.annotation.Resource; +import java.util.Map; +import java.util.Arrays; +import java.util.List; + + +@Service("cmMeetingRoomService") +public class CmMeetingRoomServiceImpl extends ServiceImpl implements CmMeetingRoomService { + + + @Resource + private CmMeetingRoomDao dao; + + + /** + * 带分页参数的列表查询实现 + */ + @Override + public List pageList(LambdaQueryWrapper queryWrapper, PageParamRequest pageParamRequest) { + + PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); + + return dao.selectList(queryWrapper); + } + + +} diff --git a/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/CmMeetingRoomDao.xml b/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/CmMeetingRoomDao.xml new file mode 100644 index 0000000..2d24ba6 --- /dev/null +++ b/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/CmMeetingRoomDao.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +