From 5f519d305e0be3719012c4f0ecbf4ddc45e79d46 Mon Sep 17 00:00:00 2001
From: hefengkai <958118178@qq.com>
Date: Thu, 24 Oct 2024 15:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E4=BF=A1=E6=81=AF=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dhjyd/dhjydmaster/ArriveToDhjydImpl.java  | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 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 cbdd5a3..6154763 100644
--- a/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java
+++ b/pu/src/private/nc/impl/pu/dhjyd/dhjydmaster/ArriveToDhjydImpl.java
@@ -2,6 +2,7 @@ package nc.impl.pu.dhjyd.dhjydmaster;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
 
 import nc.bs.dao.BaseDAO;
@@ -12,6 +13,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.MapProcessor;
 import nc.vo.pu.dhjyd.AggDhjydMasterVO;
 import nc.vo.pu.dhjyd.DhjydMasterVO;
 import nc.vo.pu.dhjyd.DhjydSlave0VO;
@@ -20,8 +22,10 @@ import nc.vo.pu.m23.entity.ArriveHeaderVO;
 import nc.vo.pu.m23.entity.ArriveItemVO;
 import nc.vo.pu.m23.entity.ArriveVO;
 import nc.vo.pub.BusinessException;
+import nc.vo.pub.lang.UFBoolean;
 import nc.vo.pub.lang.UFDate;
-import nccloud.framework.core.exception.ExceptionUtils;
+import nc.vo.pub.lang.UFDouble;
+
 
 public class ArriveToDhjydImpl extends ServiceSupport implements IArriveToDhjyd {
 	
@@ -112,9 +116,25 @@ 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
-					arriveBb.setNnum(dhjydItems[0].getNchecknum());//主数量
-					arriveBb.setNastnum(dhjydItems[0].getNchecknum());//辅数量
+					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));//辅数量
 					arriveBb.setStatus(2);//新增(0:初始  1:更新  2:新增  3:删除)
+					arriveBb.setBchanged(UFBoolean.valueOf(false));//是否改判
+					arriveBb.setBcanstore(UFBoolean.valueOf(true));//是否可入库
+					
+					// 检查结果 合格、回用、不合格
+					String def1 = dhjydItems[i].getDef1();
+					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.pk_defdoc = '" + def1 + "' AND b.code = 'checkresult'";
+					HashMap<String, String> headMap = (HashMap<String, String>) getBaseDAO().executeQuery(sql, new MapProcessor());
+					String def1Code = headMap.getOrDefault("code", "");
+					if ("01".equals(def1Code) || "02".equals(def1Code)) {
+						arriveBb.setBeligible(UFBoolean.valueOf(true));//合格
+					} else if("03".equals(def1Code)) {
+						arriveBb.setBeligible(UFBoolean.valueOf(false));//不合格
+					}
 					vos.add(arriveBb);
 				}
 			} else {