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

解决单据批量审核和删除的bug

Browse Source
This commit is contained in:
季圣华
2021-06-23 23:58:42 +08:00
parent 4ba05f4892
commit 6e27143f33
1 changed files with 59 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -233,44 +233,47 @@ public class DepotHeadService {
try{ try{
//查询单据主表信息 //查询单据主表信息
DepotHead depotHead =getDepotHead(id); DepotHead depotHead =getDepotHead(id);
User userInfo=userService.getCurrentUser(); //只有未审核的单据才能被删除
//删除出库数据回收序列号 if("0".equals(depotHead.getStatus())) {
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType()) User userInfo = userService.getCurrentUser();
&&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())){ //删除出库数据回收序列号
//查询单据子表列表 if (BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
List<DepotItem> depotItemList=null; && !BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) {
try{ //查询单据子表列表
depotItemList = depotItemMapperEx.findDepotItemListBydepotheadId(id,BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED); List<DepotItem> depotItemList = null;
}catch(Exception e){ try {
JshException.readFail(logger, e); depotItemList = depotItemMapperEx.findDepotItemListBydepotheadId(id, BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED);
} } catch (Exception e) {
JshException.readFail(logger, e);
}
/**回收序列号*/ /**回收序列号*/
if(depotItemList!=null&&depotItemList.size()>0){ if (depotItemList != null && depotItemList.size() > 0) {
for(DepotItem depotItem:depotItemList){ for (DepotItem depotItem : depotItemList) {
//BasicNumber=OperNumber*ratio //BasicNumber=OperNumber*ratio
serialNumberService.cancelSerialNumber(depotItem.getMaterialId(), depotItem.getHeaderId(),(depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(),userInfo); serialNumberService.cancelSerialNumber(depotItem.getMaterialId(), depotItem.getHeaderId(), (depotItem.getBasicNumber() == null ? 0 : depotItem.getBasicNumber()).intValue(), userInfo);
}
} }
} }
} /**删除单据子表数据*/
/**删除单据子表数据*/ try {
try{ depotItemMapperEx.batchDeleteDepotItemByDepotHeadIds(new Long[]{id});
depotItemMapperEx.batchDeleteDepotItemByDepotHeadIds(new Long []{id}); //更新当前库存
//更新当前库存 List<DepotItem> list = depotItemService.getListByHeaderId(id);
List<DepotItem> list = depotItemService.getListByHeaderId(id); for (DepotItem depotItem : list) {
for(DepotItem depotItem: list){ Long tenantId = redisService.getTenantId(request);
Long tenantId = redisService.getTenantId(request); depotItemService.updateCurrentStock(depotItem, tenantId);
depotItemService.updateCurrentStock(depotItem,tenantId); }
} catch (Exception e) {
JshException.writeFail(logger, e);
} }
}catch(Exception e){ /**删除单据主表信息*/
JshException.writeFail(logger, e); batchDeleteDepotHeadByIds(id.toString());
logService.insertLog("单据",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(depotHead.getNumber()).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
result = 1;
} }
/**删除单据主表信息*/
batchDeleteDepotHeadByIds(id.toString());
logService.insertLog("单据",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(depotHead.getNumber()).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
result = 1;
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }
@@ -321,14 +324,31 @@ public class DepotHeadService {
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int batchSetStatus(String status, String depotHeadIDs)throws Exception { public int batchSetStatus(String status, String depotHeadIDs)throws Exception {
List<Long> ids = StringUtil.strToLongList(depotHeadIDs);
DepotHead depotHead = new DepotHead();
depotHead.setStatus(status);
DepotHeadExample example = new DepotHeadExample();
example.createCriteria().andIdIn(ids);
int result = 0; int result = 0;
try{ try{
result = depotHeadMapper.updateByExampleSelective(depotHead, example); List<Long> dhIds = new ArrayList<>();
List<Long> ids = StringUtil.strToLongList(depotHeadIDs);
for(Long id: ids) {
DepotHead depotHead = getDepotHead(id);
if("0".equals(status)){
if("1".equals(depotHead.getStatus())) {
dhIds.add(id);
}
} else if("1".equals(status)){
if("0".equals(depotHead.getStatus())) {
dhIds.add(id);
}
}
}
if(dhIds.size()>0) {
DepotHead depotHead = new DepotHead();
depotHead.setStatus(status);
DepotHeadExample example = new DepotHeadExample();
example.createCriteria().andIdIn(dhIds);
result = depotHeadMapper.updateByExampleSelective(depotHead, example);
} else {
return 1;
}
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }