|
@@ -138,9 +138,10 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
|
|
|
KxsMachineAdvanceInfo machineAdvanceInfo = kxsMachineAdvanceInfoMapper
|
|
KxsMachineAdvanceInfo machineAdvanceInfo = kxsMachineAdvanceInfoMapper
|
|
|
.selectOne(Wrappers.<KxsMachineAdvanceInfo>lambdaQuery()
|
|
.selectOne(Wrappers.<KxsMachineAdvanceInfo>lambdaQuery()
|
|
|
.eq(KxsMachineAdvanceInfo::getIsReturn, CommonConstants.FAIL)
|
|
.eq(KxsMachineAdvanceInfo::getIsReturn, CommonConstants.FAIL)
|
|
|
- .eq(KxsMachineAdvanceInfo::getIsConfirm, CommonConstants.FAIL)
|
|
|
|
|
|
|
+ .eq(KxsMachineAdvanceInfo::getIsApply, CommonConstants.FAIL)
|
|
|
.eq(KxsMachineAdvanceInfo::getPosSn, advance.getPosSn()));
|
|
.eq(KxsMachineAdvanceInfo::getPosSn, advance.getPosSn()));
|
|
|
Optional.ofNullable(machineAdvanceInfo).orElseThrow(() -> new GlobalCustomerException("该机具已被接收/已撤回"));
|
|
Optional.ofNullable(machineAdvanceInfo).orElseThrow(() -> new GlobalCustomerException("该机具已被接收/已撤回"));
|
|
|
|
|
+
|
|
|
machineAdvanceInfo.setIsReturn(CommonConstants.SUCCESS);
|
|
machineAdvanceInfo.setIsReturn(CommonConstants.SUCCESS);
|
|
|
machineAdvanceInfo.setReturnTime(LocalDateTime.now());
|
|
machineAdvanceInfo.setReturnTime(LocalDateTime.now());
|
|
|
kxsMachineAdvanceInfoMapper.updateById(machineAdvanceInfo);
|
|
kxsMachineAdvanceInfoMapper.updateById(machineAdvanceInfo);
|