From c0776e2c9433bb83b7b917d95629115d588b5859 Mon Sep 17 00:00:00 2001
From: hefengkai <958118178@qq.com>
Date: Thu, 24 Oct 2024 17:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E7=B1=BB=E5=9E=8B=E5=92=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=90=88=E6=A0=BC=E6=95=B0=E9=87=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dhjyd/dhjydmaster/ArriveToDhjydImpl.java  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

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 6154763..829c442 100644
--- a/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java
+++ b/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java
@@ -3,6 +3,7 @@ package nc.impl.pu.dhjyd.dhjydmaster;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import nc.bs.dao.BaseDAO;
@@ -13,6 +14,7 @@ import nc.bs.trade.business.HYPubBO;
 import nc.codeplatform.framework.service.ServiceSupport;
 import nc.itf.pu.dhjyd.dhjydmaster.IArriveToDhjyd;
 import nc.itf.pu.dhjyd.dhjydmaster.IDhjydMasterVOService;
+import nc.jdbc.framework.processor.MapListProcessor;
 import nc.jdbc.framework.processor.MapProcessor;
 import nc.vo.pu.dhjyd.AggDhjydMasterVO;
 import nc.vo.pu.dhjyd.DhjydMasterVO;
@@ -70,6 +72,10 @@ public class ArriveToDhjydImpl extends ServiceSupport implements IArriveToDhjyd
 			if(itemVOs != null && itemVOs.length > 0) {
 				for (int i = 0; i < itemVOs.length; i++) {
 					itemVOs[0].setStatus(2);//新增(0:初始  1:更新  2:新增  3:删除)
+					Map<String,String> qcTypeMap = getQcType();//获取质检类型
+					itemVOs[0].setDef1(qcTypeMap.get("01"));//质检合格类型
+					UFDouble nchecknum = itemVOs[0].getNchecknum();//检验数量
+					itemVOs[0].setDef2(nchecknum==null?"0":nchecknum.toString());//默认合格数量
 				}
 			}
 			
@@ -187,6 +193,30 @@ public class ArriveToDhjydImpl extends ServiceSupport implements IArriveToDhjyd
 	}
 	
 	
+	/***
+	   * 获取质检类型  01合格、  02回用、 03不合格
+	  * @param 
+	  * @return
+	  */
+	private Map<String, String> getQcType() throws BusinessException {
+		
+		Map<String, String> qcTypeMap = new HashMap<>();
+		// 根据自定义档案的编码查询对应的主键
+		String sql = "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<Map<String, Object>> qcTypeList = (List<Map<String, Object>>) getBaseDAO().executeQuery(sql, new MapListProcessor());
+		
+		for (Map<String, Object> map : qcTypeList) {
+			if (!map.isEmpty()) {
+				qcTypeMap.put(map.getOrDefault("code", "") + "", map.getOrDefault("pk_defdoc", "") + "");
+			}
+		}
+		
+		return qcTypeMap;
+	}
+	
+	
 	/***
 	   * 获取dao层
 	  * @return