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

Compare commits

base: mt-ck:cb0be1cbbf9c5181871f07fc900faa1a38213fc0
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs
..
compare: mt-ck:18590dafb9de60d9247b2055606346f85403f73d
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs

No commits in common. "cb0be1cbbf9c5181871f07fc900faa1a38213fc0" and "18590dafb9de60d9247b2055606346f85403f73d" have entirely different histories.
cb0be1cbbf ... 18590dafb9

1 changed files with 6 additions and 11 deletions
Show Stats Expand all files Collapse all files

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

@ -151,8 +151,6 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
currTaskInfoVo.setStatus(currTask.getStatus()); currTaskInfoVo.setStatus(currTask.getStatus());
}else if (currTask.getIsCache()==1){ }else if (currTask.getIsCache()==1){
currTaskInfoVo.setStatus(2); currTaskInfoVo.setStatus(2);
}else {
currTaskInfoVo.setStatus(0);
} }
//生产单号 //生产单号
if (currTask.getSheetNo()!=null){ if (currTask.getSheetNo()!=null){
@ -173,6 +171,12 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
String nowStep="未开始"; String nowStep="未开始";
for (CurrTask currTask1:currTasks for (CurrTask currTask1:currTasks
) { ) {
if (currTask1.getStatus()==1){
nowStep=currTask1.getTargetPosition();
}else if (currTask1.getIsCache()==1){
nowStep=currTask.getLocationName();
}
allStep=allStep.concat("->").concat(currTask1.getTargetPosition());
InStockInfo inStockInfo = inStockInfoServiceBiz.getOne(new QueryWrapper<InStockInfo>().eq(InStockInfo.TASK_ID, currTask1.getId())); InStockInfo inStockInfo = inStockInfoServiceBiz.getOne(new QueryWrapper<InStockInfo>().eq(InStockInfo.TASK_ID, currTask1.getId()));
if (inStockInfo!=null){ if (inStockInfo!=null){
List<InStockInfoVo> inStockInfoVoList=new ArrayList<>(); List<InStockInfoVo> inStockInfoVoList=new ArrayList<>();
@ -181,15 +185,6 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
inStockInfoVoList.add(inStockInfoVo); inStockInfoVoList.add(inStockInfoVo);
currTaskInfoVo.setInStockInfoVoList(inStockInfoVoList); currTaskInfoVo.setInStockInfoVoList(inStockInfoVoList);
} }
if (currTask1.getStatus()==1){
nowStep=currTask1.getTargetPosition();
}else if (currTask1.getIsCache()==1){
nowStep=currTask.getLocationName();
}
if (currTaskInfoVo.getInStockInfoVoList().size()>0){
nowStep=currTaskInfoVo.getInStockInfoVoList().get(0).getLocationName();
}
allStep=allStep.concat("->").concat(currTask1.getTargetPosition());
} }
// //
currTaskInfoVo.setAllStep(allStep); currTaskInfoVo.setAllStep(allStep);