mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

查询能源消耗

Browse Source
This commit is contained in:
李广豪 2022-03-05 16:09:42 +08:00
parent 211c017278
commit bb957ab4ea
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/EnergyController.java
View File

@ -77,6 +77,8 @@ public class EnergyController extends BaseController {
private ParTemValueServiceBiz parTemValueServiceBiz; private ParTemValueServiceBiz parTemValueServiceBiz;
@Autowired @Autowired
private KilnInfoServiceBiz kilnInfoServiceBiz; private KilnInfoServiceBiz kilnInfoServiceBiz;
@Autowired
private CurrTaskServiceBiz currTaskServiceBiz;
@PostMapping(value = "eletric") @PostMapping(value = "eletric")
@ApiOperation(value = "根据窑炉id获取消耗情况") @ApiOperation(value = "根据窑炉id获取消耗情况")
@ -213,7 +215,10 @@ public class EnergyController extends BaseController {
@PostMapping(value = "energyList") @PostMapping(value = "energyList")
@ApiOperation(value = "根据加工炉id获取能源消耗情况") @ApiOperation(value = "根据加工炉id获取能源消耗情况")
public R<String> energyList(@Validated({Default.class}) @RequestBody ElectricQueryParam electricQueryParam){ 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(); Integer kilnType = kilnInfo.getType();
//传入任务号，窑炉号，查询消耗数据，返回json字符串 //传入任务号，窑炉号，查询消耗数据，返回json字符串
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();

2
6.program/wms-empty/src/main/java/com/mt/wms/empty/params/ElectricQueryParam.java
View File

@ -22,7 +22,7 @@ public class ElectricQueryParam extends BaseParam {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "窑炉id", required = true) @ApiModelProperty(value = "窑炉id", required = false)
private Long kilnId; private Long kilnId;
@ApiModelProperty(value = "任务id", required = true) @ApiModelProperty(value = "任务id", required = true)

2
6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OutStockServiceImpl.java
View File

@ -71,7 +71,7 @@ public class OutStockServiceImpl extends BaseService implements OutStockService
setCommonField(runTask); setCommonField(runTask);
runTaskServiceBiz.save(runTask); runTaskServiceBiz.save(runTask);
//异步调用车辆 //异步调用车辆
asynRunTaskService.asynRunOutStock(runTask.getId(),locationId); asynRunTaskService.asynRunOutStock(locationId);
//修改库位状态 //修改库位状态
InStockInfo inStockInfo = inStockInfoServiceBiz InStockInfo inStockInfo = inStockInfoServiceBiz
.getOne(new QueryWrapper<InStockInfo>().eq("Location_id", locationId)); .getOne(new QueryWrapper<InStockInfo>().eq("Location_id", locationId));