增加电子标签判断条件
This commit is contained in:
@@ -510,19 +510,20 @@ public class PdaServiceImp implements PdaService {
|
|||||||
private void deleteTagTask(TrayCodeMakeSure trayCodeMakeSure, BasWarehouse basWarehouse, MydoJob mydoJob) {
|
private void deleteTagTask(TrayCodeMakeSure trayCodeMakeSure, BasWarehouse basWarehouse, MydoJob mydoJob) {
|
||||||
if ("2".equals(basWarehouse.getWarehouseType()) && "23".equals(mydoJob.getInOrOut())) {
|
if ("2".equals(basWarehouse.getWarehouseType()) && "23".equals(mydoJob.getInOrOut())) {
|
||||||
BasTag basTag = basTagService.selectBasTagByTrayCode(trayCodeMakeSure.getTrayCode());
|
BasTag basTag = basTagService.selectBasTagByTrayCode(trayCodeMakeSure.getTrayCode());
|
||||||
basTag.setTrayCode("");
|
if (ObjUtil.isNotNull(basTag)){
|
||||||
basTag.setSendCompleted("0");
|
basTag.setTrayCode("");
|
||||||
basTagService.updateBasTag(basTag);
|
basTag.setSendCompleted("0");
|
||||||
//删除电子标签
|
basTagService.updateBasTag(basTag);
|
||||||
TagTask param = new TagTask();
|
//删除电子标签
|
||||||
param.setTagId(basTag.getId());
|
TagTask param = new TagTask();
|
||||||
List<TagTask> tagTasks = tagTaskService.selectTagTaskList(param);
|
param.setTagId(basTag.getId());
|
||||||
if (CollUtil.isNotEmpty(tagTasks)) {
|
List<TagTask> tagTasks = tagTaskService.selectTagTaskList(param);
|
||||||
tagTaskService.deleteTagTaskByIds(tagTasks.stream()
|
if (CollUtil.isNotEmpty(tagTasks)) {
|
||||||
.map(TagTask::getId)
|
tagTaskService.deleteTagTaskByIds(tagTasks.stream()
|
||||||
.toArray(Long[]::new));
|
.map(TagTask::getId)
|
||||||
|
.toArray(Long[]::new));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user