|
|
@ -61,17 +61,25 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
|
|
|
|
|
|
|
|
|
|
|
|
//查询养护说明
|
|
|
|
//查询养护说明
|
|
|
|
InvMAExplanationEntity invMAExplanationEntity = invMAExplanationDao.selectByStatus(1);
|
|
|
|
InvMAExplanationEntity invMAExplanationEntity = invMAExplanationDao.selectByStatus(1);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//查询养护记录信息
|
|
|
|
|
|
|
|
InvMAOrderEntity maOrder = invMAOrderDao.selectOne(new QueryWrapper<InvMAOrderEntity>().eq("orderId", invMAOrderDetailEntity.getOrderIdFk()));
|
|
|
|
|
|
|
|
|
|
|
|
if (null != maintenanceOrderDetailEntity) {
|
|
|
|
if (null != maintenanceOrderDetailEntity) {
|
|
|
|
if (StrUtil.isBlank(udi.getSerialNo()) || (StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo()))) {
|
|
|
|
if (StrUtil.isBlank(udi.getSerialNo()) || (StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo()))) {
|
|
|
|
|
|
|
|
//查询库存数量,判断盘点数量是否超出库存数量
|
|
|
|
|
|
|
|
InvProductEntity invProductEntity = invProductDao.selectProductInfo(maintenanceOrderDetailEntity.getRelId(), maintenanceOrderDetailEntity.getBatchNo(), null, maOrder.getInvCode(), maOrder.getInvSpaceCode());
|
|
|
|
maintenanceOrderDetailEntity.setCount(maintenanceOrderDetailEntity.getCount() + 1);
|
|
|
|
maintenanceOrderDetailEntity.setCount(maintenanceOrderDetailEntity.getCount() + 1);
|
|
|
|
|
|
|
|
if (null != invProductEntity && maintenanceOrderDetailEntity.getCount() > invProductEntity.getReCount()) {
|
|
|
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "超出库存结余数量!");
|
|
|
|
|
|
|
|
}
|
|
|
|
maintenanceOrderDetailEntity.setUpdateTime(new Date());
|
|
|
|
maintenanceOrderDetailEntity.setUpdateTime(new Date());
|
|
|
|
invMAOrderDetailDao.updateById(maintenanceOrderDetailEntity);
|
|
|
|
invMAOrderDetailDao.updateById(maintenanceOrderDetailEntity);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "条码重复!");
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "条码重复!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
//查询养护记录信息
|
|
|
|
|
|
|
|
InvMAOrderEntity maOrder = invMAOrderDao.selectOne(new QueryWrapper<InvMAOrderEntity>().eq("orderId", invMAOrderDetailEntity.getOrderIdFk()));
|
|
|
|
|
|
|
|
//查询此产品库存详情是否存在
|
|
|
|
//查询此产品库存详情是否存在
|
|
|
|
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
|
|
|
|
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
|
|
|
|
filterInvProductDetailRequest.setCode(invMAOrderDetailEntity.getCode());
|
|
|
|
filterInvProductDetailRequest.setCode(invMAOrderDetailEntity.getCode());
|
|
|
|