From 8d0b466ef4fe497932e15c186688679e55a26f62 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 22 八月 2025 10:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java b/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
index 5b055e6..0f5d3c9 100644
--- a/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
+++ b/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
@@ -85,6 +85,7 @@
//@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody LineSideWarehouse lineSideWarehouse) {
+ lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_1);
lineSideWarehouseService.save(lineSideWarehouse);
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -190,4 +191,16 @@
return Result.ok("鎿嶄綔鎴愬姛锛�");
}
+
+ //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
+ @ApiOperation(value="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ", notes="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryByFactoryId")
+ public Result<LineSideWarehouse> queryByFactoryId(@RequestParam(name="factoryId") String factoryId) {
+ LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.queryByFactoryId(factoryId);
+ if(lineSideWarehouse==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(lineSideWarehouse);
+ }
+
}
--
Gitblit v1.9.3