【front】新增# 1.新增检修员配件领用我的仓库记录
parent
f68344087c
commit
e2580f5b87
|
@ -548,9 +548,12 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
|
||||||
maintenanceOrder.setIsConfirmReceipt(MaintenanceOrderStatusEnum.CONFIRM_RECEIPT.getStatus());
|
maintenanceOrder.setIsConfirmReceipt(MaintenanceOrderStatusEnum.CONFIRM_RECEIPT.getStatus());
|
||||||
maintenanceOrder.setIsMaintain(MaintenanceOrderStatusEnum.MAINTAIN.getStatus());
|
maintenanceOrder.setIsMaintain(MaintenanceOrderStatusEnum.MAINTAIN.getStatus());
|
||||||
maintenanceOrderMapper.updateById(maintenanceOrder);
|
maintenanceOrderMapper.updateById(maintenanceOrder);
|
||||||
}else{
|
|
||||||
User user = userMapper.selectById(FrontThreadLocal.getUserId());
|
|
||||||
|
|
||||||
|
//我的仓库也要新增配件领用记录 并且状态是已完成
|
||||||
|
SparePartStockAudit sparePartStockAudit = getSparePartStockAudit(maintenanceOrderParam);
|
||||||
|
sparePartStockAudit.setPurchaseStatus(AuditStateEnum.DONE.getStatus());
|
||||||
|
sparePartStockAuditMapper.insert(sparePartStockAudit);
|
||||||
|
}else{
|
||||||
SparePartStockAudit resultSps = sparePartStockAuditMapper.findSparePartStockAuditByOrderId(maintenanceOrder.getId());
|
SparePartStockAudit resultSps = sparePartStockAuditMapper.findSparePartStockAuditByOrderId(maintenanceOrder.getId());
|
||||||
if(resultSps != null){
|
if(resultSps != null){
|
||||||
//已有领取记录但被拒绝则重新审核
|
//已有领取记录但被拒绝则重新审核
|
||||||
|
@ -558,6 +561,21 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
|
||||||
resultSps.setCreateTime(new Date());
|
resultSps.setCreateTime(new Date());
|
||||||
sparePartStockAuditMapper.updateById(resultSps);
|
sparePartStockAuditMapper.updateById(resultSps);
|
||||||
}else{
|
}else{
|
||||||
|
//没领过配件则创建新的领用单
|
||||||
|
SparePartStockAudit sparePartStockAudit = getSparePartStockAudit(maintenanceOrderParam);
|
||||||
|
sparePartStockAudit.setPurchaseStatus(AuditStateEnum.UNREVIEWED.getStatus());
|
||||||
|
sparePartStockAuditMapper.insert(sparePartStockAudit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增配件领用记录
|
||||||
|
* @param maintenanceOrderParam 参数
|
||||||
|
* @return SparePartStockAudit
|
||||||
|
*/
|
||||||
|
private SparePartStockAudit getSparePartStockAudit(MaintenanceOrderParam maintenanceOrderParam) {
|
||||||
|
User user = userMapper.selectById(FrontThreadLocal.getUserId());
|
||||||
//没领过配件则创建新的领用单
|
//没领过配件则创建新的领用单
|
||||||
SparePartStockAudit lastSparePartStockAudit = sparePartStockAuditMapper.findLastSparePartStockAuditByTime(TimeUtil.getCurrentTimeYYYYMMDD());
|
SparePartStockAudit lastSparePartStockAudit = sparePartStockAuditMapper.findLastSparePartStockAuditByTime(TimeUtil.getCurrentTimeYYYYMMDD());
|
||||||
SparePartStockAudit sparePartStockAudit = new SparePartStockAudit();
|
SparePartStockAudit sparePartStockAudit = new SparePartStockAudit();
|
||||||
|
@ -569,7 +587,7 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
|
||||||
sparePartStockAudit.setConsignee(user.getUsername());
|
sparePartStockAudit.setConsignee(user.getUsername());
|
||||||
sparePartStockAudit.setPhone(user.getMobile());
|
sparePartStockAudit.setPhone(user.getMobile());
|
||||||
sparePartStockAudit.setCreatorId(FrontThreadLocal.getUserId());
|
sparePartStockAudit.setCreatorId(FrontThreadLocal.getUserId());
|
||||||
sparePartStockAudit.setPurchaseStatus(AuditStateEnum.UNREVIEWED.getStatus());
|
|
||||||
//获取检修员选择地址
|
//获取检修员选择地址
|
||||||
if(maintenanceOrderParam.getAddressId() != null){
|
if(maintenanceOrderParam.getAddressId() != null){
|
||||||
UserAddress userAddress = userAddressMapper.findUserAddressById(maintenanceOrderParam.getAddressId());
|
UserAddress userAddress = userAddressMapper.findUserAddressById(maintenanceOrderParam.getAddressId());
|
||||||
|
@ -581,9 +599,7 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
|
||||||
}
|
}
|
||||||
sparePartStockAudit.setDeliveryMethod(maintenanceOrderParam.getDeliveryMethod());
|
sparePartStockAudit.setDeliveryMethod(maintenanceOrderParam.getDeliveryMethod());
|
||||||
sparePartStockAudit.setRemark(maintenanceOrderParam.getRemark());
|
sparePartStockAudit.setRemark(maintenanceOrderParam.getRemark());
|
||||||
sparePartStockAuditMapper.insert(sparePartStockAudit);
|
return sparePartStockAudit;
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue