diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index 9eb1c65..1ff8a8f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -236,7 +236,7 @@ public class MydoJobServiceImpl implements IMydoJobService { Optional first = outExceptionRecords.stream().filter(x -> x.getTrayCode().equals(job.getTrayCode()) && x.getProductId().equals(mydoJobDetail.getProductId())).findFirst(); if (first.isPresent()){ //生成异常库存 - BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, job, "2"); + BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, job, "3"); list.add(stockByInStockinDetail); //修改异常记录中的库存id OutExceptionRecord outExceptionRecord = first.get(); @@ -248,9 +248,12 @@ public class MydoJobServiceImpl implements IMydoJobService { } } //删除异常库存记录 - Long[] outExceptionIds = (Long[]) outExceptionRecords.stream().map(OutExceptionRecord::getOutGuid).toArray(); - if (outExceptionIds.length>0){ - outExceptionRecordService.deleteOutExceptionRecordByOutGuids(outExceptionIds); + List collect = outExceptionRecords.stream().map(OutExceptionRecord::getOutGuid).collect(Collectors.toList()); + if (CollUtil.isNotEmpty( collect)){ + for (Long id : collect) { + outExceptionRecordService.deleteOutExceptionRecordByOutGuid(id); + } + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index 7f65253..11bea9b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -28,6 +28,8 @@ import com.ruoyi.pda.domain.TrayCodeMsg; import com.ruoyi.pda.mapper.PdaMapper; import com.ruoyi.pda.trayMsg.domain.TrayMsg; import com.ruoyi.pda.trayMsg.service.ITrayMsgService; +import com.ruoyi.stock.stock.domain.BasStock; +import com.ruoyi.stock.stock.service.IBasStockService; import com.ruoyi.system.service.ISysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -67,6 +69,8 @@ public class PdaServiceImp implements PdaService { private IOutStockoutService outStockoutService; @Autowired private IOutStockoutDetailService outStockoutDetailService; + @Autowired + private IBasStockService basStockService; /** * 空托盘入库 @@ -396,6 +400,12 @@ public class PdaServiceImp implements PdaService { outStockoutDetail.setAllotQuantity(pickQuantity); stockOutId = outStockoutDetail.getStockoutId(); outStockoutDetailService.updateOutStockoutDetail(outStockoutDetail); + + //修改库存的实际出库数量 + BasStock basStock = basStockService.selectBasStockByStockId(mydoJobDetail.getStockId()); + basStock.setOutQuantity(String.valueOf(pickQuantity)); + basStockService.updateBasStock(basStock); + } //生成回流任务,标记productStatus为异常状态 HashMap map = new HashMap<>(); diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml index 39ab822..ba5547a 100644 --- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml @@ -76,8 +76,9 @@ )}