查询能源消耗
This commit is contained in:
		@@ -77,6 +77,8 @@ public class EnergyController extends BaseController {
 | 
			
		||||
    private ParTemValueServiceBiz parTemValueServiceBiz;
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private KilnInfoServiceBiz kilnInfoServiceBiz;
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private CurrTaskServiceBiz currTaskServiceBiz;
 | 
			
		||||
 | 
			
		||||
    @PostMapping(value = "eletric")
 | 
			
		||||
    @ApiOperation(value = "根据窑炉id获取消耗情况")
 | 
			
		||||
@@ -213,7 +215,10 @@ public class EnergyController extends BaseController {
 | 
			
		||||
    @PostMapping(value = "energyList")
 | 
			
		||||
    @ApiOperation(value = "根据加工炉id获取能源消耗情况")
 | 
			
		||||
    public R<String> energyList(@Validated({Default.class}) @RequestBody ElectricQueryParam electricQueryParam){
 | 
			
		||||
        KilnInfo kilnInfo = kilnInfoServiceBiz.getById(electricQueryParam.getKilnId());
 | 
			
		||||
        electricQueryParam.getTaskId();
 | 
			
		||||
        CurrTask currTask = currTaskServiceBiz.getById(electricQueryParam.getTaskId());
 | 
			
		||||
        Long kilnId = currTask.getKilnId();
 | 
			
		||||
        KilnInfo kilnInfo = kilnInfoServiceBiz.getById(kilnId);
 | 
			
		||||
        Integer kilnType = kilnInfo.getType();
 | 
			
		||||
        //传入任务号,窑炉号,查询消耗数据,返回json字符串
 | 
			
		||||
        JSONObject jsonObject=new JSONObject();
 | 
			
		||||
 
 | 
			
		||||
@@ -22,7 +22,7 @@ public class ElectricQueryParam extends BaseParam {
 | 
			
		||||
 | 
			
		||||
    private static final long serialVersionUID = 1L;
 | 
			
		||||
 | 
			
		||||
    @ApiModelProperty(value = "窑炉id", required = true)
 | 
			
		||||
    @ApiModelProperty(value = "窑炉id", required = false)
 | 
			
		||||
    private Long kilnId;
 | 
			
		||||
 | 
			
		||||
    @ApiModelProperty(value = "任务id", required = true)
 | 
			
		||||
 
 | 
			
		||||
@@ -71,7 +71,7 @@ public class OutStockServiceImpl extends BaseService implements OutStockService
 | 
			
		||||
        setCommonField(runTask);
 | 
			
		||||
        runTaskServiceBiz.save(runTask);
 | 
			
		||||
        //异步调用车辆
 | 
			
		||||
        asynRunTaskService.asynRunOutStock(runTask.getId(),locationId);
 | 
			
		||||
        asynRunTaskService.asynRunOutStock(locationId);
 | 
			
		||||
        //修改库位状态
 | 
			
		||||
        InStockInfo inStockInfo = inStockInfoServiceBiz
 | 
			
		||||
                .getOne(new QueryWrapper<InStockInfo>().eq("Location_id", locationId));
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user