diff --git a/ruoyi-ui/src/api/mall/ware/ware-purchase-detail.js b/ruoyi-ui/src/api/mall/ware/ware-purchase-detail.js new file mode 100644 index 00000000..8d3c71fc --- /dev/null +++ b/ruoyi-ui/src/api/mall/ware/ware-purchase-detail.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +//获取仓库采购需求列表 +export function getWarePurchaseDetailList(parms) { + return request({ + url: '/mall-ware/ware/purchasedetail/list', + method: 'get', + params: parms + }) +} + +//删除仓库采购需求 +export function delWarePurchaseDetail(ids) { + return request({ + url: '/mall-ware/ware/purchasedetail/delete', + method: 'delete', + data: ids + }) +} + +//获取仓库采购需求详情 +export function getWarePurchaseDetail(id) { + return request({ + url: `/mall-ware/ware/purchasedetail/info/${id}`, + method: 'get', + }) +} + +//保存仓库采购需求 +export function saveWarePurchaseDetail(data) { + return request({ + url: `/mall-ware/ware/purchasedetail/save`, + method: 'post', + data: data, + }) +} + +//修改仓库采购需求 +export function editWarePurchaseDetail(data) { + return request({ + url: `/mall-ware/ware/purchasedetail/update`, + method: 'put', + data: data, + }) +} + + diff --git a/ruoyi-ui/src/views/mall/ware/warepurchase/purchase-add-or-update.vue b/ruoyi-ui/src/views/mall/ware/warepurchase/purchase-add-or-update.vue new file mode 100644 index 00000000..f7ca6a58 --- /dev/null +++ b/ruoyi-ui/src/views/mall/ware/warepurchase/purchase-add-or-update.vue @@ -0,0 +1,133 @@ + + + diff --git a/ruoyi-ui/src/views/mall/ware/warepurchase/purchase.vue b/ruoyi-ui/src/views/mall/ware/warepurchase/purchase.vue new file mode 100644 index 00000000..7f1203a1 --- /dev/null +++ b/ruoyi-ui/src/views/mall/ware/warepurchase/purchase.vue @@ -0,0 +1,266 @@ + + + diff --git a/ruoyi-ui/src/views/mall/ware/warepurchase/purchasedetail-add-or-update.vue b/ruoyi-ui/src/views/mall/ware/warepurchase/purchasedetail-add-or-update.vue new file mode 100644 index 00000000..1645102e --- /dev/null +++ b/ruoyi-ui/src/views/mall/ware/warepurchase/purchasedetail-add-or-update.vue @@ -0,0 +1,117 @@ + + + diff --git a/ruoyi-ui/src/views/mall/ware/warepurchase/purchasedetail.vue b/ruoyi-ui/src/views/mall/ware/warepurchase/purchasedetail.vue new file mode 100644 index 00000000..2dba30a6 --- /dev/null +++ b/ruoyi-ui/src/views/mall/ware/warepurchase/purchasedetail.vue @@ -0,0 +1,293 @@ + + + diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/PurchaseDetailController.java b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/PurchaseDetailController.java index c1fb3540..48de96c8 100644 --- a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/PurchaseDetailController.java +++ b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/PurchaseDetailController.java @@ -44,7 +44,7 @@ public class PurchaseDetailController { /** * 信息 */ - @RequestMapping("/info/{id}") + @GetMapping("/info/{id}") @ApiOperation("信息") public R info(@PathVariable("id") Long id) { PurchaseDetailEntity purchaseDetail = purchaseDetailService.getById(id); @@ -55,7 +55,7 @@ public class PurchaseDetailController { /** * 保存 */ - @RequestMapping("/save") + @PostMapping("/save") @ApiOperation("保存") @Log(title = "采购需求", businessType = BusinessType.INSERT) public R save(@RequestBody PurchaseDetailEntity purchaseDetail) { @@ -67,7 +67,7 @@ public class PurchaseDetailController { /** * 修改 */ - @RequestMapping("/update") + @PutMapping("/update") @ApiOperation("修改") @Log(title = "采购需求", businessType = BusinessType.UPDATE) public R update(@RequestBody PurchaseDetailEntity purchaseDetail) { @@ -79,7 +79,7 @@ public class PurchaseDetailController { /** * 删除 */ - @RequestMapping("/delete") + @DeleteMapping("/delete") @ApiOperation("删除") @Log(title = "采购需求", businessType = BusinessType.DELETE) public R delete(@RequestBody Long[] ids) { diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/PurchaseDetailServiceImpl.java b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/PurchaseDetailServiceImpl.java index aa3ce98e..a9b742c0 100644 --- a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/PurchaseDetailServiceImpl.java +++ b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/PurchaseDetailServiceImpl.java @@ -6,17 +6,27 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.utils.StringUtils; import com.xjs.mall.ware.dao.PurchaseDetailDao; import com.xjs.mall.ware.entity.PurchaseDetailEntity; +import com.xjs.mall.ware.entity.WareInfoEntity; import com.xjs.mall.ware.service.PurchaseDetailService; +import com.xjs.mall.ware.service.WareInfoService; +import com.xjs.mall.ware.vo.PurchaseDetailVo; import com.xjs.utils.PageUtils; import com.xjs.utils.Query; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service("purchaseDetailService") public class PurchaseDetailServiceImpl extends ServiceImpl implements PurchaseDetailService { + @Autowired + private WareInfoService wareInfoService; + @Override public PageUtils queryPage(Map params) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -35,7 +45,19 @@ public class PurchaseDetailServiceImpl extends ServiceImpl page = this.page(new Query().getPage(params), wrapper); - return new PageUtils(page); + List collect = page.getRecords().stream().map(purchaseDetailEntity -> { + PurchaseDetailVo purchaseDetailVo = new PurchaseDetailVo(); + BeanUtils.copyProperties(purchaseDetailEntity, purchaseDetailVo); + //获取仓库信息 + WareInfoEntity wareInfoEntity = wareInfoService.getById(purchaseDetailVo.getWareId()); + purchaseDetailVo.setWareName(wareInfoEntity.getName()); + return purchaseDetailVo; + }).collect(Collectors.toList()); + + PageUtils pageUtils = new PageUtils(page); + pageUtils.setList(collect); + + return pageUtils; } } diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/vo/PurchaseDetailVo.java b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/vo/PurchaseDetailVo.java new file mode 100644 index 00000000..199c384d --- /dev/null +++ b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/vo/PurchaseDetailVo.java @@ -0,0 +1,47 @@ +package com.xjs.mall.ware.vo; + +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 采购需求vo + * @author xiejs + * @since 2022-03-23 + */ +@Data +public class PurchaseDetailVo { + @TableId + private Long id; + /** + * 采购单id + */ + private Long purchaseId; + /** + * 采购商品id + */ + private Long skuId; + /** + * 采购数量 + */ + private Integer skuNum; + /** + * 采购金额 + */ + private BigDecimal skuPrice; + /** + * 仓库id + */ + private Long wareId; + /** + * 状态[0新建，1已分配，2正在采购，3已完成，4采购失败] + */ + private Integer status; + + /** + * 仓库名称 + */ + private String wareName; + +}