diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java index 65fcf31..d15fb45 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java @@ -259,6 +259,17 @@ public class ApiWcsService implements IApiWcsService { return AjaxResult.error("未找到该托盘的绑定信息，请确认是否有绑定操作"); } + BasCargoSpace cargo = basCargoSpaceService.selectBasCargoSpaceByTrayCode(wcsStockinReiceive.getTrayCode()); + if (ObjUtil.isNotNull(cargo)) { + log.warn("【入库请求】已经存在该条码的<货位>，无法执行入库，请检查当前货位的货位信息是否正确，托盘条码:{}，托盘位置：{}", wcsStockinReiceive.getTrayCode(), cargo.getCargoSpaceId()); + return AjaxResult.error("已经存在该条码的<货位>，无法执行入库，请检查当前货位的货位信息是否正确"); + } + + BasStockInfo stockInfo = basStockInfoService.selectBasStockInfoByTrayCode(wcsStockinReiceive.getTrayCode()); + if (ObjUtil.isNotNull(stockInfo)) { + log.warn("【入库请求】已经存在该条码的<库存>，无法执行入库，请检查当前货位的库存信息是否正确，托盘条码:{}，托盘位置：{}", wcsStockinReiceive.getTrayCode(), stockInfo.getCargoSpaceId()); + return AjaxResult.error("已经存在该条码的<库存>，无法执行入库，请检查当前货位的库存信息是否正确"); + } //检查当前条码是否已经生成作业 MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(wcsStockinReiceive.getTrayCode()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/impl/BasCargoSpaceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/impl/BasCargoSpaceServiceImpl.java index b06adb9..943fd6a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/impl/BasCargoSpaceServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/impl/BasCargoSpaceServiceImpl.java @@ -107,10 +107,10 @@ public class BasCargoSpaceServiceImpl implements IBasCargoSpaceService ).size(); if (cargoAvailable + restCargo > cargoFull){ - return true; + return false; } - return false; + return true; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockInfoMapper.java index 07251d0..8120813 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockInfoMapper.java @@ -74,6 +74,16 @@ public interface BasStockInfoMapper */ public int deleteBasStockInfoByTrayCode(String trayCode); + + /** + * 删除库存信息 + * + * @param cargoSpaceId 货位 + * @return 结果 + */ + public int deleteBasStockInfoByCargoSpaceId(String cargoSpaceId); + + /** * 批量删除库存信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockMapper.java index 27531f6..603b456 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockMapper.java @@ -107,6 +107,15 @@ public interface BasStockMapper public int deleteBasStockByTrayCode(String trayCode); + /** + * 删除库存信息 + * + * @param cargoSpaceId 货位 + * @return 结果 + */ + public int deleteBasStockByCargoSpaceId(String cargoSpaceId); + + /** * 批量删除库存信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/IBasStockInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/IBasStockInfoService.java index 426ae4e..00dc73d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/IBasStockInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/IBasStockInfoService.java @@ -78,4 +78,12 @@ public interface IBasStockInfoService */ public int deleteBasStockInfoByTrayCode(String trayCode); + /** + * 删除库存信息 + * + * @param cargoSpaceId 货位 + * @return 结果 + */ + public int deleteBasStockInfoByCargoSpaceId(String cargoSpaceId); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/IBasStockService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/IBasStockService.java index 837b14e..3681b52 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/IBasStockService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/IBasStockService.java @@ -97,6 +97,14 @@ public interface IBasStockService */ public int deleteBasStockByTrayCode(String trayCode); + /** + * 删除库存信息信息 + * + * @param cargoSpaceId 货位信息 + * @return 结果 + */ + public int deleteBasStockByCargoSpaceId(String cargoSpaceId); + /** * 批量删除库存信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockInfoServiceImpl.java index c469226..6c3acae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockInfoServiceImpl.java @@ -143,4 +143,9 @@ public class BasStockInfoServiceImpl implements IBasStockInfoService } + @Override + public int deleteBasStockInfoByCargoSpaceId(String cargoSpaceId){ + return basStockInfoMapper.deleteBasStockInfoByCargoSpaceId(cargoSpaceId); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImpl.java index ecbe8f8..4617e2c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImpl.java @@ -198,6 +198,19 @@ public class BasStockServiceImpl implements IBasStockService return basStockMapper.deleteBasStockByTrayCode(trayCode); } + + /** + * 删除库存信息信息 + * + * @param cargoSpaceId 货位信息 + * @return 结果 + */ + @Override + public int deleteBasStockByCargoSpaceId(String cargoSpaceId){ + return basStockMapper.deleteBasStockByCargoSpaceId(cargoSpaceId); + } + + @Override public int getQuantityByTrayCode(String trayCode){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java index 8dc250c..ae6e908 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java @@ -573,8 +573,11 @@ public class MydoJobServiceImpl implements IMydoJobService // } //--------------------处理库存信息-------------------- - basStockService.deleteBasStockByTrayCode(mydoJob.getTrayCode()); - basStockInfoService.deleteBasStockInfoByTrayCode(mydoJob.getTrayCode()); +// basStockService.deleteBasStockByTrayCode(mydoJob.getTrayCode()); +// basStockInfoService.deleteBasStockInfoByTrayCode(mydoJob.getTrayCode()); + + basStockService.deleteBasStockByCargoSpaceId(mydoJob.getCargoSpaceId()); + basStockInfoService.deleteBasStockInfoByCargoSpaceId(mydoJob.getCargoSpaceId()); log.info("【账务处理-手动出库】移除托盘和版辊库存，作业号:{}，货位编号:{}，托盘号:{}", jobId, mydoJob.getCargoSpaceId(), mydoJob.getTrayCode()); //移除指定辊号的库存信息 // for (MydoJobDetail detail : details){ diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasStockInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasStockInfoMapper.xml index db523de..797a00c 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasStockInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasStockInfoMapper.xml @@ -104,6 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from bas_stock where tray_code = #{trayCode} + + delete from bas_stock where cargo_space_id = #{cargoSpaceId} + + delete from bas_stock where stock_id in diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml index b9d6c4e..43c9cfb 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml @@ -248,6 +248,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from bas_stock_detail where tray_code = #{trayCode} + + delete from bas_stock_detail where cargo_space_id = #{cargoSpaceId} + + delete from bas_stock_detail where stock_id in