From 56b8b84689ccf5389ee02814bcb8bfe407f05a87 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 11:09:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/controller/ProductionOrderPickRecordController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderPickRecordController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderPickRecordController.java
index a266c8e..05e1a50 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderPickRecordController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderPickRecordController.java
@@ -1,7 +1,17 @@
package com.ruoyi.production.controller;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.production.bean.dto.ProductionOrderPickRecordDto;
+import com.ruoyi.production.bean.vo.ProductionOrderPickRecordVo;
+import com.ruoyi.production.service.ProductionOrderPickRecordService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* <p>
@@ -13,6 +23,15 @@
*/
@RestController
@RequestMapping("/productionOrderPickRecord")
+@Tag(name = "鐢熶骇璁㈠崟棰嗘枡璁板綍")
+@RequiredArgsConstructor
public class ProductionOrderPickRecordController {
+ private final ProductionOrderPickRecordService productionOrderPickRecordService;
+
+ @GetMapping("/feeding")
+ @Operation(summary = "鏌ヨ琛ユ枡璁板綍")
+ public R<List<ProductionOrderPickRecordVo>> listFeedingRecord(ProductionOrderPickRecordDto dto) {
+ return R.ok(productionOrderPickRecordService.listFeedingRecord(dto));
+ }
}
--
Gitblit v1.9.3