diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCoilContractRelController.java b/klp-wms/src/main/java/com/klp/controller/WmsCoilContractRelController.java new file mode 100644 index 00000000..917956af --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsCoilContractRelController.java @@ -0,0 +1,99 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsCoilContractRelVo; +import com.klp.domain.bo.WmsCoilContractRelBo; +import com.klp.service.IWmsCoilContractRelService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 钢卷与合同关联关系 + * + * @author klp + * @date 2026-04-18 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/coilContractRel") +public class WmsCoilContractRelController extends BaseController { + + private final IWmsCoilContractRelService iWmsCoilContractRelService; + + /** + * 查询钢卷与合同关联关系列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsCoilContractRelBo bo, PageQuery pageQuery) { + return iWmsCoilContractRelService.queryPageList(bo, pageQuery); + } + + /** + * 导出钢卷与合同关联关系列表 + */ + @Log(title = "钢卷与合同关联关系", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsCoilContractRelBo bo, HttpServletResponse response) { + List list = iWmsCoilContractRelService.queryList(bo); + ExcelUtil.exportExcel(list, "钢卷与合同关联关系", WmsCoilContractRelVo.class, response); + } + + /** + * 获取钢卷与合同关联关系详细信息 + * + * @param relId 主键 + */ + @GetMapping("/{relId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long relId) { + return R.ok(iWmsCoilContractRelService.queryById(relId)); + } + + /** + * 新增钢卷与合同关联关系 + */ + @Log(title = "钢卷与合同关联关系", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCoilContractRelBo bo) { + return toAjax(iWmsCoilContractRelService.insertByBo(bo)); + } + + /** + * 修改钢卷与合同关联关系 + */ + @Log(title = "钢卷与合同关联关系", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCoilContractRelBo bo) { + return toAjax(iWmsCoilContractRelService.updateByBo(bo)); + } + + /** + * 删除钢卷与合同关联关系 + * + * @param relIds 主键串 + */ + @Log(title = "钢卷与合同关联关系", businessType = BusinessType.DELETE) + @DeleteMapping("/{relIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] relIds) { + return toAjax(iWmsCoilContractRelService.deleteWithValidByIds(Arrays.asList(relIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCoilContractRel.java b/klp-wms/src/main/java/com/klp/domain/WmsCoilContractRel.java new file mode 100644 index 00000000..8629910f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsCoilContractRel.java @@ -0,0 +1,45 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 钢卷与合同关联关系对象 wms_coil_contract_rel + * + * @author klp + * @date 2026-04-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_coil_contract_rel") +public class WmsCoilContractRel extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "rel_id") + private Long relId; + /** + * 钢卷ID + */ + private Long coilId; + /** + * 合同ID + */ + private Long contractId; + /** + * 备注 + */ + private String remark; + /** + * 删除标识 0正常 2删除 + */ + @TableLogic + private Long delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilContractRelBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilContractRelBo.java new file mode 100644 index 00000000..52965f02 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilContractRelBo.java @@ -0,0 +1,41 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 钢卷与合同关联关系业务对象 wms_coil_contract_rel + * + * @author klp + * @date 2026-04-18 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsCoilContractRelBo extends BaseEntity { + + /** + * 主键ID + */ + private Long relId; + + /** + * 钢卷ID + */ + private Long coilId; + + /** + * 合同ID + */ + private Long contractId; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilContractRelVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilContractRelVo.java new file mode 100644 index 00000000..583d42b7 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilContractRelVo.java @@ -0,0 +1,47 @@ +package com.klp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 钢卷与合同关联关系视图对象 wms_coil_contract_rel + * + * @author klp + * @date 2026-04-18 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsCoilContractRelVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long relId; + + /** + * 钢卷ID + */ + @ExcelProperty(value = "钢卷ID") + private Long coilId; + + /** + * 合同ID + */ + @ExcelProperty(value = "合同ID") + private Long contractId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCoilContractRelMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCoilContractRelMapper.java new file mode 100644 index 00000000..e9534af2 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsCoilContractRelMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsCoilContractRel; +import com.klp.domain.vo.WmsCoilContractRelVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 钢卷与合同关联关系Mapper接口 + * + * @author klp + * @date 2026-04-18 + */ +public interface WmsCoilContractRelMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCoilContractRelService.java b/klp-wms/src/main/java/com/klp/service/IWmsCoilContractRelService.java new file mode 100644 index 00000000..f4f40b29 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsCoilContractRelService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsCoilContractRel; +import com.klp.domain.vo.WmsCoilContractRelVo; +import com.klp.domain.bo.WmsCoilContractRelBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 钢卷与合同关联关系Service接口 + * + * @author klp + * @date 2026-04-18 + */ +public interface IWmsCoilContractRelService { + + /** + * 查询钢卷与合同关联关系 + */ + WmsCoilContractRelVo queryById(Long relId); + + /** + * 查询钢卷与合同关联关系列表 + */ + TableDataInfo queryPageList(WmsCoilContractRelBo bo, PageQuery pageQuery); + + /** + * 查询钢卷与合同关联关系列表 + */ + List queryList(WmsCoilContractRelBo bo); + + /** + * 新增钢卷与合同关联关系 + */ + Boolean insertByBo(WmsCoilContractRelBo bo); + + /** + * 修改钢卷与合同关联关系 + */ + Boolean updateByBo(WmsCoilContractRelBo bo); + + /** + * 校验并批量删除钢卷与合同关联关系信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilContractRelServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilContractRelServiceImpl.java new file mode 100644 index 00000000..2bdf8b6a --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilContractRelServiceImpl.java @@ -0,0 +1,109 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsCoilContractRelBo; +import com.klp.domain.vo.WmsCoilContractRelVo; +import com.klp.domain.WmsCoilContractRel; +import com.klp.mapper.WmsCoilContractRelMapper; +import com.klp.service.IWmsCoilContractRelService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 钢卷与合同关联关系Service业务层处理 + * + * @author klp + * @date 2026-04-18 + */ +@RequiredArgsConstructor +@Service +public class WmsCoilContractRelServiceImpl implements IWmsCoilContractRelService { + + private final WmsCoilContractRelMapper baseMapper; + + /** + * 查询钢卷与合同关联关系 + */ + @Override + public WmsCoilContractRelVo queryById(Long relId){ + return baseMapper.selectVoById(relId); + } + + /** + * 查询钢卷与合同关联关系列表 + */ + @Override + public TableDataInfo queryPageList(WmsCoilContractRelBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询钢卷与合同关联关系列表 + */ + @Override + public List queryList(WmsCoilContractRelBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCoilContractRelBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getCoilId() != null, WmsCoilContractRel::getCoilId, bo.getCoilId()); + lqw.eq(bo.getContractId() != null, WmsCoilContractRel::getContractId, bo.getContractId()); + return lqw; + } + + /** + * 新增钢卷与合同关联关系 + */ + @Override + public Boolean insertByBo(WmsCoilContractRelBo bo) { + WmsCoilContractRel add = BeanUtil.toBean(bo, WmsCoilContractRel.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRelId(add.getRelId()); + } + return flag; + } + + /** + * 修改钢卷与合同关联关系 + */ + @Override + public Boolean updateByBo(WmsCoilContractRelBo bo) { + WmsCoilContractRel update = BeanUtil.toBean(bo, WmsCoilContractRel.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsCoilContractRel entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除钢卷与合同关联关系 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilContractRelMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilContractRelMapper.xml new file mode 100644 index 00000000..a25fe85a --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilContractRelMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + +