From 89454fab480f7b8e4739e626a951eda09405dfc1 Mon Sep 17 00:00:00 2001 From: hefengkai <958118178@qq.com> Date: Thu, 24 Oct 2024 11:01:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8D=95=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=AE=8C=E5=9B=9E=E5=86=99=E8=B4=A8=E6=A3=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java | 7 ++++++- pu/src/public/nc/bs/pub/action/N_DHJY_APPROVE.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) 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 6680452..b4a4b18 100644 --- a/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java +++ b/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java @@ -52,7 +52,7 @@ public class ArriveToDhjydImpl extends ServiceSupport implements IArriveToDhjyd masterVO.setBilltype("DHJY");//单据类型 masterVO.setSrcbillid(arriveHeadVo.getPk_arriveorder());//来源单id masterVO.setVsourcecode(arriveHeadVo.getVbillcode());//来源单据号 - masterVO.setSrcbilltype(arriveHeadVo.getCtrantypeid());//来源单据号 + masterVO.setSrcbilltype(arriveHeadVo.getCtrantypeid());//来源单据交易类型 masterVO.setDapplydate(new UFDate());//报检日期 masterVO.setApprovestatus(-1);//单据审批状态-1自由态 masterVO.setDef1(arriveItems[0].getPk_arriveorder_b());//来源子表主键id @@ -93,6 +93,11 @@ public class ArriveToDhjydImpl extends ServiceSupport implements IArriveToDhjyd DhjydMasterVO dhjydMaster = aggDhjydMasterVO.getParentVO();//获取检验单表头信息 DhjydSlave0VO[] dhjydItems = (DhjydSlave0VO[])aggDhjydMasterVO.getChildrenVO();//获取到货单表体信息 + String transtype = dhjydMaster.getTranstype(); + if (!"DHJY-Cxx-01".equals(transtype)) {//非到货检验单情况处理结束 + return null; + } + ArriveBbVO arriveBb = null;//到货单质检明细 ArrayList vos = new ArrayList(); //存在一个检验单有多个表体的情况(合格、不合格、回用) diff --git a/pu/src/public/nc/bs/pub/action/N_DHJY_APPROVE.java b/pu/src/public/nc/bs/pub/action/N_DHJY_APPROVE.java index 8eb91da..37a5a2a 100644 --- a/pu/src/public/nc/bs/pub/action/N_DHJY_APPROVE.java +++ b/pu/src/public/nc/bs/pub/action/N_DHJY_APPROVE.java @@ -51,7 +51,7 @@ public class N_DHJY_APPROVE extends AbstractPfScriptAction { AggDhjydMasterVO[] vos = (AggDhjydMasterVO[]) this.getVos(); IArriveToDhjyd service = NCLocator.getInstance().lookup(IArriveToDhjyd.class); for (int i = 0; i < vos.length; i++) { - service.writeBackQc(vos[i]); + service.writeBackQc(vos[i]);//普通检验单回写质检信息 } IDhjydMasterVOService dhjydMasterVOService = NCLocator.getInstance().lookup(IDhjydMasterVOService.class); dhjydMasterVOService.afterAuditUnPass(vos);