lsy/FT577-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

手动出库按托盘移除库存改成按货位移除库存

Browse Source
This commit is contained in:
FT577-Server
2026-10-14 09:45:24 +08:00
parent a4331cc303
commit 6b9d9300fd
11 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java
View File

@@ -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());

4
ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/impl/BasCargoSpaceServiceImpl.java
View File

@@ -107,10 +107,10 @@ public class BasCargoSpaceServiceImpl implements IBasCargoSpaceService
).size();
if (cargoAvailable + restCargo > cargoFull){
return true;
return false;
}
return false;
return true;
}

10
ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockInfoMapper.java
View File

@@ -74,6 +74,16 @@ public interface BasStockInfoMapper
*/
public int deleteBasStockInfoByTrayCode(String trayCode);
/**
* 删除库存信息
*
* @param cargoSpaceId 货位
* @return 结果
*/
public int deleteBasStockInfoByCargoSpaceId(String cargoSpaceId);
/**
* 批量删除库存信息
*

9
ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockMapper.java
View File

@@ -107,6 +107,15 @@ public interface BasStockMapper
public int deleteBasStockByTrayCode(String trayCode);
/**
* 删除库存信息
*
* @param cargoSpaceId 货位
* @return 结果
*/
public int deleteBasStockByCargoSpaceId(String cargoSpaceId);
/**
* 批量删除库存信息
*

8
ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/IBasStockInfoService.java
View File

@@ -78,4 +78,12 @@ public interface IBasStockInfoService
*/
public int deleteBasStockInfoByTrayCode(String trayCode);
/**
* 删除库存信息
*
* @param cargoSpaceId 货位
* @return 结果
*/
public int deleteBasStockInfoByCargoSpaceId(String cargoSpaceId);
}

8
ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/IBasStockService.java
View File

@@ -97,6 +97,14 @@ public interface IBasStockService
*/
public int deleteBasStockByTrayCode(String trayCode);
/**
* 删除库存信息信息
*
* @param cargoSpaceId 货位信息
* @return 结果
*/
public int deleteBasStockByCargoSpaceId(String cargoSpaceId);
/**
* 批量删除库存信息
*

5
ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockInfoServiceImpl.java
View File

@@ -143,4 +143,9 @@ public class BasStockInfoServiceImpl implements IBasStockInfoService
}
@Override
public int deleteBasStockInfoByCargoSpaceId(String cargoSpaceId){
return basStockInfoMapper.deleteBasStockInfoByCargoSpaceId(cargoSpaceId);
}
}

13
ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImpl.java
View File

@@ -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){

7
ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java
View File

@@ -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){

4
ruoyi-admin/src/main/resources/mapper/bas/BasStockInfoMapper.xml
View File

@@ -104,6 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from bas_stock where tray_code = #{trayCode}
</delete>
<delete id="deleteBasStockInfoByCargoSpaceId" parameterType="String">
delete from bas_stock where cargo_space_id = #{cargoSpaceId}
</delete>
<delete id="deleteBasStockInfoByStockIds" parameterType="String">
delete from bas_stock where stock_id in
<foreach item="stockId" collection="array" open="(" separator="," close=")">

4
ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml
View File

@@ -248,6 +248,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from bas_stock_detail where tray_code = #{trayCode}
</delete>
<delete id="deleteBasStockByCargoSpaceId" parameterType="String">
delete from bas_stock_detail where cargo_space_id = #{cargoSpaceId}
</delete>
<delete id="deleteBasStockByStockIds" parameterType="String">
delete from bas_stock_detail where stock_id in
<foreach item="stockId" collection="array" open="(" separator="," close=")">