From da84e4e72c9d9cc7e2bd40dc4bb7b3222ca3519a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 28 四月 2026 17:07:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 db8a236..3349c7f 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"
@@ -247,8 +247,9 @@
BillNew.HMaker = mainList[0].HMaker;
BillNew.HMakeDate = mainList[0].HMakeDate;
BillNew.HReportType = mainList[0].HReportType;
- BillNew.HSourceBillNo = mainList[0].HICMOBillNo;
- BillNew.HSourceInterID = mainList[0].HICMOInterID;
+ BillNew.HSourceBillNo = mainList[0].HSourceBillNo;
+ BillNew.HSourceInterID = mainList[0].HSourceInterID;
+ BillNew.HSourceEntryID = mainList[0].HSourceEntryID;
BillNew.HSourceBillType = mainList[0].HSourceBillType;
BillNew.HBadReasonHQty = mainList[0].HBadReasonHQty;
BillNew.HQty = DBUtility.ClsPub.isLong(mainList[0].HQty);
@@ -265,7 +266,7 @@
",'" + BillNew.HProcExchBillNo + "'," + BillNew.HProcExchInterID + "," + BillNew.HProcExchEntryID + "," + BillNew.HProcID + "," + BillNew.HMaterID +
"," + BillNew.HSourceID + "," + BillNew.HGroupID + "," + BillNew.HDeptID + "," + BillNew.HCheckManID + "," + BillNew.HBadReasonID + ",'" + BillNew.HBarCode + "'" +
",'" + BillNew.HMaker + "','" + BillNew.HMakeDate + "','" + BillNew.HBillType + "','" + +BillNew.HReportType + "','" +BillNew.HSourceBillNo + "'" +
- "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HICMOEntryID + "," + BillNew.HBadReasonHQty + "," + BillNew.HQty +
+ "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HSourceEntryID + "," + BillNew.HBadReasonHQty + "," + BillNew.HQty +
") ");
sReturn = "鎵爜鎴愬姛锛�";
oCN.Commit();
@@ -531,7 +532,7 @@
{
ds = oCN.RunProcReturn(
"Select a.HItemID,a.HInterID,b.HNumber HBadReasonNumber,b.HName HBadReasonHName" +
- ",c.HName HCheckMan,d.HName HGroupName,e.HName HSourceName " +
+ ",c.HName HCheckMan,d.HName HGroupName,e.HName HSourceName,a.HBadReasonID,a.HBadReasonHQty,a.HQty " +
" from Sc_ICMOBillQualityStatus_Tmp a " +
" left join Gy_BadReason b on a.HBadReasonID = b.HItemID " +
" left join Gy_Employee c on a.HCheckManID = c.HItemID " +
@@ -697,6 +698,7 @@
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨鍚庡垽鏂け璐ワ紒";
@@ -705,6 +707,7 @@
}
if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
--
Gitblit v1.9.1