From 02dabb543b5e1699d0e1ad7d1283dd7a3beafb8e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 31 八月 2023 13:44:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 DAL/信息平台/ClsOA_ErrMsgBackBill.cs |  106 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 73 insertions(+), 33 deletions(-)

diff --git "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackBill.cs" "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackBill.cs"
index 1e9d3a6..c1314cc 100644
--- "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackBill.cs"
+++ "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackBill.cs"
@@ -125,47 +125,87 @@
             try
             {
                 //寰楀埌mainid
-                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+                //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 oCn.BeginTran();
+
+                string sql = "";
+
+                sql = "Insert Into OA_ErrMsgBackBillMain" +
+                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate,HContext,HDeptID,HDescription,HSendMan,HReceiveMan,HCopyMan,HHasten,HLevel,HReTransmitMan,HBillTypeName" +
+                ",HPlanBillNo,HMaterName,HMaterModel,HQty,HSendType) " +
+                " values(" +
+                "'" + this.BillType + 
+                "','" + this.HBillSubType + 
+                "'," + omodel.HInterID.ToString() + 
+                ",'" + omodel.HBillNo + 
+                "','" + omodel.HDate + 
+                "'," + omodel.HYear + 
+                "," + omodel.HPeriod + 
+                ",'" + omodel.HRemark + 
+                "','" + omodel.HSendMan + 
+                "',getdate()" +
+                ",'" + omodel.HContext + 
+                "'," + omodel.HDeptID.ToString() + 
+                ",'" + omodel.HDescription + 
+                "','" + omodel.HSendMan + 
+                "','" + omodel.HReceiveMan + 
+                "','" + omodel.HCopyMan + 
+                "'," + omodel.HHasten.ToString() + 
+                ",'" + omodel.HLevel + 
+                "','" + omodel.HReTransmitMan + 
+                "','" + omodel.HBillTypeName + 
+                "','" + omodel.HPlanBillNo + 
+                "','" + omodel.HMaterName + 
+                "','" + omodel.HMaterModel + 
+                "'," + omodel.HQty.ToString() + 
+                ",'" + omodel.HSendType + 
+                "') ";
                 //涓昏〃
-                oCn.RunProc("Insert Into OA_ErrMsgBackBillMain   " +
-                "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
-                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
-                ",HContext,HDeptID,HDescription,HSendMan,HReceiveMan" +
-                ",HCopyMan,HHasten,HLevel,HReTransmitMan,HBillTypeName"+
-                ",HPlanBillNo,HMaterName,HMaterModel,HQty,HSendType"+
-                ") " +
-                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
-                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
-                ",'" + omodel.HContext + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDescription + "','" + omodel.HSendMan + "','" + omodel.HReceiveMan + "'" +
-                ",'" + omodel.HCopyMan + "'," + omodel.HHasten.ToString() + ",'" + omodel.HLevel + "','" + omodel.HReTransmitMan + "','" + omodel.HBillTypeName + "'" +
-                ",'" + omodel.HPlanBillNo + "','" + omodel.HMaterName + "','" + omodel.HMaterModel + "'," + omodel.HQty.ToString() + ",'" + omodel.HSendType + "'" +
-                ") ");
-                //鎻掑叆瀛愯〃
+                oCn.RunProc(sql);
+
+                //鎻掑叆瀛愯〃1
                 foreach (Model.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
                 {
-                    oCn.RunProc("Insert into OA_ErrMsgBackBillSub " +
-                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
-                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
-                      ",HSendStatus,HSendMan,HDescription,HDate" +
-                      ") values("
-                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
-                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
-                      "," + oSub.HSendStatus.ToString() + ",'" + oSub.HSendMan + "','" + oSub.HDescription + "','" + oSub.HDate.ToShortDateString() + "'" +
-                      ") ");
+
+                    sql = "Insert into OA_ErrMsgBackBillSub" + 
+                        "(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + 
+                        ",HSendStatus,HSendMan,HDescription,HDate)" + 
+                        " values(" + 
+                        "" + omodel.HInterID.ToString() + 
+                        "," + oSub.HEntryID.ToString() + 
+                        ",'" + oSub.HCloseMan + 
+                        "','" + oSub.HEntryCloseDate.ToShortDateString() + 
+                        "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + 
+                        ",'" + oSub.HRemark + 
+                        "'," + oSub.HSourceInterID.ToString() + 
+                        "," + oSub.HSourceEntryID.ToString() + 
+                        ",'" + oSub.HSourceBillNo + 
+                        "','" + oSub.HSourceBillType + 
+                        "'," + oSub.HRelationQty.ToString() + 
+                        "," + oSub.HRelationMoney.ToString() + 
+                        "," + oSub.HSendStatus.ToString() + 
+                        ",'" + oSub.HSendMan + 
+                        "','" + oSub.HDescription + 
+                        "','" + oSub.HDate.ToShortDateString() + 
+                        "') ";
+                    oCn.RunProc(sql);
                 }
-                //
+
+                //鎻掑叆瀛愯〃2
                 foreach (Model.ClsOA_ErrMsgBackBillSub2 oSubSec in DetailColl2)
                 {
-                    oCn.RunProc("Insert into OA_ErrMsgBackBillSub2 " +
-                      " (HInterID,HEntryID" +                      
-                      ",HReceiveMan,HReadFlag" +
-                      ")" +
-                      " values("
-                      + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() +                      
-                      ",'" + oSubSec.HReceiveMan + "'," + Convert.ToString(oSubSec.HReadFlag ? 1 : 0) +
-                      ") ");
+                    sql = "Insert into OA_ErrMsgBackBillSub2" +
+                      "(HInterID,HEntryID,HReceiveMan,HReadFlag)" +
+                      " values(" +
+                      "" + omodel.HInterID.ToString() + 
+                      "," + oSubSec.HEntryID.ToString() +
+                      ",'" + oSubSec.HReceiveMan + 
+                      "'," + Convert.ToString(oSubSec.HReadFlag ? 1 : 0) +
+                      ") ";
+
+
+                    oCn.RunProc(sql);
                 }
                 //foreach (Model.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
                 //{

--
Gitblit v1.9.1