diff --git a/ic/src/private/nc/impl/ic/batch/BatchCheckImpl.java b/ic/src/private/nc/impl/ic/batch/BatchCheckImpl.java index 9a64be1..cae0cf9 100644 --- a/ic/src/private/nc/impl/ic/batch/BatchCheckImpl.java +++ b/ic/src/private/nc/impl/ic/batch/BatchCheckImpl.java @@ -29,6 +29,7 @@ import nc.vo.ic.pub.util.StringUtil; import nc.vo.ic.pub.util.ValueCheckUtil; import nc.vo.ml.NCLangRes4VoTransl; import nc.vo.pub.BusinessException; +import nc.vo.pub.VOStatus; import nc.vo.pub.lang.UFBoolean; import nc.vo.pub.lang.UFDate; import nc.vo.pubapp.pattern.data.ValueUtils; @@ -255,7 +256,9 @@ public class BatchCheckImpl implements IBatchCheck { private boolean isBatchEmpty(ICBillBodyVO body, ICBillHeadVO head) { boolean isBatchEmpty = StringUtil.isSEmptyOrNull(body.getVbatchcode()); - // 借料类型的其它入库跳过批次号校验 + int status = head.getStatus(); + if (status == VOStatus.UNCHANGED) { + // 借料类型的其它入库跳过批次号校验 String typeCode = ""; try { typeCode = SysInitQuery.getParaString(head.getPk_org(), "ICIN_TYPE"); @@ -265,6 +268,7 @@ public class BatchCheckImpl implements IBatchCheck { if (!"".equals(typeCode) && typeCode.equals(head.getVtrantypecode())) { isBatchEmpty = false; } + } boolean isNumNotEmpty = body.getNnum() != null && !NCBaseTypeUtils.isNullOrZero(body.getNnum()); return isBatchEmpty && isNumNotEmpty; }