From 57b55e1e40b21d123b192ec295f4cd65dbfade2c Mon Sep 17 00:00:00 2001 From: hefengkai <958118178@qq.com> Date: Fri, 25 Oct 2024 15:18:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E5=AE=83=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A0=B8=E7=AE=97=E5=92=8C=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E9=87=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nc/bs/ic/m4a/util/Bill4AFinanceProcess.java | 3 +++ .../nc/bs/ic/m4i/util/Bill4IFinanceProcess.java | 6 ++++++ .../pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java | 16 ++++++++-------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ic/src/private/nc/bs/ic/m4a/util/Bill4AFinanceProcess.java b/ic/src/private/nc/bs/ic/m4a/util/Bill4AFinanceProcess.java index d0a9c9f..f8dbc3d 100644 --- a/ic/src/private/nc/bs/ic/m4a/util/Bill4AFinanceProcess.java +++ b/ic/src/private/nc/bs/ic/m4a/util/Bill4AFinanceProcess.java @@ -42,6 +42,9 @@ public class Bill4AFinanceProcess (ICBillHeadVO[])VOEntityUtil.getHeadVOs(icbills)); fillIABillCostOrg(iabills, costorgs); GeneralInVO[] _icbills = filterIcbills(icbills);//库存其它入库单筛选-华丰 + if(_icbills == null || _icbills.length == 0) { + return; + } I4BillVO[] _iabills = filterIabills(iabills, _icbills);//筛选核算库存信息-华丰 if(_iabills == null || _iabills.length == 0) { return; diff --git a/ic/src/private/nc/bs/ic/m4i/util/Bill4IFinanceProcess.java b/ic/src/private/nc/bs/ic/m4i/util/Bill4IFinanceProcess.java index 46f3f0d..36fae89 100644 --- a/ic/src/private/nc/bs/ic/m4i/util/Bill4IFinanceProcess.java +++ b/ic/src/private/nc/bs/ic/m4i/util/Bill4IFinanceProcess.java @@ -48,7 +48,13 @@ public class Bill4IFinanceProcess (ICBillHeadVO[])VOEntityUtil.getHeadVOs(icbills)); fillIABillCostOrg(iaBills, costorgs); GeneralOutVO[] _icbills = filterIcbills(icbills);//库存其它出库单筛选-华丰 + if(_icbills == null || _icbills.length == 0) { + return; + } I7BillVO[] _iaBills = filterIabills(iaBills, _icbills);//筛选核算出库库存信息-华丰 + if(_iaBills == null || _iaBills.length == 0) { + return; + } ((IIAI7ForIC4ISign)NCLocator.getInstance().lookup(IIAI7ForIC4ISign.class)).insertI7ForIC4ISign((I7BillVO[])_iaBills); } diff --git a/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java b/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java index bc68004..e37692e 100644 --- a/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java +++ b/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java @@ -75,7 +75,7 @@ public class ArriveToDhjydImpl extends ServiceSupport implements IArriveToDhjyd Map qcTypeMap = getQcType();//获取质检类型 itemVOs[0].setDef1(qcTypeMap.get("01"));//质检合格类型 UFDouble nchecknum = itemVOs[0].getNchecknum();//检验数量 - itemVOs[0].setDef2(nchecknum==null?"0":nchecknum.toString());//默认合格数量 + itemVOs[0].setQualifiednum(nchecknum==null?UFDouble.ZERO_DBL:nchecknum);//默认合格数量 } } @@ -122,9 +122,9 @@ public class ArriveToDhjydImpl extends ServiceSupport implements IArriveToDhjyd arriveBb.setPk_group(dhjydMaster.getPk_group());//所属集团id arriveBb.setPk_arriveorder(dhjydMaster.getSrcbillid());//到货单主键id arriveBb.setPk_arriveorder_b(dhjydMaster.getDef1());//到货单表体主键id - String nnum = dhjydItems[i].getDef2(); - arriveBb.setNnum(nnum==null?UFDouble.ZERO_DBL:new UFDouble(nnum));//主数量 - arriveBb.setNastnum(nnum==null?UFDouble.ZERO_DBL:new UFDouble(nnum));//辅数量 + UFDouble nnum = dhjydItems[i].getQualifiednum(); + arriveBb.setNnum(nnum==null?UFDouble.ZERO_DBL:nnum);//主数量 + arriveBb.setNastnum(nnum==null?UFDouble.ZERO_DBL:nnum);//辅数量 arriveBb.setStatus(2);//新增(0:初始 1:更新 2:新增 3:删除) arriveBb.setBchanged(UFBoolean.valueOf(false));//是否改判 arriveBb.setBcanstore(UFBoolean.valueOf(true));//是否可入库 @@ -135,7 +135,7 @@ public class ArriveToDhjydImpl extends ServiceSupport implements IArriveToDhjyd + "FROM bd_defdoc a LEFT JOIN bd_defdoclist b ON a.pk_defdoclist = b.pk_defdoclist " + "WHERE a.dr = 0 AND a.pk_defdoc = '" + def1 + "' AND b.code = 'checkresult'"; HashMap headMap = (HashMap) getBaseDAO().executeQuery(sql, new MapProcessor()); - String def1Code = headMap.getOrDefault("code", ""); + String def1Code = headMap==null?"":headMap.getOrDefault("code", ""); if ("01".equals(def1Code) || "02".equals(def1Code)) { arriveBb.setBeligible(UFBoolean.valueOf(true));//合格 } else if("03".equals(def1Code)) { @@ -144,10 +144,10 @@ public class ArriveToDhjydImpl extends ServiceSupport implements IArriveToDhjyd //批次主键查询 String vbatchcode = dhjydItems[i].getVbatch(); - Object pk_batchcode = new HYPubBO().findColValue("scm_batchcode", "pk_batchcode", - "nvl(dr, 0) = 0 and vbatchcode = '"+vbatchcode+"' "); + Object pk_batchcode = new HYPubBO().findColValue("scm_batchcode", "pk_batchcode", + "nvl(dr, 0) = 0 and vbatchcode = '"+vbatchcode+"' and csourcebid = '"+dhjydMaster.getDef1()+"'"); arriveBb.setPk_inbatchcode(pk_batchcode==null?"":pk_batchcode.toString());//入库批次号主键 - arriveBb.setPk_inbatchcode(vbatchcode);//入库批次号编码 + arriveBb.setVinbatchcode(vbatchcode);//入库批次号编码 vos.add(arriveBb); }