合并分支备份

test
anthonywj 1 year ago
parent 399d6c3881
commit 426b966cb3

@ -403,16 +403,11 @@ public class IoOrderReviewController extends BaseController {
checkCode = checkCode.replace("\u001D", "");
}
if (checkCode.toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) {
// if (IntUtil.value(checkOrderCodesBean.getStatus()) == Constant.DB_CHECK_ED
// && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) {
// return Constant.CHECK_REPEAT;
// }
if (StrUtil.isNotEmpty(checkOrderCodesBean.getSerialNo())) {
if (checkOrderCodesBean.getScanCount() > 0) {
return Constant.CHECK_REPEAT;
}
}
int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode());
if (curCount == IntUtil.value(checkOrderCodesBean.getReCount())) {
checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED);

Loading…
Cancel
Save