mt-ck/mt-qj-wms-hd
7
0
複製 0
程式碼 問題管理 合併請求 版本發佈 Wiki Activity

update:

瀏覽代碼 
bug修改
This commit is contained in:
lgh 2022-08-04 11:29:21 +08:00
父節點 7812f248a2
當前提交 1dd028a202
共有 3 個文件被更改，包括 12 次插入 和 4 次删除
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/EnergyController.java
查看文件

@ -89,7 +89,8 @@ public class EnergyController extends BaseController {
@PostMapping(value = "energyList")
@ApiOperation(value = "根据加工炉id获取能源消耗情况")
public R<String> energyList(@Validated({Default.class}) @RequestBody ElectricQueryParam electricQueryParam){
TaskHis currTask = taskHisServiceBiz.getById(electricQueryParam.getTaskId());
//TaskHis currTask = taskHisServiceBiz.getById(electricQueryParam.getTaskId());
TaskHis currTask = taskHisServiceBiz.getOne(new QueryWrapper<TaskHis>().eq(TaskHis.TASK_ID, electricQueryParam.getTaskId()));
Long kilnId = currTask.getKilnId();
KilnInfo kilnInfo = kilnInfoServiceBiz.getById(kilnId);
Integer kilnType = kilnInfo.getType();

2
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
查看文件

@ -149,7 +149,7 @@ public class AsynRunTaskService extends BaseService {
if (threeSetp>0){
//当前任务为自动任务里的第三步，先上报第二步的apms处理endProcess
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.TH_TASK_ID, currTaskId));
CurrTask secondCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId());
CurrTask secondCurrTask = currTaskServiceBiz.getById(autoExeTask.getTTaskId());
secondCurrTask.setIsIn(2);
secondCurrTask.setStatus(2);
currTaskServiceBiz.updateById(secondCurrTask);

11
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
查看文件

@ -543,9 +543,16 @@ public class ScheduledTask extends BaseService {
//因为readyIn在多用炉第一托盘下油后一直存在,到出炉为止.所以查询当前炉子在加工的任务,大于一条,则不再根据readyIn发起任务
List<CurrTask> currTaskList = currTaskServiceBiz.list(new QueryWrapper<CurrTask>()
.eq(CurrTask.KILN_ID, kilnInfo.getId()).eq(CurrTask.IS_IN, 1).eq(CurrTask.STATUS,1));
if (currTaskList.size()>1){
continue;
if (kilnInfo.getType()==1){
if (currTaskList.size()>1){
continue;
}
}else {
if (currTaskList.size()>0){
continue;
}
}
//缓存区是否有目标位置为工业炉的待加工任务
List<InStockInfo> inStockInfoList = inStockInfoServiceBiz.list(new QueryWrapper<InStockInfo>()
.eq(InStockInfo.TYPE, 1)