fix (farm): 生产计划
- 养殖类,打印网箱二维码接口(待实现) - 投入品使用日志,未显示投入品名称bug
This commit is contained in:
@@ -126,4 +126,12 @@ public class PlotInfoController {
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -314,14 +314,17 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
|
||||
LocalDate endDate = startDate.plusDays(used);
|
||||
List<String> 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());
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user