From fd4acfa6971f552805d67704fb11fea777a4f019 Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Fri, 5 Sep 2025 18:41:12 +0800 Subject: [PATCH] =?UTF-8?q?fix(ic):=20=E5=80=9F=E6=96=99=E5=85=A5=E5=BA=93?= =?UTF-8?q?-=E5=85=B6=E5=AE=83=E5=85=A5=E5=BA=93=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C-=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nc/impl/ic/batch/BatchCheckImpl.java | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/ic/src/private/nc/impl/ic/batch/BatchCheckImpl.java b/ic/src/private/nc/impl/ic/batch/BatchCheckImpl.java index cae0cf9..02fe03a 100644 --- a/ic/src/private/nc/impl/ic/batch/BatchCheckImpl.java +++ b/ic/src/private/nc/impl/ic/batch/BatchCheckImpl.java @@ -11,6 +11,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; + import nc.bs.ic.pub.env.ICBSContext; import nc.impl.pubapp.env.BSContext; import nc.itf.ic.batch.IBatchCheck; @@ -50,10 +51,10 @@ public class BatchCheckImpl implements IBatchCheck { Set keySet = new HashSet(); List keys = new ArrayList(); - for(ICBillVO bill : bills) { - for(ICBillBodyVO body : bill.getBodys()) { + for (ICBillVO bill : bills) { + for (ICBillBodyVO body : bill.getBodys()) { if (body.getDproducedate() != null && body.getDvalidate() != null && body.getDproducedate().compareTo(body.getDvalidate()) > 0) { - ExceptionUtils.wrappException(new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4008028_0", "04008028-0067", (String)null, new String[]{"" + body.getVbatchcode()}))); + ExceptionUtils.wrappException(new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4008028_0", "04008028-0067", (String) null, new String[]{"" + body.getVbatchcode()}))); } String var10001 = bill.getHead().getPk_org(); @@ -69,10 +70,10 @@ public class BatchCheckImpl implements IBatchCheck { return; } - Map invInfoMap = (new ICBSContext()).getInvInfo().getInvCalBodyVOs((InvCalbodyKey[])keys.toArray(new InvCalbodyKey[keys.size()])); + Map invInfoMap = (new ICBSContext()).getInvInfo().getInvCalBodyVOs((InvCalbodyKey[]) keys.toArray(new InvCalbodyKey[keys.size()])); Map cInvInfoMap = this.changeRet(invInfoMap); - for(ICBillVO bill : bills) { + for (ICBillVO bill : bills) { StringBuilder errStr = new StringBuilder(); List errRowNos = new ArrayList(); this.checkBatchcode(bill, cInvInfoMap, errStr, errRowNos, true); @@ -91,7 +92,7 @@ public class BatchCheckImpl implements IBatchCheck { private Map changeRet(Map invInfoMap) { Map cInvInfoMap = new HashMap(); - for(InvCalBodyVO vo : invInfoMap.values()) { + for (InvCalBodyVO vo : invInfoMap.values()) { cInvInfoMap.put(vo.getPk_org() + vo.getPk_material(), vo); } @@ -107,7 +108,7 @@ public class BatchCheckImpl implements IBatchCheck { String pk_org = bill.getHead().getPk_org(); List cmaterialVIDs = new ArrayList(); - for(ICBillBodyVO body : bill.getBodys()) { + for (ICBillBodyVO body : bill.getBodys()) { if (body.getStatus() != 3 && !cmaterialVIDs.contains(body.getCmaterialvid()) && body.getNnum() != null) { cmaterialVIDs.add(body.getCmaterialvid()); } @@ -137,7 +138,7 @@ public class BatchCheckImpl implements IBatchCheck { String pk_org = bill.getHead().getPk_org(); List cmaterialVIDs = new ArrayList(); - for(ICBillBodyVO body : bill.getBodys()) { + for (ICBillBodyVO body : bill.getBodys()) { if (body.getStatus() != 3 && !cmaterialVIDs.contains(body.getCmaterialvid()) && !NCBaseTypeUtils.isNullOrZero(body.getNnum())) { cmaterialVIDs.add(body.getCmaterialvid()); } @@ -159,10 +160,10 @@ public class BatchCheckImpl implements IBatchCheck { } private void checkBatchcode(ICBillVO bill, Map materialVOs, StringBuilder errStr, List errRowNos, boolean checkQualFlag) { - for(ICBillBodyVO body : bill.getBodys()) { + for (ICBillBodyVO body : bill.getBodys()) { if (body.getStatus() != 3 && body.getNnum() != null && !StringUtil.isSEmptyOrNull(body.getCmaterialvid())) { String var10001 = bill.getHead().getPk_org(); - InvCalBodyVO materialVO = (InvCalBodyVO)materialVOs.get(var10001 + body.getCmaterialvid()); + InvCalBodyVO materialVO = (InvCalBodyVO) materialVOs.get(var10001 + body.getCmaterialvid()); AssertUtils.assertValue(materialVO != null, BatchRes.getMaterialStockErr()); ICBillHeadVO head = bill.getHead(); boolean isError = this.checkWholeMngInv(materialVO, body, errStr, errRowNos, checkQualFlag, head); @@ -223,9 +224,9 @@ public class BatchCheckImpl implements IBatchCheck { private Map fetchMaterialInfo(String pk_org, List cmaterialVIDs) { Map retMap = new HashMap(); ICBSContext context = new ICBSContext(); - InvCalBodyVO[] stockVOs = context.getInvInfo().getInvCalBodyVO(pk_org, (String[])cmaterialVIDs.toArray(new String[cmaterialVIDs.size()])); + InvCalBodyVO[] stockVOs = context.getInvInfo().getInvCalBodyVO(pk_org, (String[]) cmaterialVIDs.toArray(new String[cmaterialVIDs.size()])); if (stockVOs != null && stockVOs.length != 0) { - for(InvCalBodyVO vo : stockVOs) { + for (InvCalBodyVO vo : stockVOs) { retMap.put(vo.getPk_org() + vo.getPk_material(), vo); } @@ -239,10 +240,10 @@ public class BatchCheckImpl implements IBatchCheck { if (errRowNos != null && errRowNos.size() != 0) { List cpickmbids = new ArrayList(); - for(String rowNo : errRowNos) { - for(ICBillBodyVO body : bill.getChildrenVO()) { + for (String rowNo : errRowNos) { + for (ICBillBodyVO body : bill.getChildrenVO()) { if (rowNo.equals(body.getCrowno())) { - String cpickmbid = (String)body.getAttributeValue("cpickmbid"); + String cpickmbid = (String) body.getAttributeValue("cpickmbid"); cpickmbids.add(cpickmbid); } } @@ -259,15 +260,15 @@ public class BatchCheckImpl implements IBatchCheck { int status = head.getStatus(); if (status == VOStatus.UNCHANGED) { // 借料类型的其它入库跳过批次号校验 - String typeCode = ""; - try { - typeCode = SysInitQuery.getParaString(head.getPk_org(), "ICIN_TYPE"); - } catch (BusinessException e) { - throw new RuntimeException(e); - } - if (!"".equals(typeCode) && typeCode.equals(head.getVtrantypecode())) { - isBatchEmpty = false; - } + String typeCode = ""; + try { + typeCode = SysInitQuery.getParaString(head.getPk_org(), "ICIN_TYPE"); + } catch (BusinessException e) { + throw new RuntimeException(e); + } + if (typeCode != null && !"".equals(typeCode) && typeCode.equals(head.getVtrantypecode())) { + isBatchEmpty = false; + } } boolean isNumNotEmpty = body.getNnum() != null && !NCBaseTypeUtils.isNullOrZero(body.getNnum()); return isBatchEmpty && isNumNotEmpty;