boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (farm): 生产计划

Browse Source 
- 养殖类,打印网箱二维码接口(待实现)
- 投入品使用日志,未显示投入品名称bug
This commit is contained in:
达富斌
2025-11-12 14:07:37 +08:00
parent 30d9274454
commit 978ff3d6a1
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java
View File

@@ -126,4 +126,12 @@ public class PlotInfoController {
return success(res); return success(res);
} }
@GetMapping("/grid-code/print")
@Operation(summary = "网箱二维码打印")
@Parameter(name = "planNumber", description = "生产计划编号", required = true)
public CommonResult<Boolean> gridPrint(@RequestParam("planNumber") String planNumber) {
return success(true);
}
} }

7
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java
View File

@@ -314,14 +314,17 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
LocalDate endDate = startDate.plusDays(used); LocalDate endDate = startDate.plusDays(used);
List<String> taskTime = Arrays.asList(startDate.toString(), endDate.toString()); List<String> taskTime = Arrays.asList(startDate.toString(), endDate.toString());
// 获取农事名称
FarmingNameMaintenanceDO farmingNameMaintenanceDO = farmingNameMaintenanceMapper.selectOne(FarmingNameMaintenanceDO::getId, e.getFarmingId());
FarmingRecordSaveReqVO saveObj = new FarmingRecordSaveReqVO(); FarmingRecordSaveReqVO saveObj = new FarmingRecordSaveReqVO();
saveObj.setTaskStatus(FARMING_RECORD_STATUS_0); saveObj.setTaskStatus(FARMING_RECORD_STATUS_0);
saveObj.setTaskScope(planNumber); saveObj.setTaskScope(planNumber);
saveObj.setTaskTime(taskTime); saveObj.setTaskTime(taskTime);
saveObj.setTaskStartDate(startDate); saveObj.setTaskStartDate(startDate);
saveObj.setTaskEndDate(endDate); saveObj.setTaskEndDate(endDate);
saveObj.setTaskType(e.getFarmingId()); saveObj.setTaskType(farmingNameMaintenanceDO.getFarmingTypeCode());
saveObj.setTaskName(e.getFarmingName()); saveObj.setTaskName(farmingNameMaintenanceDO.getId());
saveObj.setModelFarmingOperationId(e.getId()); saveObj.setModelFarmingOperationId(e.getId());
saveObj.setActualLaborCost(e.getUsed()); saveObj.setActualLaborCost(e.getUsed());
saveObj.setFeedbackNotes(e.getDescription()); saveObj.setFeedbackNotes(e.getDescription());

1
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputUsageRecordsServiceImpl.java
View File

@@ -55,6 +55,7 @@ public class InputUsageRecordsServiceImpl implements InputUsageRecordsService {
String id = IdUtil.fastUUID(); String id = IdUtil.fastUUID();
req.setId(id); req.setId(id);
req.setInputId(i.getId()); req.setInputId(i.getId());
req.setInputName(i.getInputName());
req.setFarmRecordId(frId); req.setFarmRecordId(frId);
req.setCurrentSpecType(i.getCurrentSpecType()); req.setCurrentSpecType(i.getCurrentSpecType());
req.setUsageAmount(inputUsage); req.setUsageAmount(inputUsage);