From 978ff3d6a1865f46ee4f3ad834d513787e92f286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Wed, 12 Nov 2025 14:07:37 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E7=94=9F=E4=BA=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 养殖类,打印网箱二维码接口(待实现) - 投入品使用日志,未显示投入品名称bug --- .../managementcenter/baseinfo/PlotInfoController.java | 8 ++++++++ .../service/farmingrecord/FarmingRecordServiceImpl.java | 7 +++++-- .../inputlibrary/InputUsageRecordsServiceImpl.java | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java index 31b042c6..7b34a414 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java @@ -126,4 +126,12 @@ public class PlotInfoController { return success(res); } + @GetMapping("/grid-code/print") + @Operation(summary = "网箱二维码打印") + @Parameter(name = "planNumber", description = "生产计划编号", required = true) + public CommonResult gridPrint(@RequestParam("planNumber") String planNumber) { + + return success(true); + } + } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java index f2fc3efe..b2c66d3a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java @@ -314,14 +314,17 @@ public class FarmingRecordServiceImpl implements FarmingRecordService { LocalDate endDate = startDate.plusDays(used); List taskTime = Arrays.asList(startDate.toString(), endDate.toString()); + // 获取农事名称 + FarmingNameMaintenanceDO farmingNameMaintenanceDO = farmingNameMaintenanceMapper.selectOne(FarmingNameMaintenanceDO::getId, e.getFarmingId()); + FarmingRecordSaveReqVO saveObj = new FarmingRecordSaveReqVO(); saveObj.setTaskStatus(FARMING_RECORD_STATUS_0); saveObj.setTaskScope(planNumber); saveObj.setTaskTime(taskTime); saveObj.setTaskStartDate(startDate); saveObj.setTaskEndDate(endDate); - saveObj.setTaskType(e.getFarmingId()); - saveObj.setTaskName(e.getFarmingName()); + saveObj.setTaskType(farmingNameMaintenanceDO.getFarmingTypeCode()); + saveObj.setTaskName(farmingNameMaintenanceDO.getId()); saveObj.setModelFarmingOperationId(e.getId()); saveObj.setActualLaborCost(e.getUsed()); saveObj.setFeedbackNotes(e.getDescription()); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputUsageRecordsServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputUsageRecordsServiceImpl.java index 768cc0fd..0f74447e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputUsageRecordsServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputUsageRecordsServiceImpl.java @@ -55,6 +55,7 @@ public class InputUsageRecordsServiceImpl implements InputUsageRecordsService { String id = IdUtil.fastUUID(); req.setId(id); req.setInputId(i.getId()); + req.setInputName(i.getInputName()); req.setFarmRecordId(frId); req.setCurrentSpecType(i.getCurrentSpecType()); req.setUsageAmount(inputUsage);