|
|
|
@ -40,21 +40,21 @@ public class IoCheckInvService {
|
|
|
|
|
BaseResponse invRes = null;
|
|
|
|
|
if (IntUtil.value(bussinessTypeEntity.getUseDyCount()) == 2) {
|
|
|
|
|
if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 2)) { //校验预验收库存
|
|
|
|
|
invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false);
|
|
|
|
|
invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, true);
|
|
|
|
|
}
|
|
|
|
|
if (bussinessTypeEntity.isAdvancePreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 3)) { //校验寄售库存
|
|
|
|
|
invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false);
|
|
|
|
|
invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, true);
|
|
|
|
|
}
|
|
|
|
|
if (bussinessTypeEntity.isVailInv() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 1)) {
|
|
|
|
|
invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
|
|
|
|
|
invRes = checkInv(bussinessTypeEntity, genDetaiEntity, true);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
|
|
|
|
|
invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false);
|
|
|
|
|
invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, true);
|
|
|
|
|
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
|
|
|
|
|
invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false);
|
|
|
|
|
invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, true);
|
|
|
|
|
} else {
|
|
|
|
|
invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
|
|
|
|
|
invRes = checkInv(bussinessTypeEntity, genDetaiEntity, true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return invRes;
|
|
|
|
@ -99,7 +99,7 @@ public class IoCheckInvService {
|
|
|
|
|
count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(), true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (count <= 0) {
|
|
|
|
|
if (count < 0) {
|
|
|
|
|
if (count == -1) {
|
|
|
|
|
return ResultVOUtils.error(500, "该产品未入库");
|
|
|
|
|
} else
|
|
|
|
@ -184,7 +184,7 @@ public class IoCheckInvService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(codeTempEntity.getCode());
|
|
|
|
|
if (count <= 0) {
|
|
|
|
|
if (count < 0) {
|
|
|
|
|
if (count == -1) {
|
|
|
|
|
return ResultVOUtils.error(500, "该产品未入库");
|
|
|
|
|
} else
|
|
|
|
@ -255,7 +255,7 @@ public class IoCheckInvService {
|
|
|
|
|
count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (count <= 0) {
|
|
|
|
|
if (count < 0) {
|
|
|
|
|
if (count == -1) {
|
|
|
|
|
return ResultVOUtils.error(500, "该产品未入库");
|
|
|
|
|
} else
|
|
|
|
|