From e62ee0fb93bdb95c462c963e88781ed940da648e Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 28 五月 2024 12:30:24 +0800 Subject: [PATCH] # 528 --- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java index a8b4a0e..3b94ad0 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -600,6 +600,14 @@ String locNo = wrkMast.getLocNo(); agvLocMastService.updateLocStsByLocNo(locNo,"O","",null); agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue()); + if (wrkMast.getIoType() == 1) { + List<AgvWaitPakin> agvWaitPakins = agvWaitPakinService.selectByContainerCode2(wrkMast.getBarcode()); + for (AgvWaitPakin agvWaitPakin : agvWaitPakins) { + if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSupp()))) { + throw new CoolException("鍏ュ簱閫氱煡妗e彇娑堝け璐�"); + } + } + } // 绉诲簱鍙栨秷 @@ -649,7 +657,12 @@ agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo)); } if (wrkMast.getIoType() == 109){ - agvLocMastService.updateLocStsByLocNo(devNo,"O","",(short)getContainerTypeByloc(devNo)); + if (Cools.isEmpty(wrkMast.getLocNo())) { + + } else { + agvLocMastService.updateLocStsByLocNo(devNo,"O","",(short)getContainerTypeByloc(devNo)); + } + }else { agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null); } -- Gitblit v1.9.1