From ff41e067166651d0748704e96906f42cc0b34087 Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Wed, 23 Oct 2024 18:36:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=201.=20=E4=BF=AE=E6=94=B9=E5=8F=AB=E6=96=99=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/wms/controller/MonitorController.java | 7 ++----- .../WmsTaskServiceImplements.java | 12 +++++++++--- .../serviceImplements/WorkServiceImplements.java | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/wms/controller/MonitorController.java b/src/main/java/com/wms/controller/MonitorController.java index 13a1f07..a4fd9b9 100644 --- a/src/main/java/com/wms/controller/MonitorController.java +++ b/src/main/java/com/wms/controller/MonitorController.java @@ -15,15 +15,12 @@ import com.wms.service.WorkFlowService; import com.wms.service.WorkSummaryService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -166,7 +163,7 @@ public class MonitorController { List allWorkFlows = workFlowService.list(); List stands = standService.list(new LambdaQueryWrapper() .eq(Stand::getStandType, 2) - .orderByAsc(Stand::getStandId)); + .orderByDesc(Stand::getStandId)); for (Stand workStation : stands) { // 查询到当前的工作量 List currentStationWorkFlowList = allWorkFlows.stream().filter(workFlow -> Objects.equals(workFlow.getWorkStation(), workStation.getStandId())).toList(); @@ -177,7 +174,7 @@ public class MonitorController { } } total.add(currentStationWorkFlowList.size()); - complete.add(finishingRows); + complete.add(finishingRows/currentStationWorkFlowList.size()); } } catch (Exception e) { total = Collections.emptyList(); diff --git a/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java index 1fd89cc..b297a25 100644 --- a/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java +++ b/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java @@ -370,6 +370,13 @@ public class WmsTaskServiceImplements implements IWmsTaskService { public BigDecimal callStocks(String goodsId, BigDecimal needNum, String workStation) { BigDecimal originNum = needNum;// 原始数量 try { + // 判断当前这个料是否已经有outsideVehicles + List outsideVehiclesList = outsideVehiclesService.list(new LambdaQueryWrapper() + .eq(OutsideVehicles::getGoodsId, goodsId) + .ne(OutsideVehicles::getOutStatus, 2)); + if (!outsideVehiclesList.isEmpty()) { + return needNum; + } // 查询库存，判断数量是否充足 List stockList = stockService.list(new LambdaQueryWrapper() .eq(Stock::getStockStatus, StockStatus.OK.getCode()) @@ -390,8 +397,6 @@ public class WmsTaskServiceImplements implements IWmsTaskService { StockDetailInfo goodsRelated = tempStock.getGoodsRelated(); goodsRelated.setRemainNum(goodsRelated.getRemainNum().subtract(needNum)); tempStock.setGoodsRelated(goodsRelated); - waitForOutStockList.add(tempStock); - break; } else { // 当前箱子物料剩余数量少于需求数量 needNum = needNum.subtract(tempStock.getGoodsRelated().getRemainNum()); @@ -399,8 +404,9 @@ public class WmsTaskServiceImplements implements IWmsTaskService { StockDetailInfo goodsRelated = tempStock.getGoodsRelated(); goodsRelated.setRemainNum(BigDecimal.ZERO); tempStock.setGoodsRelated(goodsRelated); - waitForOutStockList.add(tempStock); } + waitForOutStockList.add(tempStock); + break; } createVehicleOutTaskAndPickTask(waitForOutStockList, workStation); } diff --git a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java index 722743f..c90d647 100644 --- a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java +++ b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java @@ -53,6 +53,11 @@ public class WorkServiceImplements implements IWorkService { private final List workDoingStations = new ArrayList<>();// 当前正在执行任务的站台 private final List workFinishingStations = new ArrayList<>();// 当前正在完成任务的站台 +// /** +// * 新版创建工作 +// * @param workStation 工作站台 +// * @throws Exception 异常 +// */ // @Override // @Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED) // public void createWork(String workStation) throws Exception { @@ -294,6 +299,11 @@ public class WorkServiceImplements implements IWorkService { } } +// /** +// * 新版开始工作 +// * @param workStation 工作站台 +// * @throws Exception 异常 +// */ // @Override // @Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED) // public void doWork(String workStation) throws Exception { @@ -572,6 +582,12 @@ public class WorkServiceImplements implements IWorkService { } } +// /** +// * 新版完成工作 +// * @param workStation 工作站台 +// * @return 结果 +// * @throws Exception 异常 +// */ // @Override // public String finishWork(String workStation) throws Exception { // if (workFinishingStations.contains(workStation)) {