diff --git a/ruoyi-ui/src/api/mall/ware/ware-purchase.js b/ruoyi-ui/src/api/mall/ware/ware-purchase.js
new file mode 100644
index 00000000..7e4f7ce3
--- /dev/null
+++ b/ruoyi-ui/src/api/mall/ware/ware-purchase.js
@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+//获取仓库采购单列表
+export function getWarePurchaseList(parms) {
+ return request({
+ url: '/mall-ware/ware/purchase/list',
+ method: 'get',
+ params: parms
+ })
+}
+
+//删除仓库采购单
+export function delWarePurchase(ids) {
+ return request({
+ url: '/mall-ware/ware/purchase/delete',
+ method: 'delete',
+ data: ids
+ })
+}
+
+//获取仓库采购单详情
+export function getWarePurchase(id) {
+ return request({
+ url: `/mall-ware/ware/purchase/info/${id}`,
+ method: 'get',
+ })
+}
+
+//保存仓库采购单
+export function saveWarePurchase(data) {
+ return request({
+ url: `/mall-ware/ware/purchase/save`,
+ method: 'post',
+ data: data,
+ })
+}
+
+//修改仓库采购单
+export function editWarePurchase(data) {
+ return request({
+ url: `/mall-ware/ware/purchase/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
index f7ca6a58..766911b8 100644
--- 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
@@ -17,6 +17,8 @@
diff --git a/ruoyi-ui/src/views/mall/ware/warepurchase/purchase.vue b/ruoyi-ui/src/views/mall/ware/warepurchase/purchase.vue
index 7f1203a1..83afd5e6 100644
--- a/ruoyi-ui/src/views/mall/ware/warepurchase/purchase.vue
+++ b/ruoyi-ui/src/views/mall/ware/warepurchase/purchase.vue
@@ -43,11 +43,10 @@
style="width: 100%;"
>
-
-
-
-
-
+
+
+
+
新建
@@ -57,10 +56,10 @@
有异常
-
-
-
-
+
+
+
+
import AddOrUpdate from "./purchase-add-or-update";
-import {delWarePurchase, getWarePurchaseList} from "@/api/mall/ware/ware-purchase-detail";
+import {delWarePurchase, getWarePurchaseList} from "@/api/mall/ware/ware-purchase";
export default {
name: "Purchase",
@@ -134,7 +133,6 @@ export default {
},
created() {
- this.getWares()
this.getDataList();
},
diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/PurchaseController.java b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/PurchaseController.java
index c29357c0..2113db8d 100644
--- a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/PurchaseController.java
+++ b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/PurchaseController.java
@@ -1,9 +1,13 @@
package com.xjs.mall.ware.controller;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.xjs.mall.ware.entity.PurchaseEntity;
import com.xjs.mall.ware.service.PurchaseService;
import com.xjs.utils.PageUtils;
import com.xjs.mall.other.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -17,10 +21,11 @@ import java.util.Map;
*
* @author xiejs
* @email 1294405880@qq.com
- * @date 2022-03-15 09:56:19
+ * @since 2022-03-15 09:56:19
*/
@RestController
@RequestMapping("ware/purchase")
+@Api(tags = "商城-仓库-采购单")
public class PurchaseController {
@Autowired
private PurchaseService purchaseService;
@@ -28,7 +33,8 @@ public class PurchaseController {
/**
* 列表
*/
- @RequestMapping("/list")
+ @GetMapping("/list")
+ @ApiOperation("列表")
public R list(@RequestParam Map params){
PageUtils page = purchaseService.queryPage(params);
@@ -39,7 +45,8 @@ public class PurchaseController {
/**
* 信息
*/
- @RequestMapping("/info/{id}")
+ @GetMapping("/info/{id}")
+ @ApiOperation("信息")
public R info(@PathVariable("id") Long id){
PurchaseEntity purchase = purchaseService.getById(id);
@@ -49,7 +56,9 @@ public class PurchaseController {
/**
* 保存
*/
- @RequestMapping("/save")
+ @PostMapping("/save")
+ @ApiOperation("保存")
+ @Log(title = "采购单", businessType = BusinessType.INSERT)
public R save(@RequestBody PurchaseEntity purchase){
purchaseService.save(purchase);
@@ -59,7 +68,9 @@ public class PurchaseController {
/**
* 修改
*/
- @RequestMapping("/update")
+ @PutMapping("/update")
+ @ApiOperation("修改")
+ @Log(title = "采购单", businessType = BusinessType.UPDATE)
public R update(@RequestBody PurchaseEntity purchase){
purchaseService.updateById(purchase);
@@ -69,7 +80,9 @@ public class PurchaseController {
/**
* 删除
*/
- @RequestMapping("/delete")
+ @DeleteMapping("/delete")
+ @ApiOperation("删除")
+ @Log(title = "采购单", businessType = BusinessType.DELETE)
public R delete(@RequestBody Long[] ids){
purchaseService.removeByIds(Arrays.asList(ids));