From 033d6d49fbb0a924653c7fd3ef3700a24f37ee59 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 22 十二月 2025 16:16:41 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
index 7233fcd..16c41e9 100644
--- a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
@@ -788,6 +788,19 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
+
+                // 鍒ゆ柇鍗曟嵁鏄惁閲嶅
+                DataSet ds2 = oCN.RunProcReturn("select top 1 HInterID from QC_LastPieceCheckBillMain where HInterID=" + mainList[0].HInterID, "QC_LastPieceCheckBillMain");
+                if (ds2.Tables[0].Rows.Count > 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "姝ゅ崟鎹湁璇紒鍗曟嵁閲嶅鎻愪氦!";
+                    objJsonResult.data = 1;
+                    return objJsonResult;
+                }
+
+
                 BillNew.omodel.HYear = sYear;
                 BillNew.omodel.HPeriod = sPeriod;
                 //鍥哄畾璧嬪��=================================
@@ -820,6 +833,8 @@
                 BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
                 BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
                 BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
+                BillNew.omodel.HRemarkSN = ClsPub.isStrNull(mainList[0].HRemarkSN);
+                BillNew.omodel.HCheckQty = mainList[0].HCheckQty;
 
                 List<Model.ClsQC_LastPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillSub>>(msg3);
                 List<Model.ClsQC_LastPieceCheckBillSub_BadReason> badReasonList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillSub_BadReason>>(BadReason);
@@ -870,6 +885,8 @@
                         oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
                         oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
                         oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
+                        oSub.HInspectValQ = subList[i].HInspectValQ;
+
                         BillNew.DetailColl.Add(oSub);
                     }
                     else

--
Gitblit v1.9.1