diff --git a/klp-wms/src/main/java/com/klp/controller/WmsTransferOrderController.java b/klp-wms/src/main/java/com/klp/controller/WmsTransferOrderController.java new file mode 100644 index 00000000..3a3af6d7 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsTransferOrderController.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.WmsTransferOrderVo; +import com.klp.domain.bo.WmsTransferOrderBo; +import com.klp.service.IWmsTransferOrderService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 调拨单主 + * + * @author klp + * @date 2026-03-27 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/transferOrder") +public class WmsTransferOrderController extends BaseController { + + private final IWmsTransferOrderService iWmsTransferOrderService; + + /** + * 查询调拨单主列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsTransferOrderBo bo, PageQuery pageQuery) { + return iWmsTransferOrderService.queryPageList(bo, pageQuery); + } + + /** + * 导出调拨单主列表 + */ + @Log(title = "调拨单主", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsTransferOrderBo bo, HttpServletResponse response) { + List list = iWmsTransferOrderService.queryList(bo); + ExcelUtil.exportExcel(list, "调拨单主", WmsTransferOrderVo.class, response); + } + + /** + * 获取调拨单主详细信息 + * + * @param orderId 主键 + */ + @GetMapping("/{orderId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long orderId) { + return R.ok(iWmsTransferOrderService.queryById(orderId)); + } + + /** + * 新增调拨单主 + */ + @Log(title = "调拨单主", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsTransferOrderBo bo) { + return toAjax(iWmsTransferOrderService.insertByBo(bo)); + } + + /** + * 修改调拨单主 + */ + @Log(title = "调拨单主", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsTransferOrderBo bo) { + return toAjax(iWmsTransferOrderService.updateByBo(bo)); + } + + /** + * 删除调拨单主 + * + * @param orderIds 主键串 + */ + @Log(title = "调拨单主", businessType = BusinessType.DELETE) + @DeleteMapping("/{orderIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] orderIds) { + return toAjax(iWmsTransferOrderService.deleteWithValidByIds(Arrays.asList(orderIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/controller/WmsTransferOrderItemController.java b/klp-wms/src/main/java/com/klp/controller/WmsTransferOrderItemController.java new file mode 100644 index 00000000..2a9f738f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsTransferOrderItemController.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.WmsTransferOrderItemVo; +import com.klp.domain.bo.WmsTransferOrderItemBo; +import com.klp.service.IWmsTransferOrderItemService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 调拨单明细 + * + * @author klp + * @date 2026-03-27 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/transferOrderItem") +public class WmsTransferOrderItemController extends BaseController { + + private final IWmsTransferOrderItemService iWmsTransferOrderItemService; + + /** + * 查询调拨单明细列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsTransferOrderItemBo bo, PageQuery pageQuery) { + return iWmsTransferOrderItemService.queryPageList(bo, pageQuery); + } + + /** + * 导出调拨单明细列表 + */ + @Log(title = "调拨单明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsTransferOrderItemBo bo, HttpServletResponse response) { + List list = iWmsTransferOrderItemService.queryList(bo); + ExcelUtil.exportExcel(list, "调拨单明细", WmsTransferOrderItemVo.class, response); + } + + /** + * 获取调拨单明细详细信息 + * + * @param itemId 主键 + */ + @GetMapping("/{itemId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long itemId) { + return R.ok(iWmsTransferOrderItemService.queryById(itemId)); + } + + /** + * 新增调拨单明细 + */ + @Log(title = "调拨单明细", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsTransferOrderItemBo bo) { + return toAjax(iWmsTransferOrderItemService.insertByBo(bo)); + } + + /** + * 修改调拨单明细 + */ + @Log(title = "调拨单明细", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsTransferOrderItemBo bo) { + return toAjax(iWmsTransferOrderItemService.updateByBo(bo)); + } + + /** + * 删除调拨单明细 + * + * @param itemIds 主键串 + */ + @Log(title = "调拨单明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{itemIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] itemIds) { + return toAjax(iWmsTransferOrderItemService.deleteWithValidByIds(Arrays.asList(itemIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsTransferOrder.java b/klp-wms/src/main/java/com/klp/domain/WmsTransferOrder.java new file mode 100644 index 00000000..d07470c0 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsTransferOrder.java @@ -0,0 +1,55 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 调拨单主对象 wms_transfer_order + * + * @author klp + * @date 2026-03-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_transfer_order") +public class WmsTransferOrder extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 调拨单主键ID + */ + @TableId(value = "order_id") + private Long orderId; + /** + * 调拨单号(唯一，格式：DB+年月日+流水号) + */ + private String transferNo; + /** + * 调拨单名称 + */ + private String transferName; + /** + * 调拨状态 0-待审核 1-已完成 2-已取消 + */ + private Long transferStatus; + /** + * 实际调拨时间 + */ + private Date transferTime; + /** + * 备注 + */ + private String remark; + /** + * 删除标记(0正常 1删除) + */ + @TableLogic + private Long delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsTransferOrderItem.java b/klp-wms/src/main/java/com/klp/domain/WmsTransferOrderItem.java new file mode 100644 index 00000000..8caab575 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsTransferOrderItem.java @@ -0,0 +1,69 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 调拨单明细对象 wms_transfer_order_item + * + * @author klp + * @date 2026-03-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_transfer_order_item") +public class WmsTransferOrderItem extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 调拨明细主键ID + */ + @TableId(value = "item_id") + private Long itemId; + /** + * 关联调拨单ID + */ + private Long transferId; + /** + * 钢卷id + */ + private Long coilId; + /** + * 调拨前itemId + */ + private Long itemIdBefore; + /** + * 调拨后itemId + */ + private Long itemIdAfter; + /** + * 修改前物料类型 1-原料 2-成品 + */ + private Long materialTypeBefore; + /** + * 修改后物料类型 1-原料 2-成品 + */ + private Long materialTypeAfter; + /** + * 调拨前逻辑库区ID + */ + private Long warehouseIdBefore; + /** + * 调拨后逻辑库区ID + */ + private Long warehouseIdAfter; + /** + * 备注 + */ + private String remark; + /** + * 删除标记(0正常 1删除) + */ + @TableLogic + private Long delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderBo.java new file mode 100644 index 00000000..6acac4a1 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderBo.java @@ -0,0 +1,53 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 调拨单主业务对象 wms_transfer_order + * + * @author klp + * @date 2026-03-27 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsTransferOrderBo extends BaseEntity { + + /** + * 调拨单主键ID + */ + private Long orderId; + + /** + * 调拨单号(唯一，格式：DB+年月日+流水号) + */ + private String transferNo; + + /** + * 调拨单名称 + */ + private String transferName; + + /** + * 调拨状态 0-待审核 1-已完成 2-已取消 + */ + private Long transferStatus; + + /** + * 实际调拨时间 + */ + private Date transferTime; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java new file mode 100644 index 00000000..00d45d8a --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java @@ -0,0 +1,71 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 调拨单明细业务对象 wms_transfer_order_item + * + * @author klp + * @date 2026-03-27 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsTransferOrderItemBo extends BaseEntity { + + /** + * 调拨明细主键ID + */ + private Long itemId; + + /** + * 关联调拨单ID + */ + private Long transferId; + + /** + * 钢卷id + */ + private Long coilId; + + /** + * 调拨前itemId + */ + private Long itemIdBefore; + + /** + * 调拨后itemId + */ + private Long itemIdAfter; + + /** + * 修改前物料类型 1-原料 2-成品 + */ + private Long materialTypeBefore; + + /** + * 修改后物料类型 1-原料 2-成品 + */ + private Long materialTypeAfter; + + /** + * 调拨前逻辑库区ID + */ + private Long warehouseIdBefore; + + /** + * 调拨后逻辑库区ID + */ + private Long warehouseIdAfter; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsTransferOrderItemVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsTransferOrderItemVo.java new file mode 100644 index 00000000..68dbde67 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsTransferOrderItemVo.java @@ -0,0 +1,83 @@ +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_transfer_order_item + * + * @author klp + * @date 2026-03-27 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsTransferOrderItemVo { + + private static final long serialVersionUID = 1L; + + /** + * 调拨明细主键ID + */ + @ExcelProperty(value = "调拨明细主键ID") + private Long itemId; + + /** + * 关联调拨单ID + */ + @ExcelProperty(value = "关联调拨单ID") + private Long transferId; + + /** + * 钢卷id + */ + @ExcelProperty(value = "钢卷id") + private Long coilId; + + /** + * 调拨前itemId + */ + @ExcelProperty(value = "调拨前itemId") + private Long itemIdBefore; + + /** + * 调拨后itemId + */ + @ExcelProperty(value = "调拨后itemId") + private Long itemIdAfter; + + /** + * 修改前物料类型 1-原料 2-成品 + */ + @ExcelProperty(value = "修改前物料类型 1-原料 2-成品") + private Long materialTypeBefore; + + /** + * 修改后物料类型 1-原料 2-成品 + */ + @ExcelProperty(value = "修改后物料类型 1-原料 2-成品") + private Long materialTypeAfter; + + /** + * 调拨前逻辑库区ID + */ + @ExcelProperty(value = "调拨前逻辑库区ID") + private Long warehouseIdBefore; + + /** + * 调拨后逻辑库区ID + */ + @ExcelProperty(value = "调拨后逻辑库区ID") + private Long warehouseIdAfter; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsTransferOrderVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsTransferOrderVo.java new file mode 100644 index 00000000..93bd6bf9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsTransferOrderVo.java @@ -0,0 +1,61 @@ +package com.klp.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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_transfer_order + * + * @author klp + * @date 2026-03-27 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsTransferOrderVo { + + private static final long serialVersionUID = 1L; + + /** + * 调拨单主键ID + */ + @ExcelProperty(value = "调拨单主键ID") + private Long orderId; + + /** + * 调拨单号(唯一，格式：DB+年月日+流水号) + */ + @ExcelProperty(value = "调拨单号(唯一，格式：DB+年月日+流水号)") + private String transferNo; + + /** + * 调拨单名称 + */ + @ExcelProperty(value = "调拨单名称") + private String transferName; + + /** + * 调拨状态 0-待审核 1-已完成 2-已取消 + */ + @ExcelProperty(value = "调拨状态 0-待审核 1-已完成 2-已取消") + private Long transferStatus; + + /** + * 实际调拨时间 + */ + @ExcelProperty(value = "实际调拨时间") + private Date transferTime; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsTransferOrderItemMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsTransferOrderItemMapper.java new file mode 100644 index 00000000..59c7c2a3 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsTransferOrderItemMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsTransferOrderItem; +import com.klp.domain.vo.WmsTransferOrderItemVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 调拨单明细Mapper接口 + * + * @author klp + * @date 2026-03-27 + */ +public interface WmsTransferOrderItemMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsTransferOrderMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsTransferOrderMapper.java new file mode 100644 index 00000000..dabdd756 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsTransferOrderMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsTransferOrder; +import com.klp.domain.vo.WmsTransferOrderVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 调拨单主Mapper接口 + * + * @author klp + * @date 2026-03-27 + */ +public interface WmsTransferOrderMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsTransferOrderItemService.java b/klp-wms/src/main/java/com/klp/service/IWmsTransferOrderItemService.java new file mode 100644 index 00000000..5fbf5fc1 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsTransferOrderItemService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsTransferOrderItem; +import com.klp.domain.vo.WmsTransferOrderItemVo; +import com.klp.domain.bo.WmsTransferOrderItemBo; +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-03-27 + */ +public interface IWmsTransferOrderItemService { + + /** + * 查询调拨单明细 + */ + WmsTransferOrderItemVo queryById(Long itemId); + + /** + * 查询调拨单明细列表 + */ + TableDataInfo queryPageList(WmsTransferOrderItemBo bo, PageQuery pageQuery); + + /** + * 查询调拨单明细列表 + */ + List queryList(WmsTransferOrderItemBo bo); + + /** + * 新增调拨单明细 + */ + Boolean insertByBo(WmsTransferOrderItemBo bo); + + /** + * 修改调拨单明细 + */ + Boolean updateByBo(WmsTransferOrderItemBo bo); + + /** + * 校验并批量删除调拨单明细信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsTransferOrderService.java b/klp-wms/src/main/java/com/klp/service/IWmsTransferOrderService.java new file mode 100644 index 00000000..014c0982 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsTransferOrderService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsTransferOrder; +import com.klp.domain.vo.WmsTransferOrderVo; +import com.klp.domain.bo.WmsTransferOrderBo; +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-03-27 + */ +public interface IWmsTransferOrderService { + + /** + * 查询调拨单主 + */ + WmsTransferOrderVo queryById(Long orderId); + + /** + * 查询调拨单主列表 + */ + TableDataInfo queryPageList(WmsTransferOrderBo bo, PageQuery pageQuery); + + /** + * 查询调拨单主列表 + */ + List queryList(WmsTransferOrderBo bo); + + /** + * 新增调拨单主 + */ + Boolean insertByBo(WmsTransferOrderBo bo); + + /** + * 修改调拨单主 + */ + Boolean updateByBo(WmsTransferOrderBo bo); + + /** + * 校验并批量删除调拨单主信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java new file mode 100644 index 00000000..e46ed11c --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java @@ -0,0 +1,115 @@ +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.WmsTransferOrderItemBo; +import com.klp.domain.vo.WmsTransferOrderItemVo; +import com.klp.domain.WmsTransferOrderItem; +import com.klp.mapper.WmsTransferOrderItemMapper; +import com.klp.service.IWmsTransferOrderItemService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 调拨单明细Service业务层处理 + * + * @author klp + * @date 2026-03-27 + */ +@RequiredArgsConstructor +@Service +public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemService { + + private final WmsTransferOrderItemMapper baseMapper; + + /** + * 查询调拨单明细 + */ + @Override + public WmsTransferOrderItemVo queryById(Long itemId){ + return baseMapper.selectVoById(itemId); + } + + /** + * 查询调拨单明细列表 + */ + @Override + public TableDataInfo queryPageList(WmsTransferOrderItemBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询调拨单明细列表 + */ + @Override + public List queryList(WmsTransferOrderItemBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsTransferOrderItemBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getTransferId() != null, WmsTransferOrderItem::getTransferId, bo.getTransferId()); + lqw.eq(bo.getCoilId() != null, WmsTransferOrderItem::getCoilId, bo.getCoilId()); + lqw.eq(bo.getItemIdBefore() != null, WmsTransferOrderItem::getItemIdBefore, bo.getItemIdBefore()); + lqw.eq(bo.getItemIdAfter() != null, WmsTransferOrderItem::getItemIdAfter, bo.getItemIdAfter()); + lqw.eq(bo.getMaterialTypeBefore() != null, WmsTransferOrderItem::getMaterialTypeBefore, bo.getMaterialTypeBefore()); + lqw.eq(bo.getMaterialTypeAfter() != null, WmsTransferOrderItem::getMaterialTypeAfter, bo.getMaterialTypeAfter()); + lqw.eq(bo.getWarehouseIdBefore() != null, WmsTransferOrderItem::getWarehouseIdBefore, bo.getWarehouseIdBefore()); + lqw.eq(bo.getWarehouseIdAfter() != null, WmsTransferOrderItem::getWarehouseIdAfter, bo.getWarehouseIdAfter()); + return lqw; + } + + /** + * 新增调拨单明细 + */ + @Override + public Boolean insertByBo(WmsTransferOrderItemBo bo) { + WmsTransferOrderItem add = BeanUtil.toBean(bo, WmsTransferOrderItem.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setItemId(add.getItemId()); + } + return flag; + } + + /** + * 修改调拨单明细 + */ + @Override + public Boolean updateByBo(WmsTransferOrderItemBo bo) { + WmsTransferOrderItem update = BeanUtil.toBean(bo, WmsTransferOrderItem.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsTransferOrderItem 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/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java new file mode 100644 index 00000000..aed91082 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java @@ -0,0 +1,112 @@ +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 com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsTransferOrderBo; +import com.klp.domain.vo.WmsTransferOrderVo; +import com.klp.domain.WmsTransferOrder; +import com.klp.mapper.WmsTransferOrderMapper; +import com.klp.service.IWmsTransferOrderService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 调拨单主Service业务层处理 + * + * @author klp + * @date 2026-03-27 + */ +@RequiredArgsConstructor +@Service +public class WmsTransferOrderServiceImpl implements IWmsTransferOrderService { + + private final WmsTransferOrderMapper baseMapper; + + /** + * 查询调拨单主 + */ + @Override + public WmsTransferOrderVo queryById(Long orderId){ + return baseMapper.selectVoById(orderId); + } + + /** + * 查询调拨单主列表 + */ + @Override + public TableDataInfo queryPageList(WmsTransferOrderBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询调拨单主列表 + */ + @Override + public List queryList(WmsTransferOrderBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsTransferOrderBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTransferNo()), WmsTransferOrder::getTransferNo, bo.getTransferNo()); + lqw.like(StringUtils.isNotBlank(bo.getTransferName()), WmsTransferOrder::getTransferName, bo.getTransferName()); + lqw.eq(bo.getTransferStatus() != null, WmsTransferOrder::getTransferStatus, bo.getTransferStatus()); + lqw.eq(bo.getTransferTime() != null, WmsTransferOrder::getTransferTime, bo.getTransferTime()); + return lqw; + } + + /** + * 新增调拨单主 + */ + @Override + public Boolean insertByBo(WmsTransferOrderBo bo) { + WmsTransferOrder add = BeanUtil.toBean(bo, WmsTransferOrder.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setOrderId(add.getOrderId()); + } + return flag; + } + + /** + * 修改调拨单主 + */ + @Override + public Boolean updateByBo(WmsTransferOrderBo bo) { + WmsTransferOrder update = BeanUtil.toBean(bo, WmsTransferOrder.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsTransferOrder 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/WmsTransferOrderItemMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsTransferOrderItemMapper.xml new file mode 100644 index 00000000..12c5a500 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsTransferOrderItemMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsTransferOrderMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsTransferOrderMapper.xml new file mode 100644 index 00000000..9e992e35 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsTransferOrderMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + +