|
|
@ -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);
|
|
|
|