|
|
|
@ -62,32 +62,36 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
|
|
|
|
|
} else {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "条码重复!");
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
//查询养护记录信息
|
|
|
|
|
InvMaintenanceOrderEntity maOrder = invMaintenanceOrderDao.selectByOrderId(invMaintenanceOrderDetailEntity.getOrderIdFk());
|
|
|
|
|
//查询此产品库存详情是否存在
|
|
|
|
|
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
|
|
|
|
|
filterInvProductDetailRequest.setOriginCode(invMaintenanceOrderDetailEntity.getCode());
|
|
|
|
|
filterInvProductDetailRequest.setBatchNo(udi.getBatchNo());
|
|
|
|
|
filterInvProductDetailRequest.setInvWarehouseCode(maOrder.getInvWarehouseCode());
|
|
|
|
|
filterInvProductDetailRequest.setInvSpaceCode(maOrder.getInvSpaceCode());
|
|
|
|
|
filterInvProductDetailRequest.setProductionDate(udi.getProduceDate());
|
|
|
|
|
filterInvProductDetailRequest.setExpireDate(udi.getExpireDate());
|
|
|
|
|
List<InvProductDetailEntity> invProductDetailEntities = invProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
|
|
|
|
|
if (CollUtil.isNotEmpty(invProductDetailEntities)) {
|
|
|
|
|
log.info("库存中存在,添加到库存养护记录详情中");
|
|
|
|
|
//设置养护状态为未养护
|
|
|
|
|
invMaintenanceOrderDetailEntity.setMaintenanceStatus(0);
|
|
|
|
|
//设置设备养护状态为正常
|
|
|
|
|
invMaintenanceOrderDetailEntity.setDeviceStatus(1);
|
|
|
|
|
invMaintenanceOrderDetailEntity.setCount(1);
|
|
|
|
|
invMaintenanceOrderDetailEntity.setBatchNo(udi.getBatchNo());
|
|
|
|
|
invMaintenanceOrderDetailEntity.setProduceDate(udi.getProduceDate());
|
|
|
|
|
invMaintenanceOrderDetailEntity.setExpireDate(udi.getExpireDate());
|
|
|
|
|
invMaintenanceOrderDetailEntity.setNameCode(udi.getUdi());
|
|
|
|
|
invMaintenanceOrderDetailEntity.setProductId(invProductDetailEntities.get(0).getProductIdFk());
|
|
|
|
|
invMAOrderDetailDao.insert(invMaintenanceOrderDetailEntity);
|
|
|
|
|
} else {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "当前仓库中不存在此产品,无法进行养护!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//查询养护记录信息
|
|
|
|
|
InvMaintenanceOrderEntity maOrder = invMaintenanceOrderDao.selectByOrderId(invMaintenanceOrderDetailEntity.getOrderIdFk());
|
|
|
|
|
//查询此产品库存详情是否存在
|
|
|
|
|
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
|
|
|
|
|
filterInvProductDetailRequest.setOriginCode(invMaintenanceOrderDetailEntity.getCode());
|
|
|
|
|
filterInvProductDetailRequest.setBatchNo(udi.getBatchNo());
|
|
|
|
|
filterInvProductDetailRequest.setInvWarehouseCode(maOrder.getInvWarehouseCode());
|
|
|
|
|
filterInvProductDetailRequest.setInvSpaceCode(maOrder.getInvSpaceCode());
|
|
|
|
|
filterInvProductDetailRequest.setProductionDate(udi.getProduceDate());
|
|
|
|
|
filterInvProductDetailRequest.setExpireDate(udi.getExpireDate());
|
|
|
|
|
List<InvProductDetailEntity> invProductDetailEntities = invProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
|
|
|
|
|
if (CollUtil.isNotEmpty(invProductDetailEntities)) {
|
|
|
|
|
log.info("库存中存在,添加到库存养护记录详情中");
|
|
|
|
|
//设置养护状态为未养护
|
|
|
|
|
invMaintenanceOrderDetailEntity.setMaintenanceStatus(0);
|
|
|
|
|
//设置设备养护状态为正常
|
|
|
|
|
invMaintenanceOrderDetailEntity.setDeviceStatus(1);
|
|
|
|
|
invMaintenanceOrderDetailEntity.setCount(1);
|
|
|
|
|
invMaintenanceOrderDetailEntity.setBatchNo(udi.getBatchNo());
|
|
|
|
|
invMaintenanceOrderDetailEntity.setProduceDate(udi.getProduceDate());
|
|
|
|
|
invMaintenanceOrderDetailEntity.setExpireDate(udi.getExpireDate());
|
|
|
|
|
invMaintenanceOrderDetailEntity.setNameCode(udi.getUdi());
|
|
|
|
|
invMaintenanceOrderDetailEntity.setProductId(invProductDetailEntities.get(0).getProductIdFk());
|
|
|
|
|
invMAOrderDetailDao.insert(invMaintenanceOrderDetailEntity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ResultVOUtils.success("添加库存养护详情成功!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|