库存不足问题,单据验收问题

pro
anthonywj 2 years ago
parent ce2aa13b5f
commit 415b931c06

@ -568,6 +568,11 @@ public class IoCodeTempController extends BaseController {
exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1); exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1);
exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponses.get(0))); exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponses.get(0)));
if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
return ResultVOUtils.error(500, "重复扫码!");
}
BaseResponse invRes = null; BaseResponse invRes = null;
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
invRes = checkPreInInv(bussinessTypeEntity, exitLocalEntity); invRes = checkPreInInv(bussinessTypeEntity, exitLocalEntity);
@ -580,7 +585,7 @@ public class IoCodeTempController extends BaseController {
return invRes; return invRes;
} }
if (StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) { if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
String errMsg = ioCheckInoutService.checkCode(genDetaiEntity); String errMsg = ioCheckInoutService.checkCode(genDetaiEntity);
if (errMsg != null) { if (errMsg != null) {
@ -597,9 +602,7 @@ public class IoCodeTempController extends BaseController {
codeTempService.updateById(exitLocalEntity); codeTempService.updateById(exitLocalEntity);
} }
} else {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
}
} }
} }

@ -200,7 +200,6 @@ public class IoOrderReviewController extends BaseController {
List<IoOrderDetailResultResponse> orderDetailResultResponses = acceptOrderEntity.getOrderDetailEntities(); List<IoOrderDetailResultResponse> orderDetailResultResponses = acceptOrderEntity.getOrderDetailEntities();
if (StrUtil.isNotEmpty(acceptOrderEntity.getCode()) && CollUtil.isNotEmpty(orderDetailResultResponses)) { if (StrUtil.isNotEmpty(acceptOrderEntity.getCode()) && CollUtil.isNotEmpty(orderDetailResultResponses)) {
boolean isExit = false; boolean isExit = false;
for (IoOrderDetailResultResponse orderDetailResultResponse : orderDetailResultResponses) { for (IoOrderDetailResultResponse orderDetailResultResponse : orderDetailResultResponses) {
if (orderDetailResultResponse.getBindRlFk().longValue() == codeEntity.getRelId().longValue() && if (orderDetailResultResponse.getBindRlFk().longValue() == codeEntity.getRelId().longValue() &&
@ -352,10 +351,16 @@ public class IoOrderReviewController extends BaseController {
checkCode = checkCode.replace("\u001D", ""); checkCode = checkCode.replace("\u001D", "");
} }
if (checkCode.toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) { if (checkCode.toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) {
if (IntUtil.value(checkOrderCodesBean.getStatus()) == Constant.DB_CHECK_ED // if (IntUtil.value(checkOrderCodesBean.getStatus()) == Constant.DB_CHECK_ED
&& IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) { // && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) {
// return Constant.CHECK_REPEAT;
// }
if (StrUtil.isNotEmpty(checkOrderCodesBean.getSerialNo())) {
if (checkOrderCodesBean.getScanCount() > 0) {
return Constant.CHECK_REPEAT; return Constant.CHECK_REPEAT;
} }
}
int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode()); int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode());
if (curCount == IntUtil.value(checkOrderCodesBean.getReCount())) { if (curCount == IntUtil.value(checkOrderCodesBean.getReCount())) {
checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED); checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED);

Loading…
Cancel
Save