From 381e02b9eccbe953b31d09f2af1c2ce77c816140 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 14:51:05 +0800
Subject: [PATCH] fix(mes): 隔离设备物料并支持销售产品映射
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/em/record/MesEmRecordController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/em/record/MesEmRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/em/record/MesEmRecordController.java
index 140f1d3..ff9edc2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/em/record/MesEmRecordController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/em/record/MesEmRecordController.java
@@ -29,21 +29,25 @@
@Validated
public class MesEmRecordController {
+ /**
+ * 娉ㄦ剰锛氬瓧娈靛悕涓嶈兘鍙� recordService锛屽惁鍒� @Resource 浼氫紭鍏堟寜鍚嶇О鍖归厤鍒�
+ * mzt-log 鐨� recordService锛圖efaultLogRecordServiceImpl锛夛紝瀵艰嚧鍚姩澶辫触銆�
+ */
@Resource
- private MesEmRecordService recordService;
+ private MesEmRecordService mesEmRecordService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鑳借�楁妱琛ㄨ褰�")
@PreAuthorize("@ss.hasPermission('mes:em-record:create')")
public CommonResult<Long> createRecord(@Valid @RequestBody MesEmRecordSaveReqVO createReqVO) {
- return success(recordService.createRecord(createReqVO));
+ return success(mesEmRecordService.createRecord(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊鑳借�楁妱琛ㄨ褰�")
@PreAuthorize("@ss.hasPermission('mes:em-record:update')")
public CommonResult<Boolean> updateRecord(@Valid @RequestBody MesEmRecordSaveReqVO updateReqVO) {
- recordService.updateRecord(updateReqVO);
+ mesEmRecordService.updateRecord(updateReqVO);
return success(true);
}
@@ -52,39 +56,36 @@
@Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('mes:em-record:delete')")
public CommonResult<Boolean> deleteRecord(@RequestParam("id") Long id) {
- recordService.deleteRecord(id);
+ mesEmRecordService.deleteRecord(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "鑾峰緱鑳借�楁妱琛ㄨ褰�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:em-record:query')")
public CommonResult<MesEmRecordRespVO> getRecord(@RequestParam("id") Long id) {
- MesEmRecordDO record = recordService.getRecord(id);
+ MesEmRecordDO record = mesEmRecordService.getRecord(id);
if (record == null) {
return success(null);
}
- return success(recordService.getRecordRespVOList(Collections.singletonList(record)).get(0));
+ return success(mesEmRecordService.getRecordRespVOList(Collections.singletonList(record)).get(0));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱鑳借�楁妱琛ㄨ褰曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:em-record:query')")
public CommonResult<PageResult<MesEmRecordRespVO>> getRecordPage(@Valid MesEmRecordPageReqVO pageReqVO) {
- PageResult<MesEmRecordDO> pageResult = recordService.getRecordPage(pageReqVO);
- return success(new PageResult<>(recordService.getRecordRespVOList(pageResult.getList()),
+ PageResult<MesEmRecordDO> pageResult = mesEmRecordService.getRecordPage(pageReqVO);
+ return success(new PageResult<>(mesEmRecordService.getRecordRespVOList(pageResult.getList()),
pageResult.getTotal()));
}
@GetMapping("/last-reading")
@Operation(summary = "鑾峰緱璁￠噺鐐逛笂鏈熻鏁�", description = "鐢ㄤ簬鏂板鎶勮〃璁板綍鏃惰嚜鍔ㄥ甫鍏ユ湡鍒濊鏁�")
- @PreAuthorize("@ss.hasPermission('mes:em-record:query')")
public CommonResult<MesEmLastReadingRespVO> getLastReading(
@RequestParam("meterId") Long meterId,
@RequestParam("recordDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate recordDate,
@RequestParam(value = "excludeId", required = false) Long excludeId) {
- return success(recordService.getLastReading(meterId, recordDate, excludeId));
+ return success(mesEmRecordService.getLastReading(meterId, recordDate, excludeId));
}
}
--
Gitblit v1.9.3