From 1fd7a7d67a5df84b57af4fbcc310aa66da3cd8ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 17:51:16 +0800
Subject: [PATCH] feat:1.出入库单位转换 2.仓储/耗材导出字段值优化 3.仓储/耗材库存为0不展示
---
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 9dd898a..57e5355 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -3,55 +3,70 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
-import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.util.Arrays;
@Api(tags = "璁惧鎶ヤ慨绠＄悊")
-@RequestMapping("/device/reppair")
+@RequestMapping("/device/repair")
@RestController
public class DeviceRepairController {
@Autowired
private IDeviceRepairService deviceRepairService;
- @ApiModelProperty("璁惧鎶ヤ慨鍒楄〃")
+ @Autowired
+ private IDeviceLedgerService deviceLedgerService;
+
+ @ApiOperation("璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
- return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
+ public AjaxResult page(Page page, DeviceRepairDto deviceRepairDto) {
+ return AjaxResult.success(deviceRepairService.queryPage(page, deviceRepairDto));
}
@PostMapping()
- @ApiModelProperty("娣诲姞璁惧鎶ヤ慨")
- public AjaxResult add(DeviceRepair deviceRepair) {
+ @ApiOperation("娣诲姞璁惧鎶ヤ慨")
+ public AjaxResult add(@RequestBody DeviceRepair deviceRepair) {
return deviceRepairService.saveDeviceRepair(deviceRepair);
}
- @ApiModelProperty("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
+ @ApiOperation("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@GetMapping("/{id}")
public AjaxResult detail(@PathVariable Long id) {
- return AjaxResult.success(deviceRepairService.getById(id));
+ DeviceRepairDto byId = deviceRepairService.detailById(id);
+ return AjaxResult.success(byId);
}
+//
+// @ApiOperation("鏍规嵁id鏌ヨ闄勪欢")
+// @GetMapping("/{deviceId}")
+// public AjaxResult deviceId(@PathVariable Long id) {
+// DeviceRepairDto byId = deviceRepairService.detailById(id);
+// return AjaxResult.success(byId);
+// }
- @PutMapping ()
- @ApiModelProperty("淇敼璁惧鎶ヤ慨")
- public AjaxResult update(DeviceRepair deviceRepair) {
+ @PutMapping()
+ @ApiOperation("淇敼璁惧鎶ヤ慨")
+ public AjaxResult update(@RequestBody DeviceRepair deviceRepair) {
return deviceRepairService.updateDeviceRepair(deviceRepair);
}
- @DeleteMapping("/{id}")
- @ApiModelProperty("鍒犻櫎璁惧鎶ヤ慨")
- public AjaxResult delete(@PathVariable ArrayList<Long> ids) {
- boolean b = deviceRepairService.removeBatchByIds(ids);
+ @PostMapping("/repairs")
+ public AjaxResult repair(@RequestBody DeviceRepair deviceRepair) {
+ return deviceRepairService.updateDeviceRepair(deviceRepair);
+ }
+
+ @DeleteMapping("/{ids}")
+ @ApiOperation("鍒犻櫎璁惧鎶ヤ慨")
+ public AjaxResult delete(@PathVariable("ids") Long[] ids) {
+ boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
return AjaxResult.error("鍒犻櫎澶辫触");
}
@@ -59,7 +74,7 @@
}
@PostMapping("export")
- @ApiModelProperty("瀵煎嚭璁惧鎶ヤ慨")
+ @ApiOperation("瀵煎嚭璁惧鎶ヤ慨")
public void export(HttpServletResponse response, Long[] ids) {
deviceRepairService.export(response, ids);
}
--
Gitblit v1.9.3