diff --git a/klp-ui/src/api/wms/stockIo.js b/klp-ui/src/api/wms/stockIo.js new file mode 100644 index 00000000..41ddaa36 --- /dev/null +++ b/klp-ui/src/api/wms/stockIo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询出入库单主列表 +export function listStockIo(query) { + return request({ + url: '/wms/stockIo/list', + method: 'get', + params: query + }) +} + +// 查询出入库单主详细 +export function getStockIo(stockIoId) { + return request({ + url: '/wms/stockIo/' + stockIoId, + method: 'get' + }) +} + +// 新增出入库单主 +export function addStockIo(data) { + return request({ + url: '/wms/stockIo', + method: 'post', + data: data + }) +} + +// 修改出入库单主 +export function updateStockIo(data) { + return request({ + url: '/wms/stockIo', + method: 'put', + data: data + }) +} + +// 删除出入库单主 +export function delStockIo(stockIoId) { + return request({ + url: '/wms/stockIo/' + stockIoId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/stockIoDetail.js b/klp-ui/src/api/wms/stockIoDetail.js new file mode 100644 index 00000000..fd277420 --- /dev/null +++ b/klp-ui/src/api/wms/stockIoDetail.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询出入库单明细列表 +export function listStockIoDetail(query) { + return request({ + url: '/wms/stockIoDetail/list', + method: 'get', + params: query + }) +} + +// 查询出入库单明细详细 +export function getStockIoDetail(detailId) { + return request({ + url: '/wms/stockIoDetail/' + detailId, + method: 'get' + }) +} + +// 新增出入库单明细 +export function addStockIoDetail(data) { + return request({ + url: '/wms/stockIoDetail', + method: 'post', + data: data + }) +} + +// 修改出入库单明细 +export function updateStockIoDetail(data) { + return request({ + url: '/wms/stockIoDetail', + method: 'put', + data: data + }) +} + +// 删除出入库单明细 +export function delStockIoDetail(detailId) { + return request({ + url: '/wms/stockIoDetail/' + detailId, + method: 'delete' + }) +} diff --git a/klp-ui/src/views/wms/stockIo/index.vue b/klp-ui/src/views/wms/stockIo/index.vue new file mode 100644 index 00000000..112b5b0c --- /dev/null +++ b/klp-ui/src/views/wms/stockIo/index.vue @@ -0,0 +1,396 @@ + + + diff --git a/klp-ui/src/views/wms/stockIo/panels/detail.vue b/klp-ui/src/views/wms/stockIo/panels/detail.vue new file mode 100644 index 00000000..39583d12 --- /dev/null +++ b/klp-ui/src/views/wms/stockIo/panels/detail.vue @@ -0,0 +1,323 @@ + + + + diff --git a/klp-wms/src/main/java/com/klp/controller/WmsStockIoController.java b/klp-wms/src/main/java/com/klp/controller/WmsStockIoController.java index 1060d70c..b66adf9c 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsStockIoController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsStockIoController.java @@ -3,6 +3,7 @@ package com.klp.controller; import java.util.List; import java.util.Arrays; +import com.klp.domain.vo.WmsStockIoDetailVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -24,7 +25,7 @@ import com.klp.service.IWmsStockIoService; import com.klp.common.core.page.TableDataInfo; /** - * 出入库单主 + * 出入库单主表 * * @author Joshi * @date 2025-07-18 @@ -110,7 +111,7 @@ public class WmsStockIoController extends BaseController { /** * 撤销出入库/移库单 */ - @SaCheckPermission("klp:stockIo:cancel") + @Log(title = "出入库单主", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/cancel/{stockIoId}") @@ -121,9 +122,8 @@ public class WmsStockIoController extends BaseController { /** * 根据ioType和stockIoId联查明细 */ - @SaCheckPermission("klp:stockIo:detail") @GetMapping("/detailByTypeAndId") - public R> detailByTypeAndId(@RequestParam String ioType, @RequestParam Long stockIoId) { + public R> detailByTypeAndId(@RequestParam String ioType, @RequestParam Long stockIoId) { return R.ok(iWmsStockIoService.detailByTypeAndId(ioType, stockIoId)); } } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsStockIoService.java b/klp-wms/src/main/java/com/klp/service/IWmsStockIoService.java index 37f79f17..06928f94 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsStockIoService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsStockIoService.java @@ -1,6 +1,7 @@ package com.klp.service; import com.klp.domain.WmsStockIo; +import com.klp.domain.vo.WmsStockIoDetailVo; import com.klp.domain.vo.WmsStockIoVo; import com.klp.domain.bo.WmsStockIoBo; import com.klp.common.core.page.TableDataInfo; @@ -60,5 +61,5 @@ public interface IWmsStockIoService { /** * 根据ioType和stockIoId联查明细 */ - java.util.List detailByTypeAndId(String ioType, Long stockIoId); + java.util.List detailByTypeAndId(String ioType, Long stockIoId); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoServiceImpl.java index 222837b9..85607e26 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoServiceImpl.java @@ -8,7 +8,9 @@ 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 com.klp.domain.vo.WmsStockIoDetailVo; import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.klp.domain.bo.WmsStockIoBo; import com.klp.domain.vo.WmsStockIoVo; @@ -22,6 +24,7 @@ import com.klp.mapper.WmsStockMapper; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Collection; @@ -211,7 +214,7 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService { * 根据ioType和stockIoId联查明细 */ @Override - public java.util.List detailByTypeAndId(String ioType, Long stockIoId) { + public List detailByTypeAndId(String ioType, Long stockIoId) { WmsStockIo stockIo = baseMapper.selectById(stockIoId); if (stockIo == null) { throw new ServiceException("单据不存在"); @@ -226,10 +229,10 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService { return java.util.Collections.emptyList(); } // 转VO - java.util.List voList = new java.util.ArrayList<>(); + List voList = new ArrayList<>(); for (WmsStockIoDetail detail : details) { - com.klp.domain.vo.WmsStockIoDetailVo vo = new com.klp.domain.vo.WmsStockIoDetailVo(); - org.springframework.beans.BeanUtils.copyProperties(detail, vo); + WmsStockIoDetailVo vo = new WmsStockIoDetailVo(); + BeanUtils.copyProperties(detail, vo); voList.add(vo); } return voList;