From e4556cb0d93697262e443f716ac7aa2752500514 Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Mon, 21 Oct 2024 16:06:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=8D=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8D=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dhjydmaster/DhjydMasterVOServiceImpl.java | 53 +++++++++++-------- 1 file changed, 32 insertions(+), 21 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 e1e450e..1ff25a1 100644 --- a/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/DhjydMasterVOServiceImpl.java +++ b/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/DhjydMasterVOServiceImpl.java @@ -621,11 +621,12 @@ public class DhjydMasterVOServiceImpl extends ServiceSupport implements IDhjydMa DhjydSlave0VO oldVo = dhjydSlave0VOs[0]; // 检查结果 合格、回用、不合格 String def1 = oldVo.getDef1(); - String getTestResCodeSql = "SELECT a.code,a.pk_defdoc " + - "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'"; + String getTestResCodeSql = "SELECT a.code,a.pk_defdoc " + + "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'"; getTestResCodeSql = getTestResCodeSql.replace("[def1]", def1); - HashMap headMap = (HashMap)getBaseDAO().executeQuery(getTestResCodeSql, new MapProcessor()); + HashMap headMap = (HashMap) getBaseDAO().executeQuery(getTestResCodeSql, + new MapProcessor()); String def1Code = headMap.getOrDefault("code", ""); oldVo.setPrimaryKey(null); oldVo.setStatus(VOStatus.NEW); @@ -635,9 +636,9 @@ public class DhjydMasterVOServiceImpl extends ServiceSupport implements IDhjydMa oldVo.setAttributeValue("rowno", null); oldVo.setAttributeValue("srcrowno", null); // 根据自定义档案的编码查询对应的主键 - String getTestResSql = "SELECT a.code,a.pk_defdoc " + - "FROM bd_defdoc a LEFT JOIN bd_defdoclist b ON a.pk_defdoclist = b.pk_defdoclist " + - "WHERE a.dr = 0 AND a.code IN ('01','02','03') AND b.code = 'checkresult'"; + String getTestResSql = "SELECT a.code,a.pk_defdoc " + + "FROM bd_defdoc a LEFT JOIN bd_defdoclist b ON a.pk_defdoclist = b.pk_defdoclist " + + "WHERE a.dr = 0 AND a.code IN ('01','02','03') AND b.code = 'checkresult'"; List> testResList = (List>) getBaseDAO().executeQuery(getTestResSql, new MapListProcessor()); Map testResMap = new HashMap<>(); @@ -646,6 +647,11 @@ public class DhjydMasterVOServiceImpl extends ServiceSupport implements IDhjydMa testResMap.put(map.getOrDefault("code", "") + "", map.getOrDefault("pk_defdoc", "") + ""); } } + UFDouble qualifiednum = oldVo.getQualifiednum(); + UFDouble nunqualifiednum = oldVo.getNunqualifiednum(); + String vbatch = (oldVo.getVbatch() != null) ? oldVo.getVbatch() : "";// 批次号 + oldVo.setQualifiednum(UFDouble.ZERO_DBL); + oldVo.setNunqualifiednum(UFDouble.ZERO_DBL); DhjydSlave0VO vo0 = new DhjydSlave0VO(); DhjydSlave0VO vo1 = new DhjydSlave0VO(); DhjydSlave0VO vo2 = new DhjydSlave0VO(); @@ -654,49 +660,54 @@ public class DhjydMasterVOServiceImpl extends ServiceSupport implements IDhjydMa BeanUtil.copyProperties(oldVo, vo2); // 第1行 合格 第2行 回用 第3行 不合格 if ("01".equals(def1Code)) { - mainVO.setAttributeValue("vmemo", def1Code + new UFDateTime(InvocationInfoProxy.getInstance().getBizDateTime())); // 合格 - vo0.setNunqualifiednum(UFDouble.ZERO_DBL); + vo0.setQualifiednum(qualifiednum); newVOs[0] = vo0; - + // 回用 // 设置检验结果的值 vo1.setAttributeValue("def1", testResMap.get("02")); + vo1.setVbatch(vbatch + "回用"); newVOs[1] = vo1; - + // 不合格 - vo2.setNunqualifiednum(UFDouble.ZERO_DBL); // 设置检验结果的值 vo2.setAttributeValue("def1", testResMap.get("03")); + vo2.setVbatch(vbatch + "不合格"); newVOs[2] = vo2; + mainVO.setNnum(qualifiednum); } else if ("02".equals(def1Code)) { - mainVO.setAttributeValue("vmemo", def1Code + new UFDateTime(InvocationInfoProxy.getInstance().getBizDateTime())); // 合格 - vo0.setNunqualifiednum(UFDouble.ZERO_DBL); vo0.setAttributeValue("def1", testResMap.get("01")); newVOs[0] = vo0; - + // 回用 + vo1.setQualifiednum(qualifiednum); + vo1.setVbatch(vbatch + "回用"); newVOs[1] = vo1; - + // 不合格 - vo0.setAttributeValue("def1", testResMap.get("03")); + vo2.setAttributeValue("def1", testResMap.get("03")); + vo2.setVbatch(vbatch + "不合格"); newVOs[2] = vo2; + mainVO.setNnum(qualifiednum); } else if ("03".equals(def1Code)) { - mainVO.setAttributeValue("vmemo", def1Code + new UFDateTime(InvocationInfoProxy.getInstance().getBizDateTime())); // 合格 - vo0.setQualifiednum(UFDouble.ZERO_DBL); // 设置检验结果的值 vo0.setAttributeValue("def1", testResMap.get("01")); newVOs[0] = vo0; - + // 回用 // 设置检验结果的值 vo1.setAttributeValue("def1", testResMap.get("02")); + vo1.setVbatch(vbatch + "回用"); newVOs[1] = vo1; - + // 不合格 + vo2.setNunqualifiednum(nunqualifiednum); + vo2.setVbatch(vbatch + "不合格"); newVOs[2] = vo2; + mainVO.setNnum(nunqualifiednum); } }