From 3b77a9a1f9f431293aefb998786805e55e8a8b95 Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Wed, 23 Oct 2024 17:02:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=8D=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8D=95=E8=B0=83=E6=95=B4=E3=80=81=E4=B8=8D?= =?UTF-8?q?=E5=90=88=E6=A0=BC=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E5=9B=9E=E5=86=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dhjydmaster/DhjydMasterVOServiceImpl.java | 17 +++--- .../nc/bs/pub/action/N_DHJY_APPROVE.java | 5 +- .../nc/bs/pub/action/N_DHJY_UNAPPROVE.java | 56 +++++++++---------- 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/DhjydMasterVOServiceImpl.java b/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/DhjydMasterVOServiceImpl.java index dff8db6..efe6ae0 100644 --- a/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/DhjydMasterVOServiceImpl.java +++ b/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/DhjydMasterVOServiceImpl.java @@ -664,10 +664,10 @@ public class DhjydMasterVOServiceImpl extends ServiceSupport implements IDhjydMa testResMap.put(map.getOrDefault("code", "") + "", map.getOrDefault("pk_defdoc", "") + ""); } } - // UFDouble qualifiednum = oldVo.getQualifiednum(); + String def2 = oldVo.getDef2();// 数量 // UFDouble nunqualifiednum = oldVo.getNunqualifiednum(); String vbatch = (oldVo.getVbatch() != null) ? oldVo.getVbatch() : "";// 批次号 - // oldVo.setQualifiednum(UFDouble.ZERO_DBL); + oldVo.setDef2("0"); // oldVo.setNunqualifiednum(UFDouble.ZERO_DBL); DhjydSlave0VO vo0 = new DhjydSlave0VO(); DhjydSlave0VO vo1 = new DhjydSlave0VO(); @@ -680,6 +680,7 @@ public class DhjydMasterVOServiceImpl extends ServiceSupport implements IDhjydMa if ("01".equals(def1Code)) { // 合格 // vo0.setQualifiednum(qualifiednum); + vo0.setDef2(def2); vo0.setVbatch(vbatch + vbatchStr[0]); newVOs[0] = vo0; @@ -697,6 +698,7 @@ public class DhjydMasterVOServiceImpl extends ServiceSupport implements IDhjydMa // mainVO.setNnum(qualifiednum); } else if ("02".equals(def1Code)) { // 合格 + vo0.setDef2(def2); vo0.setAttributeValue("def1", testResMap.get("01")); vo0.setVbatch(vbatch + vbatchStr[0]); newVOs[0] = vo0; @@ -713,6 +715,7 @@ public class DhjydMasterVOServiceImpl extends ServiceSupport implements IDhjydMa // mainVO.setNnum(qualifiednum); } else if ("03".equals(def1Code)) { // 合格 + vo0.setDef2(def2); // 设置检验结果的值 vo0.setAttributeValue("def1", testResMap.get("01")); vo0.setVbatch(vbatch + vbatchStr[0]); @@ -772,13 +775,11 @@ public class DhjydMasterVOServiceImpl extends ServiceSupport implements IDhjydMa } // 添加新的 for (int j = 0; j < unPassVOs.length; j++) { - DhjydSlave0VO vo0 = new DhjydSlave0VO(); DhjydSlave0VO dhjydSlave0VO = unPassVOs[j]; - BeanUtil.copyProperties(dhjydSlave0VO, vo0); - vo0.setStatus(VOStatus.NEW); - vo0.setPrimaryKey(null); - vo0.setAttributeValue("pk_chekbill_b", null); - newVOs[j + 1] = vo0; + dhjydSlave0VO.setStatus(VOStatus.NEW); + dhjydSlave0VO.setPrimaryKey(null); + dhjydSlave0VO.setAttributeValue("pk_chekbill_b", null); + newVOs[j + 1] = dhjydSlave0VO; } masterVO.setChildren(DhjydSlave0VO.class, newVOs); AggDhjydMasterVO[] saveVOs = dao.update(masterVO); 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 f1cbafa..8eb91da 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 @@ -53,9 +53,8 @@ public class N_DHJY_APPROVE extends AbstractPfScriptAction { for (int i = 0; i < vos.length; i++) { service.writeBackQc(vos[i]); } - // IDhjydMasterVOService dhjydMasterVOService = - // NCLocator.getInstance().lookup(IDhjydMasterVOService.class); - // dhjydMasterVOService.afterAuditUnPass(vos); + IDhjydMasterVOService dhjydMasterVOService = NCLocator.getInstance().lookup(IDhjydMasterVOService.class); + dhjydMasterVOService.afterAuditUnPass(vos); } } \ No newline at end of file diff --git a/pu/src/public/nc/bs/pub/action/N_DHJY_UNAPPROVE.java b/pu/src/public/nc/bs/pub/action/N_DHJY_UNAPPROVE.java index a7fbdf5..7accd33 100644 --- a/pu/src/public/nc/bs/pub/action/N_DHJY_UNAPPROVE.java +++ b/pu/src/public/nc/bs/pub/action/N_DHJY_UNAPPROVE.java @@ -3,57 +3,53 @@ package nc.bs.pub.action; import java.util.Arrays; import nc.bs.framework.common.NCLocator; -import nc.bs.pub.compiler.IWorkFlowRet; -import nc.vo.pub.BusinessException; -import nc.vo.pub.compiler.PfParameterVO; -import nc.vo.pub.VOStatus; -import nc.vo.uap.pf.PFBusinessException; -import nc.vo.pubapp.pattern.model.entity.bill.AbstractBill; -import nc.vo.pubapp.pattern.model.meta.entity.bill.IBillMeta; -import nc.vo.pub.CircularlyAccessibleValueObject; -import nccloud.commons.lang.StringUtils; import nc.codeplatform.framework.service.AbstractPfScriptAction; -import nc.vo.pu.dhjyd.AggDhjydMasterVO; import nc.itf.pu.dhjyd.dhjydmaster.IArriveToDhjyd; import nc.itf.pu.dhjyd.dhjydmaster.IDhjydMasterVOService; +import nc.vo.pu.dhjyd.AggDhjydMasterVO; +import nc.vo.pub.BusinessException; +import nc.vo.pub.VOStatus; +import nc.vo.pub.compiler.PfParameterVO; +import nc.vo.uap.pf.PFBusinessException; +import nccloud.commons.lang.StringUtils; -public class N_DHJY_UNAPPROVE extends AbstractPfScriptAction{ - - public N_DHJY_UNAPPROVE(){ +public class N_DHJY_UNAPPROVE extends AbstractPfScriptAction { + + public N_DHJY_UNAPPROVE() { super(); } - + @Override protected Object process(PfParameterVO paraVO) throws BusinessException { try { IDhjydMasterVOService service = NCLocator.getInstance().lookup(IDhjydMasterVOService.class); - AggDhjydMasterVO[] vos = (AggDhjydMasterVO[])this.getVos(); - Arrays.stream(vos).forEach(v-> v.getParent().setStatus(VOStatus.UPDATED)); - + AggDhjydMasterVO[] vos = (AggDhjydMasterVO[]) this.getVos(); + Arrays.stream(vos).forEach(v -> v.getParent().setStatus(VOStatus.UPDATED)); + this.procUnApproveFlow(paraVO); - + vos = service.callbackUNAPPROVE(vos); - + return vos; - }catch(Exception ex) { + } catch (Exception ex) { if (ex instanceof BusinessException) { - throw (BusinessException) ex; - } - throw new PFBusinessException(ex.getMessage(), ex); + throw (BusinessException) ex; + } + throw new PFBusinessException(ex.getMessage(), ex); } } - - protected void before(PfParameterVO paraVO) throws BusinessException{ - AggDhjydMasterVO vo = (AggDhjydMasterVO)this.getVo(); - if(StringUtils.isEmpty(vo.getPrimaryKey())){ + + protected void before(PfParameterVO paraVO) throws BusinessException { + AggDhjydMasterVO vo = (AggDhjydMasterVO) this.getVo(); + if (StringUtils.isEmpty(vo.getPrimaryKey())) { throw new BusinessException("当前单据未执行保存动作脚本，如果配置了业务流程定义，请检查动作驱动配置！"); } } - + protected void after(PfParameterVO paraVO) throws BusinessException { - AggDhjydMasterVO[] vos = (AggDhjydMasterVO[])this.getVos(); + AggDhjydMasterVO[] vos = (AggDhjydMasterVO[]) this.getVos(); IArriveToDhjyd service = NCLocator.getInstance().lookup(IArriveToDhjyd.class); - for(int i = 0; i < vos.length; i++) { + for (int i = 0; i < vos.length; i++) { service.deleteQc(vos[i]); } }