From 4ad61e4c257621124625a89853eaa8334a11b0be Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 11:26:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
index 6a77b84..a1d1766 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
@@ -32,23 +32,34 @@
@Resource
OrdersService ordersService;
- @ApiOperation("鏌ヨ鎵�鏈夎鍗曞垪琛�")
+ //璁㈠崟BOM鏄攢鍞崟閫氳繃涔嬪悗鐨�
+ @ApiOperation("鏌ヨ鎵�鏈夎鍗旴OM鍒楄〃")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "orderCode", value = "璁㈠崟缂栧彿", dataTypeClass = String.class),
@ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
- @ApiImplicitParam(name = "state", value = "缂栧埗鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "type", value = "缂栧埗鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "time", value = "涓嬪崟鏃堕棿", dataTypeClass = String.class)
})
@GetMapping("/selectAllOrder")
- public Result selectAllOrder(int pageSize, int countSize, String orderCode, String name, Integer state ,String time) {
- IPage<Map<String, Object>> inspectionPage = ordersService.selectAllOrder(new Page<Object>(pageSize, countSize), orderCode, name, state, time);
+ public Result selectAllOrder(int pageSize, int countSize, String orderCode, String name, Integer type ,String time) {
+ IPage<Map<String, Object>> inspectionPage = ordersService.selectAllOrder(new Page<Object>(pageSize, countSize), orderCode, name, type, time);
Map<String, Object> map = new HashMap<>();
map.put("total", inspectionPage.getTotal());
map.put("row", inspectionPage.getRecords());
return Result.success(map);
}
+ @ApiOperation("缂栧埗")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "閿�鍞骇鍝乮d", dataTypeClass = Integer.class,required = true)
+ })
+ @PostMapping("/compile")
+ public Result compile(Integer id) {
+ ordersService.compile(id);
+ return Result.success("缂栧埗浜у搧瀹屾垚!");
+ }
+
}
--
Gitblit v1.9.3