From 66ff6f509bbbba04cffc428e7e1c886b534b4f13 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 17 八月 2023 17:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java | 23 -----------------------
1 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
index 28b986f..8bfd65b 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
@@ -52,11 +52,6 @@
})
@GetMapping("/selSale")
public Result selSale(String orderNumber) {
- //鍙湁閿�鍞崟瀹℃牳閫氳繃涔嬪悗鎵嶈兘鍙戣揣
- Sale sale = saleService.getOne(Wrappers.<Sale>query().eq("order_number", orderNumber));
- if (ObjectUtils.isEmpty(sale.getType()) || sale.getType() != 1 ) {
- return Result.fail("鍙湁閿�鍞崟瀹℃牳閫氳繃涔嬪悗鎵嶈兘鍙戣揣!");
- }
return Result.success(saleService.selSale(orderNumber));
}
@@ -85,25 +80,7 @@
return Result.success(map);
}
- @ApiOperation(value = "鏍规嵁鍙戣揣id鍒犻櫎")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "鍙戣揣id", dataTypeClass = Integer.class, required = true)
- })
- @PostMapping("/delCon")
- public Result delCon(Integer id) {
- consignmentService.delCon(id);
- return Result.success();
- }
- @ApiOperation(value = "鎵归噺鍒犻櫎")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "ids", value = "ids", dataTypeClass = Integer.class, dataType = "List", required = true)
- })
- @PostMapping("/delAllCon")
- public Result delAllCon(@RequestParam("ids") List<Integer> ids) {
- consignmentService.delAllCon(ids);
- return Result.success();
- }
}
--
Gitblit v1.9.3