| | |
| | | } |
| | | BeanUtils.copyProperties(comActWarehouseDonatesDTO, comActWarehouseDonates); |
| | | Date nowDate = new Date(); |
| | | if (nonNull(comActWarehouseDonatesDTO.getQuantity())) { |
| | | comActWarehouseDonates.setSurplusQuantity(comActWarehouseDonatesDTO.getQuantity()); |
| | | } |
| | | comActWarehouseDonates.setSigningAt(nowDate); |
| | | comActWarehouseDonates.setStatus(2); |
| | | int result = this.baseMapper.updateById(comActWarehouseDonates); |
| | |
| | | comActWarehouseOperation.setUserId(comActWarehouseDonates.getSigningBy().intValue()); |
| | | comActWarehouseOperation.setContent("工作人员完成了物品签收"); |
| | | comActWarehouseOperation.setCreateTime(nowDate); |
| | | comActWarehouseOperationDao.insert(comActWarehouseOperation); |
| | | comActWarehouseOperation.setType(ComActWarehouseOperation.type.bxs); |
| | | comActWarehouseOperationDao.insert(comActWarehouseOperation); |
| | | return R.ok(); |
| | | } |
| | | return R.fail("签收失败"); |