From 6ec98b7ab53fa852147430a0991c1f8f5a91d836 Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Fri, 5 Sep 2025 09:16:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(ic):=20=E4=BC=98=E5=8C=96=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=20-=20=E5=9C=A8?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ic/src/private/nc/impl/ic/batch/BatchCheckImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; }