From fe7e285ea4e863e6196bebdf73895faef002dada Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 25 八月 2023 17:16:08 +0800
Subject: [PATCH] PDA异常反馈单及列表
---
DAL/生产管理/ClsSc_ICMOReportBill.cs | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOReportBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOReportBill.cs"
index a45df6f..fd2ce4b 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOReportBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOReportBill.cs"
@@ -38,6 +38,22 @@
{
try
{
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_ICMOReportBill_BeforeSaveCtrl " + lngBillKey.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Sc_ICMOReport_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+
//
DataSet Ds;
oCn.BeginTran();
@@ -125,6 +141,25 @@
// return false;
// }
//}
+
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_ICMOReportBill_AfterSaveCtrl " + lngBillKey.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Sc_ICMOReportBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -145,7 +180,7 @@
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//淇濆瓨鍓嶆帶鍒�=========================================
string HBillNote = "";
- DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_ICMOReport_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "' ", "h_p_Sc_ICMOReport_BeforeSaveCtrl");
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_ICMOReportBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sc_ICMOReport_BeforeSaveCtrl");
if (ds == null)
{
sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
@@ -205,10 +240,10 @@
//
//=========================淇濆瓨鍚庢帶鍒�
- DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_ICMOReportBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "' ", "h_p_Sc_ICMOReportBill_AfterSaveCtrl");
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_ICMOReportBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sc_ICMOReportBill_AfterSaveCtrl");
if (ds2 == null)
{
- sReturn = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
oCn.RollBack();
return false;
}
@@ -338,7 +373,7 @@
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
try
{
- oCn.BeginTran();
+ oCn.BeginTran();//h_p_Sc_ICMOReportBill_BeforeDeleteCtrl
DataSet Ds = oCn.RunProcReturn("exec h_p_Sc_ICMOReportBill_Delete " + lngBillKey + ",'" + HBillNo + "','" + BillType + "','" + HERPMode + "','" + HUpdateSourceInterID + "'", "h_p_Sc_ICMOReportBill_Delete");
if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
--
Gitblit v1.9.1