From 170dc25004f6d0a22add0d71fdec602545902999 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 11 十一月 2025 10:38:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs b/WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs
index 8d4ef40..fc5ec30 100644
--- a/WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs
+++ b/WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs
@@ -1039,6 +1039,9 @@
if (!tb2.Columns.Contains("澶辨晥楠岃瘉鏂规硶"))
error += "娌℃湁鎵惧埌銆愬け鏁堥獙璇佹柟娉曘�戠殑鏍囬,";
+ if (!tb2.Columns.Contains("闃查敊缁撴灉"))
+ error += "娌℃湁鎵惧埌銆愰槻閿欑粨鏋溿�戠殑鏍囬,";
+
if (!tb2.Columns.Contains("琛ㄤ綋澶囨敞"))
error += "娌℃湁鎵惧埌銆愯〃浣撳娉ㄣ�戠殑鏍囬,";
@@ -1267,6 +1270,7 @@
string HPreventErrNote = item["闃查敊鍔熻兘"].ToString();
string HLoseMode = item["澶辨晥妯″紡"].ToString();
string HLoseCheck = item["澶辨晥楠岃瘉鏂规硶"].ToString();
+ string HPreventErrResult = item["闃查敊缁撴灉"].ToString();
ds = oCN.RunProcReturn("select * from Gy_MaterPreventErrMouldBillMain where HBillNo='" + HBillNo + "'", "Gy_MaterPreventErrMouldBillMain");
@@ -1294,7 +1298,7 @@
//鎻掑叆瀛愯〃
oCN.RunProc("insert into Gy_MaterPreventErrMouldBillSub " +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
- ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck) " +
+ ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HPreventErrResult) " +
" values(" +
"" + HInterID.ToString() +
"," + 1 +
@@ -1307,6 +1311,7 @@
"','" + HPreventErrNote +
"','" + HLoseMode +
"','" + HLoseCheck +
+ "','" + HPreventErrResult +
"')");
}
else
@@ -1322,7 +1327,7 @@
//鎻掑叆瀛愯〃
oCN.RunProc("insert into Gy_MaterPreventErrMouldBillSub " +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
- ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck) " +
+ ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HPreventErrResult) " +
" values(" +
"" + HInterID.ToString() +
"," + HEntryID +
@@ -1335,6 +1340,7 @@
"','" + HPreventErrNote +
"','" + HLoseMode +
"','" + HLoseCheck +
+ "','" + HPreventErrResult +
"')");
}
--
Gitblit v1.9.1