diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsDeliveryNoteController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsDeliveryNoteController.java new file mode 100644 index 0000000..fb37237 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsDeliveryNoteController.java @@ -0,0 +1,106 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.wms.domain.vo.WmsDeliveryNoteVo; +import org.dromara.wms.domain.bo.WmsDeliveryNoteBo; +import org.dromara.wms.service.IWmsDeliveryNoteService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 送货单管理 + * 前端访问路由地址为:/wms/deliveryNote + * + * @author LionLi + * @date 2025-01-06 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/deliveryNote") +public class WmsDeliveryNoteController extends BaseController { + + private final IWmsDeliveryNoteService wmsDeliveryNoteService; + + /** + * 查询送货单管理列表 + */ + @SaCheckPermission("wms:deliveryNote:list") + @GetMapping("/list") + public TableDataInfo list(WmsDeliveryNoteBo bo, PageQuery pageQuery) { + return wmsDeliveryNoteService.queryPageList(bo, pageQuery); + } + + /** + * 导出送货单管理列表 + */ + @SaCheckPermission("wms:deliveryNote:export") + @Log(title = "送货单管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsDeliveryNoteBo bo, HttpServletResponse response) { + List list = wmsDeliveryNoteService.queryList(bo); + ExcelUtil.exportExcel(list, "送货单管理", WmsDeliveryNoteVo.class, response); + } + + /** + * 获取送货单管理详细信息 + * + * @param deliveryNoteId 主键 + */ + @SaCheckPermission("wms:deliveryNote:query") + @GetMapping("/{deliveryNoteId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long deliveryNoteId) { + return R.ok(wmsDeliveryNoteService.queryById(deliveryNoteId)); + } + + /** + * 新增送货单管理 + */ + @SaCheckPermission("wms:deliveryNote:add") + @Log(title = "送货单管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsDeliveryNoteBo bo) { + return toAjax(wmsDeliveryNoteService.insertByBo(bo)); + } + + /** + * 修改送货单管理 + */ + @SaCheckPermission("wms:deliveryNote:edit") + @Log(title = "送货单管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsDeliveryNoteBo bo) { + return toAjax(wmsDeliveryNoteService.updateByBo(bo)); + } + + /** + * 删除送货单管理 + * + * @param deliveryNoteIds 主键串 + */ + @SaCheckPermission("wms:deliveryNote:remove") + @Log(title = "送货单管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{deliveryNoteIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] deliveryNoteIds) { + return toAjax(wmsDeliveryNoteService.deleteWithValidByIds(List.of(deliveryNoteIds), true)); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsDeliveryNote.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsDeliveryNote.java new file mode 100644 index 0000000..6da72d3 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsDeliveryNote.java @@ -0,0 +1,70 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 送货单管理对象 wms_delivery_note + * + * @author LionLi + * @date 2025-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_delivery_note") +public class WmsDeliveryNote extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 送货单表主键 + */ + private Long deliveryNoteId; + + /** + * 采购订单编号 + */ + private String poNo; + + /** + * 送货单编码 + */ + private String deliveryNoteCode; + + /** + * 客户名称(默认值) + */ + private String customerName; + + /** + * 联系人 + */ + private String contacts; + + /** + * 联系电话 + */ + private String contactsIpone; + + /** + * 送货单状态(0待发货,1已发货,2已交货) + */ + private String deliveryNoteState; + + /** + * 打印次数 + */ + private Integer printQty; + + /** + * 车牌号 + */ + private String licensePlate; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsDeliveryNoteBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsDeliveryNoteBo.java new file mode 100644 index 0000000..3aba07f --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsDeliveryNoteBo.java @@ -0,0 +1,78 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.wms.domain.WmsDeliveryNote; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 送货单管理业务对象 wms_delivery_note + * + * @author LionLi + * @date 2025-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsDeliveryNote.class, reverseConvertGenerate = false) +public class WmsDeliveryNoteBo extends BaseEntity { + + /** + * 送货单表主键 + */ + // @NotNull(message = "送货单表主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long deliveryNoteId; + + /** + * 采购订单编号 + */ + // @NotBlank(message = "采购订单编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String poNo; + + /** + * 送货单编码 + */ + // @NotBlank(message = "送货单编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deliveryNoteCode; + + /** + * 客户名称(默认值) + */ + @NotBlank(message = "客户名称(默认值)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String customerName; + + /** + * 联系人 + */ + @NotBlank(message = "联系人不能为空", groups = { AddGroup.class, EditGroup.class }) + private String contacts; + + /** + * 联系电话 + */ + @NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class }) + private String contactsIpone; + + /** + * 送货单状态(0待发货,1已发货,2已交货) + */ + // @NotBlank(message = "送货单状态(0待发货,1已发货,2已交货)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deliveryNoteState; + + /** + * 打印次数 + */ + // @NotNull(message = "打印次数不能为空", groups = { EditGroup.class }) + private Integer printQty; + + /** + * 车牌号 + */ + @NotBlank(message = "车牌号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String licensePlate; + + private String tenantId; +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsDeliveryNoteVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsDeliveryNoteVo.java new file mode 100644 index 0000000..16cdee8 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsDeliveryNoteVo.java @@ -0,0 +1,112 @@ +package org.dromara.wms.domain.vo; + +import org.dromara.wms.domain.WmsDeliveryNote; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 送货单管理视图对象 wms_delivery_note + * + * @author LionLi + * @date 2025-01-06 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsDeliveryNote.class) +public class WmsDeliveryNoteVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 送货单表主键 + */ + @ExcelProperty(value = "送货单表主键") + private Long deliveryNoteId; + + /** + * 采购订单编号 + */ + @ExcelProperty(value = "采购订单编号") + private String poNo; + + /** + * 租户号 + */ + @ExcelProperty(value = "租户号") + private String tenantId; + + /** + * 送货单编码 + */ + @ExcelProperty(value = "送货单编码") + private String deliveryNoteCode; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 客户名称(默认值) + */ + @ExcelProperty(value = "客户名称", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "默=认值") + private String customerName; + + /** + * 联系人 + */ + @ExcelProperty(value = "联系人") + private String contacts; + + /** + * 联系电话 + */ + @ExcelProperty(value = "联系电话") + private String contactsIpone; + + /** + * 送货单状态(0待发货,1已发货,2已交货) + */ + @ExcelProperty(value = "送货单状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "delivery_note_state") + private String deliveryNoteState; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + /** + * 打印次数 + */ + @ExcelProperty(value = "打印次数") + private Integer printQty; + + /** + * 车牌号 + */ + @ExcelProperty(value = "车牌号") + private String licensePlate; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsDeliveryNoteMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsDeliveryNoteMapper.java new file mode 100644 index 0000000..4caca1c --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsDeliveryNoteMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.wms.domain.WmsDeliveryNote; +import org.dromara.wms.domain.vo.WmsDeliveryNoteVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 送货单管理Mapper接口 + * + * @author LionLi + * @date 2025-01-06 + */ +public interface WmsDeliveryNoteMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsDeliveryNoteService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsDeliveryNoteService.java new file mode 100644 index 0000000..85a61c3 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsDeliveryNoteService.java @@ -0,0 +1,69 @@ +package org.dromara.wms.service; + +import org.dromara.wms.domain.WmsDeliveryNote; +import org.dromara.wms.domain.vo.WmsDeliveryNoteVo; +import org.dromara.wms.domain.bo.WmsDeliveryNoteBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 送货单管理Service接口 + * + * @author LionLi + * @date 2025-01-06 + */ +public interface IWmsDeliveryNoteService { + + /** + * 查询送货单管理 + * + * @param deliveryNoteId 主键 + * @return 送货单管理 + */ + WmsDeliveryNoteVo queryById(Long deliveryNoteId); + + /** + * 分页查询送货单管理列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 送货单管理分页列表 + */ + TableDataInfo queryPageList(WmsDeliveryNoteBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的送货单管理列表 + * + * @param bo 查询条件 + * @return 送货单管理列表 + */ + List queryList(WmsDeliveryNoteBo bo); + + /** + * 新增送货单管理 + * + * @param bo 送货单管理 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsDeliveryNoteBo bo); + + /** + * 修改送货单管理 + * + * @param bo 送货单管理 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsDeliveryNoteBo bo); + + /** + * 校验并批量删除送货单管理信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsDeliveryNoteServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsDeliveryNoteServiceImpl.java new file mode 100644 index 0000000..7e204cd --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsDeliveryNoteServiceImpl.java @@ -0,0 +1,140 @@ +package org.dromara.wms.service.impl; + +import com.alibaba.nacos.shaded.com.google.common.collect.Maps; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.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 org.dromara.wms.domain.bo.WmsDeliveryNoteBo; +import org.dromara.wms.domain.vo.WmsDeliveryNoteVo; +import org.dromara.wms.domain.WmsDeliveryNote; +import org.dromara.wms.mapper.WmsDeliveryNoteMapper; +import org.dromara.wms.service.IWmsDeliveryNoteService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 送货单管理Service业务层处理 + * + * @author LionLi + * @date 2025-01-06 + */ +@RequiredArgsConstructor +@Service +public class WmsDeliveryNoteServiceImpl implements IWmsDeliveryNoteService { + + private final WmsDeliveryNoteMapper baseMapper; + + /** + * 查询送货单管理 + * + * @param deliveryNoteId 主键 + * @return 送货单管理 + */ + @Override + public WmsDeliveryNoteVo queryById(Long deliveryNoteId){ + + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(WmsDeliveryNote::getDeliveryNoteId, deliveryNoteId)); + } + + /** + * 分页查询送货单管理列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 送货单管理分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsDeliveryNoteBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByAsc(WmsDeliveryNote::getCreateTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的送货单管理列表 + * + * @param bo 查询条件 + * @return 送货单管理列表 + */ + @Override + public List queryList(WmsDeliveryNoteBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsDeliveryNoteBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getDeliveryNoteId() != null, WmsDeliveryNote::getDeliveryNoteId, bo.getDeliveryNoteId()); + lqw.eq(StringUtils.isNotBlank(bo.getPoNo()), WmsDeliveryNote::getPoNo, bo.getPoNo()); + lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), WmsDeliveryNote::getTenantId, bo.getTenantId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeliveryNoteCode()), WmsDeliveryNote::getDeliveryNoteCode, bo.getDeliveryNoteCode()); + lqw.eq(StringUtils.isNotBlank(bo.getDeliveryNoteState()), WmsDeliveryNote::getDeliveryNoteState, bo.getDeliveryNoteState()); + lqw.eq(bo.getPrintQty() != null, WmsDeliveryNote::getPrintQty, bo.getPrintQty()); + lqw.eq(StringUtils.isNotBlank(bo.getLicensePlate()), WmsDeliveryNote::getLicensePlate, bo.getLicensePlate()); + return lqw; + } + + /** + * 新增送货单管理 + * + * @param bo 送货单管理 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsDeliveryNoteBo bo) { + WmsDeliveryNote add = MapstructUtils.convert(bo, WmsDeliveryNote.class); + // add.setCreateBy("12312"); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setDeliveryNoteId(add.getDeliveryNoteId()); + } + return flag; + } + + /** + * 修改送货单管理 + * + * @param bo 送货单管理 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsDeliveryNoteBo bo) { + WmsDeliveryNote update = MapstructUtils.convert(bo, WmsDeliveryNote.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsDeliveryNote entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除送货单管理信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsDeliveryNoteMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsDeliveryNoteMapper.xml new file mode 100644 index 0000000..71ef834 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsDeliveryNoteMapper.xml @@ -0,0 +1,7 @@ + + + + +