From 64c68e8220ef2f59c0487c91954155d1e9dec49f Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 02 七月 2024 15:41:06 +0800
Subject: [PATCH] 修复批量保存报错

---
 WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index 0a94916..528228b 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -631,7 +631,7 @@
         #region 鎻愪氦淇濆瓨锛屽瓨涓诲瓙琛ㄥ強鏄庣粏琛�
         [Route("Sc_QualityReportBill/set_SaveBill")]
         [HttpGet]
-        public object set_SaveBill(long HInterID,string HBillNo, string HChecker,string HBadReasonHQty)
+        public object set_SaveBill(long HInterID,string HBillNo, string HChecker)
         {
             try
             {
@@ -658,8 +658,18 @@
                     return objJsonResult;
                 }
                 //=========================================================
-                //淇濆瓨
-                oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID+",'"+ HBadReasonHQty +"'");
+                //淇濆瓨  鎵归噺淇濆瓨鍏堢湅瀛愯〃鏄惁鏈夋暟鎹�,鏈夋暟鎹氨杩� 瀛樺叆涓昏〃  鏄庣粏琛�    娌℃湁灏卞瓨鍌ㄤ富瀛愭槑缁嗚〃
+                string sql = "select * from Sc_QualityReportBillSub where HInterID = '" + HInterID + "'";
+                ds = oCN.RunProcReturn(sql, "Sc_QualityReportBillSub");
+                if (ds.Tables[0].Rows.Count>0)
+                {
+                    oCN.RunProc("exec h_p_save_Sc_QualityReportBillSum " + HInterID + "");
+                }
+                else
+                {
+                    oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID + "");
+                }
+                
                 //鍒ゆ柇鏄惁鍏佽淇濆瓨锛屼笉鍏佽鍒欏洖婊�
                 ds = oCN.RunProcReturn("exec h_p_JIT_ICMOBillQualityStatus_SaveCtrl", "h_p_JIT_ICMOBillQualityStatus_SaveCtrl");
                 if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
@@ -780,7 +790,7 @@
                     string subSql = "Insert into Sc_QualityReportBillSub " +
                  " (HInterID,HEntryID,HBillNo_bak,HRemark" +
                  ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
-                 ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" +
+                 ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID,HBadReasonNumber,HGroupID" +
                  ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
                  ",HBarCode,HReportType" +
                  ",HAddr,HMaker,HMakeDate" +
@@ -803,6 +813,8 @@
                  "," + oSub.HEmpID.ToString() + "" +
                  "," + oSub.HSourceID.ToString() + "" +
                  "," + oSub.HBadReasonID.ToString() + "" +
+                 ",'" + oSub.HBadReasonNumber.ToString() + "'" +
+                 ",'" + oSub.HGroupID.ToString() + "'" +
 
                  "," + oSub.HICMOInterID.ToString() + "" +
                  "," + oSub.HICMOEntryID.ToString() + "" +
@@ -810,9 +822,9 @@
                  "," + oSub.HProcExchInterID + "" +
                  "," + oSub.HProcExchEntryID + "" +
                  ",'" + oSub.HProcExchBillNo + "'" +
-                 ",'" + oSub.HBarCode + "'" +
+                 ",'" + oSub.HBadReasonNumber.ToString() + "'" +
 
-                 ",'" + 3 +
+                 ",'" + 1 +
                  "','" + oSub.HAddr + "'" +
                  ",'" + msg4 + "'" +
                  ",'" + oSub.HMakeDate.ToShortDateString() + "'" +

--
Gitblit v1.9.1