Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2024-10-22 20:50:13 +08:00
commit d3943e21a4
1 changed files with 24 additions and 0 deletions

View File

@ -1,5 +1,6 @@
package com.bonus.sgzb.material.service.impl;
import com.bonus.sgzb.app.mapper.PurchaseInputMapper;
import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.core.utils.StringUtils;
@ -8,6 +9,7 @@ import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.config.ExceptionEnum;
import com.bonus.sgzb.material.config.FieldGenerator;
import com.bonus.sgzb.base.api.domain.MachIneDto;
import com.bonus.sgzb.app.domain.InputApplyDetails;
import com.bonus.sgzb.material.domain.PutInStorageBean;
import com.bonus.sgzb.base.api.domain.SavePutInfoDto;
import com.bonus.sgzb.material.mapper.InventoryAndWarehousingMapper;
@ -36,6 +38,9 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
@Autowired
private InventoryAndWarehousingMapper inventoryAndWarehousingMapper;
@Autowired
private PurchaseInputMapper purchaseInputMapper;
/**
* 查询入库盘点列表
* @param bean
@ -132,6 +137,25 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
throw new RuntimeException("insertPutInfo方法插入异常");
}
}
// 盘点入库任务详细表
if (CollectionUtils.isNotEmpty(machIneDtoList)) {
for (MachIneDto machIneDto : machIneDtoList) {
InputApplyDetails applyDetails = new InputApplyDetails();
applyDetails.setTaskId(0L);
applyDetails.setTypeId(Long.parseLong(machIneDto.getTypeId()));
if (StringUtils.isEmpty(machIneDto.getMaCode())) {
applyDetails.setInputNum(machIneDto.getPutInStoreNum() == null ? 0 : machIneDto.getPutInStoreNum());
} else {
applyDetails.setInputNum(1);
}
applyDetails.setMaId(machIneDto.getMaId());
applyDetails.setInputType("4");
applyDetails.setCreateTime(new Date());
applyDetails.setCreateBy(SecurityUtils.getUsername());
purchaseInputMapper.insertInputApplyDetails(applyDetails);
}
}
} catch (Exception e) {
log.error("保存入库盘点异常:{}",e.getMessage());
// 添加事务回滚逻辑保证入库全部成功或者全部失败