purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化仓库删除的逻辑

Browse Source
This commit is contained in:
jishenghua
2024-12-01 18:10:59 +08:00
parent 3bcd544912
commit f2703d0b0a
1 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java
View File

@@ -61,15 +61,9 @@ public class DepotService {
public List<Depot> getDepotListByIds(String ids)throws Exception {
List<Long> idList = StringUtil.strToLongList(ids);
List<Depot> list = new ArrayList<>();
try{
DepotExample example = new DepotExample();
example.createCriteria().andIdIn(idList);
list = depotMapper.selectByExample(example);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
return depotMapper.selectByExample(example);
}
public List<Depot> getDepot()throws Exception {
@@ -188,18 +182,14 @@ public class DepotService {
int result=0;
String [] idArray=ids.split(",");
//校验单据子表 jsh_depot_item
List<DepotItem> depotItemList=null;
try{
depotItemList = depotItemMapperEx.getDepotItemListListByDepotIds(idArray);
}catch(Exception e){
JshException.readFail(logger, e);
}
List<DepotItem> depotItemList = depotItemMapperEx.getDepotItemListListByDepotIds(idArray);
if(depotItemList!=null&&depotItemList.size()>0){
logger.error("异常码[{}],异常提示[{}],参数,DepotIds[{}]",
ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,ExceptionConstants.DELETE_FORCE_CONFIRM_MSG,ids);
throw new BusinessRunTimeException(ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
}
try{
//记录日志
StringBuffer sb = new StringBuffer();
sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
@@ -207,18 +197,18 @@ public class DepotService {
for(Depot depot: list){
sb.append("[").append(depot.getName()).append("]");
}
logService.insertLog("仓库", sb.toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
User userInfo=userService.getCurrentUser();
//校验通过执行删除操作
try{
//删除仓库关联的商品的初始库存
materialInitialStockMapperEx.batchDeleteByDepots(idArray);
//删除仓库关联的商品的当前库存
materialCurrentStockMapperEx.batchDeleteByDepots(idArray);
//删除仓库
result = depotMapperEx.batchDeleteDepotByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
}catch(Exception e){
//记录日志
logService.insertLog("仓库", sb.toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
} catch (Exception e) {
JshException.writeFail(logger, e);
}
return result;