From 8643ca11d73e835d88bbddd07e17f1250b789e0d Mon Sep 17 00:00:00 2001 From: LGH <1746689524@qq.com> Date: Fri, 9 Sep 2022 23:17:34 +0800 Subject: [PATCH] =?UTF-8?q?update:=20currTask=E5=88=97=E8=A1=A8=E6=80=BB?= =?UTF-8?q?=E8=A7=88=E5=8F=8A=E6=93=8D=E4=BD=9C=E6=96=B9=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9-bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mt/wms/empty/service/impl/CurrTaskServiceImpl.java | 8 ++++++++ .../java/com/mt/wms/empty/task/AsynRunTaskService.java | 3 +++ 2 files changed, 11 insertions(+) diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java index 26ed88e..cf70fcc 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java @@ -215,6 +215,14 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService //currTaskDet List currTaskDetList = currTaskDetServiceBiz.list(new QueryWrapper().eq(CurrTaskDet.CURR_TASK_ID, currTask.getId())); currTaskInfoVo.setCurrTaskDetVoList(com.mt.wms.core.utils.BeanUtils.copyList(currTaskDetList,CurrTaskDetVo.class)); + for (CurrTaskDetVo currTaskDetVo:currTaskInfoVo.getCurrTaskDetVoList() + ) { + String idenCardNum = currTaskDetVo.getIdenCardNum(); + OrderInfo orderInfo = orderInfoServiceBiz.getOne(new QueryWrapper().eq(OrderInfo.IDEN_CARD_NUM, idenCardNum)); + currTaskDetVo.setCustomer(orderInfo.getCustomerName()); + currTaskDetVo.setCraftIll(orderInfo.getCraftIll()); + currTaskDetVo.setProductModel(orderInfo.getProductModel()); + } list.add(currTaskInfoVo); } list = list.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(CurrTaskInfoVo :: getAutoExeTaskId))), ArrayList::new)); diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java index 9fe913d..af2369b 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java @@ -324,6 +324,9 @@ public class AsynRunTaskService extends BaseService { runTaskServiceBiz.updateById(runTask); //更新currTask表 currTask.setCacheSatatus(2); + currTask.setIsCache(1); + currTask.setLocationId(location.getId()); + currTask.setLocationName(location.getLocationName()); currTask.setUpdateTime(LocalDateTime.now()); currTaskServiceBiz.updateById(currTask); //更新in_stock_info表