bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码更新

This commit is contained in:
liang.chao 2024-01-22 21:11:27 +08:00
parent 8472f12a30
commit 268c5321e4
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -35,6 +35,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
/** /**
* 根据任务id查询出库数据 * 根据任务id查询出库数据
*
* @param parentId 任务id * @param parentId 任务id
* @return 出库数据集合 * @return 出库数据集合
*/ */
@ -45,6 +46,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
/** /**
* 领料出库处理 * 领料出库处理
*
* @param record 出库对象 * @param record 出库对象
* @return 结果 * @return 结果
*/ */
@ -55,9 +57,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
if (StringUtils.isNull(record)) { if (StringUtils.isNull(record)) {
return AjaxResult.error("领料出库失败,请检查参数是否填写完整!"); return AjaxResult.error("领料出库失败,请检查参数是否填写完整!");
} }
if (!(Integer.valueOf(0) == record.getMaId())){ if (!(Integer.valueOf(0) == record.getMaId() || record.getMaId() == null)) {
String status = leaseOutDetailsMapper.getMachineStatus(record); String status = leaseOutDetailsMapper.getMachineStatus(record);
if (!maStatus.equals(status)){ if (!maStatus.equals(status)) {
return AjaxResult.error("领料出库失败,该设备不是在库状态！"); return AjaxResult.error("领料出库失败,该设备不是在库状态！");
} }
} }
@ -80,23 +82,23 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
if (insertSelectiveNum > 0) { if (insertSelectiveNum > 0) {
if (updateMaTypeStockNum > 0) { if (updateMaTypeStockNum > 0) {
// if (updateMaMachineStatus > 0) { // if (updateMaMachineStatus > 0) {
// if (insertAgreementInfo > 0) { // if (insertAgreementInfo > 0) {
List<LeaseApplyDetails> leaseApplyDetailsList = leaseApplyDetailsMapper.getByParentId(record.getParentId()); List<LeaseApplyDetails> leaseApplyDetailsList = leaseApplyDetailsMapper.getByParentId(record.getParentId());
int i = 0; int i = 0;
for (LeaseApplyDetails bean : leaseApplyDetailsList){ for (LeaseApplyDetails bean : leaseApplyDetailsList) {
if (Objects.equals(bean.getPreNum(), bean.getAlNum())){ if (Objects.equals(bean.getPreNum(), bean.getAlNum())) {
i++; i++;
} }
} }
String taskId = leaseOutDetailsMapper.getTaskId(record.getParentId()); String taskId = leaseOutDetailsMapper.getTaskId(record.getParentId());
if (i == leaseApplyDetailsList.size()){ if (i == leaseApplyDetailsList.size()) {
leaseOutDetailsMapper.updateTaskStatus(taskId,35); leaseOutDetailsMapper.updateTaskStatus(taskId, 35);
}else { } else {
leaseOutDetailsMapper.updateTaskStatus(taskId,34); leaseOutDetailsMapper.updateTaskStatus(taskId, 34);
} }
return AjaxResult.success("领料出库成功!"); return AjaxResult.success("领料出库成功!");
// } // }
// return AjaxResult.error("领料出库失败,插入任务协议信息错误!"); // return AjaxResult.error("领料出库失败,插入任务协议信息错误!");
// } // }
// return AjaxResult.error("领料出库失败,最后更新设备状态错误!"); // return AjaxResult.error("领料出库失败,最后更新设备状态错误!");
} }