From 44648729417a911fc1939ea48cda9d06adbef367 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 三月 2025 08:56:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 DAL/销售管理/ClsXs_SeQuotationBill.cs |  271 +++++++++++++++++++++++++++++------------------------
 1 files changed, 147 insertions(+), 124 deletions(-)

diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeQuotationBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeQuotationBill.cs"
index 1426ba8..08ecffb 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeQuotationBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeQuotationBill.cs"
@@ -36,53 +36,44 @@
             {
                 //
                 oCn.BeginTran();
+                //淇濆瓨鍓嶆帶鍒�=========================================             
+                DataSet ds = oCn.RunProcReturn("Exec h_p_Xs_SeQuotationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Xs_SeQuotationBill_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;
+                }
+                //=========================================================
                 //鏇存柊涓昏〃
                 oCn.RunProc("UpDate Xs_SeQuotationBillMain set  " +
                 " HDate = '" + omodel.HDate.ToShortDateString() + "'" +
                 //============================================
-                ",HCusID =" + omodel.HCusID.ToString() +
-                ",HCusNumber ='" + omodel.HCusNumber + "'" +
+                ",HCusID =" + omodel.HCusID.ToString() +             
                 ",HLinkManID =" + omodel.HLinkManID.ToString() +
-                ",HCurID =" + omodel.HCurID.ToString() +
-                ",HCurNumber ='" + omodel.HCurNumber + "'" +
+                ",HCurID =" + omodel.HCurID.ToString() +              
                 ",HExRate =" + omodel.HExRate.ToString() +
                 ",HEmpID =" + omodel.HEmpID.ToString() +
-                ",HEmpNumber ='" + omodel.HEmpNumber + "'" +
-                ",HMangerID =" + omodel.HMangerID.ToString() +
-                ",HMangerNumber ='" + omodel.HMangerNumber + "'" +
-                ",HDeptID =" + omodel.HDeptID.ToString() +
-                ",HDeptNumber ='" + omodel.HDeptNumber + "'" +
+                ",HMangerID =" + omodel.HMangerID.ToString() +              
+                ",HDeptID =" + omodel.HDeptID.ToString() +              
                 ",HInnerBillNo = '" + omodel.HInnerBillNo + "'" +
-                ",HContractName = '" + omodel.HContractName + "'" +
                 ",HExplanation = '" + omodel.HExplanation + "'" +
                 ",HQuotationDate = '" + omodel.HQuotationDate.ToShortDateString() + "'" +
                 ",HCondition = '" + omodel.HCondition + "'" +
                 ",HQuotationStatus = '" + omodel.HQuotationStatus + "'" +
-                ",HSellSID =" + omodel.HSellSID.ToString() +
-                ",HSellSNumber ='" + omodel.HSellSNumber + "'" +
+                ",HSellSID =" + omodel.HSellSID.ToString() +            
                 ",HCarriage =" + omodel.HCarriage.ToString() +
                 ",HCommision =" + omodel.HCommision.ToString() +
                 ",HSellBonus =" + omodel.HSellBonus.ToString() +
-                ",HOtherMoney =" + omodel.HOtherMoney.ToString() +
-                ",HExportRemark1 ='" + omodel.HExportRemark1 + "'" +
-                ",HExportRemark2 ='" + omodel.HExportRemark2 + "'" +
-                ",HPackMoney =" + omodel.HPackMoney.ToString() +
-                ",HCarryBillMoney =" + omodel.HCarryBillMoney.ToString() +
-                ",HTrailerMoney =" + omodel.HTrailerMoney.ToString() +
-                ",HFileMoney =" + omodel.HFileMoney.ToString() +
-                ",HORC =" + omodel.HORC.ToString() +
-                ",HSurrogateMoney =" + omodel.HSurrogateMoney.ToString() +
-                ",HApplyMoney =" + omodel.HApplyMoney.ToString() +
-                ",HBuildMoney =" + omodel.HBuildMoney.ToString() +
-                ",HProduceAreaCard =" + omodel.HProduceAreaCard.ToString() +
+                ",HOtherMoney =" + omodel.HOtherMoney.ToString() +              
                 ",HExportOtherMoney =" + omodel.HExportOtherMoney.ToString() +
-                ",HSumMoney =" + omodel.HSumMoney.ToString() +
-                ",HArkModel = '" + omodel.HArkModel + "'" +
-                ",HArkQty =" + omodel.HArkQty.ToString() +
+                ",HSumMoney =" + omodel.HSumMoney.ToString() +              
                 //============================================
-                ",HRemark='" + omodel.HRemark + "'" +
-                ",HYear=" + omodel.HYear.ToString() +
-                ",HPeriod=" + omodel.HPeriod.ToString() +
+                ",HRemark='" + omodel.HRemark + "'" +              
                 ",HUpDater='" + omodel.HUpDater + "'" +
                 ",HUpDateDate='" + omodel.HUpDateDate + "'" +
                 " where HInterID=" + lngBillKey.ToString());
@@ -95,19 +86,33 @@
                 foreach (Model.ClsXs_SeQuotationBillSub oSub in DetailColl)
                 {
                     oCn.RunProc("Insert into Xs_SeQuotationBillSub " +
-                      " (HInterID,HEntryID,HMaterID,HMaterNumber" +
-                      ",HUnitID,HUnitNumber,HDisposeRate,HQty" +
+                      " (HInterID,HEntryID,HMaterID" +
+                      ",HUnitID,HQty" +
                       ",HPrice,HRelPrice,HRate,HAllMoney" +
-                      ",HMoney,HDate,HRemark,HType" +
-                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+                      ",HMoney,HDate,HRemark" +
+                     
                       ") values("
-                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'" +
-                      "," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HDisposeRate.ToString() + "," + oSub.HQty.ToString() +
+                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "" +
+                      "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() +
                       "," + oSub.HPrice.ToString() + "," + oSub.HRelPrice.ToString() + "," + oSub.HRate.ToString() + "," + oSub.HAllMoney.ToString() +
-                      "," + oSub.HMoney.ToString() + ",'" + oSub.HDate.ToShortDateString() + "','" + oSub.HRemark + "','" + oSub.HType + "'" +
-                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+                      "," + oSub.HMoney.ToString() + ",'" + oSub.HDate.ToShortDateString() + "','" + oSub.HRemark + "'" +                   
                       ") ");
                 }
+                //=========================淇濆瓨鍚庢帶鍒�  
+                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Xs_SeQuotationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Xs_SeQuotationBill_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;
@@ -128,51 +133,69 @@
                 omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 oCn.BeginTran();
+                //淇濆瓨鍓嶆帶鍒�=========================================  
+                DataSet ds = oCn.RunProcReturn("Exec h_p_Xs_SeQuotationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Xs_SeQuotationBill_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;
+                }
+                //=========================================================
+
                 //涓昏〃
-                oCn.RunProc("Insert Into Xs_SeQuotationBillMain   " +
-                "(HBillType,HInterID,HBillNo,HDate" +
-                ",HYear,HPeriod,HMaker,HMakeDate" +
-                ",HCusID,HCusNumber,HLinkManID,HCurID,HCurNumber" +
-                ",HExRate,HEmpID,HEmpNumber,HMangerID,HMangerNumber" +
-                ",HDeptID,HDeptNumber,HContractName,HQuotationDate" +
-                ",HCondition,HQuotationStatus,HSellSID,HSellSNumber" +
-                ",HCarriage,HCommision,HSellBonus,HOtherMoney" +
-                ",HExportRemark1,HExportRemark2,HPackMoney,HCarryBillMoney" +
-                ",HTrailerMoney,HFileMoney,HORC,HSurrogateMoney" +
-                ",HApplyMoney,HBuildMoney,HProduceAreaCard,HExportOtherMoney" +
-                ",HSumMoney,HArkModel,HArkQty" +
-                ",HExplanation,HInnerBillNo,HRemark" +
-                ") " +
-                " values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
-                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
-                "," + omodel.HCusID.ToString() + ",'" + omodel.HCusNumber + "'," + omodel.HLinkManID.ToString() + "," + omodel.HCurID.ToString() + ",'" + omodel.HCurNumber + "'" +
-                "," + omodel.HExRate.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HEmpNumber + "'," + omodel.HMangerID.ToString() + ",'" + omodel.HMangerNumber + "'" +
-                "," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber + "','" + omodel.HContractName + "','" + omodel.HQuotationDate.ToShortDateString() + "'" +
-                ",'" + omodel.HCondition + "','" + omodel.HQuotationStatus + "'," + omodel.HSellSID.ToString() + ",'" + omodel.HSellSNumber + "'" +
-                "," + omodel.HCarriage.ToString() + "," + omodel.HCommision.ToString() + "," + omodel.HSellBonus.ToString() + "," + omodel.HOtherMoney.ToString() +
-                ",'" + omodel.HExportRemark1 + "','" + omodel.HExportRemark2 + "'," + omodel.HPackMoney.ToString() + "," + omodel.HCarryBillMoney.ToString() +
-                "," + omodel.HTrailerMoney.ToString() + "," + omodel.HFileMoney.ToString() + "," + omodel.HORC.ToString() + "," + omodel.HSurrogateMoney.ToString() +
-                "," + omodel.HApplyMoney.ToString() + "," + omodel.HBuildMoney.ToString() + "," + omodel.HProduceAreaCard.ToString() + "," + omodel.HExportOtherMoney.ToString() +
-                "," + omodel.HSumMoney.ToString() + ",'" + omodel.HArkModel + "'," + omodel.HArkQty.ToString() +
-                ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HRemark + "'" +
-                ") ");
+                oCn.RunProc("Insert Into Xs_SeQuotationBillMain " +
+                   "(HBillType, HInterID, HBillNo, HDate" +
+                   ", HYear, HPeriod, HMaker, HMakeDate" +
+                   ", HCusID, HLinkManID, HCurID" +
+                   ", HExRate, HEmpID, HMangerID" +
+                   ", HDeptID, HExplanation, HInnerBillNo, HContractName" +
+                   ", HQuotationDate, HCondition, HQuotationStatus, HSellSID" +
+                   ", HCarriage, HCommision, HSellBonus, HOtherMoney" +
+                   ", HExportOtherMoney, HSumMoney, HOrgID) " +
+                   "values('" + this.BillType + "', '" + omodel.HInterID + "', '" + omodel.HBillNo + "', '" + omodel.HDate.ToShortDateString() + "'" +
+                   ", '" + omodel.HYear + "', '" + omodel.HPeriod + "', '" + DBUtility.ClsPub.CurUserName + "', getdate()" +
+                   ", '" + omodel.HCusID + "', '" + omodel.HLinkManID + "', '" + omodel.HCurID + "'" +
+                   ", '" + omodel.HExRate + "', '" + omodel.HEmpID + "', '" + omodel.HMangerID + "'" +
+                   ", '" + omodel.HDeptID + "', '" + omodel.HExplanation + "', '" + omodel.HInnerBillNo + "', '" + omodel.HContractName + "'" +
+                   ", '" + omodel.HQuotationDate.ToShortDateString() + "', '" + omodel.HCondition + "', '" + omodel.HQuotationStatus + "', '" + omodel.HSellSID + "'" +
+                   ", '" + omodel.HCarriage + "', '" + omodel.HCommision + "', '" + omodel.HSellBonus + "', '" + omodel.HOtherMoney + "'" +
+                   ", '" + omodel.HExportOtherMoney + "', '" + omodel.HSumMoney + "', '" + omodel.HOrgID + "')");
                 //鎻掑叆瀛愯〃
                 foreach (Model.ClsXs_SeQuotationBillSub oSub in DetailColl)
                 {
                     oCn.RunProc("Insert into Xs_SeQuotationBillSub " +
-                      " (HInterID,HEntryID,HMaterID,HMaterNumber" +
-                      ",HUnitID,HUnitNumber,HDisposeRate,HQty" +
-                      ",HPrice,HRelPrice,HRate,HAllMoney" +
-                      ",HMoney,HDate,HRemark,HType" +
-                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
-                      ") values("
-                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'" +
-                      "," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HDisposeRate.ToString() + "," + oSub.HQty.ToString() +
-                      "," + oSub.HPrice.ToString() + "," + oSub.HRelPrice.ToString() + "," + oSub.HRate.ToString() + "," + oSub.HAllMoney.ToString() +
-                      "," + oSub.HMoney.ToString() + ",'" + oSub.HDate.ToShortDateString() + "','" + oSub.HRemark + "','" + oSub.HType + "'" +
-                      ",'" + oSub.HSourceInterID + "','" + oSub.HSourceEntryID + "','" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
-                      ") ");
+                       " (HInterID,HEntryID,HMaterID" +
+                       ",HUnitID,HQty" +
+                       ",HPrice,HRelPrice,HRate,HAllMoney" +
+                       ",HMoney,HDate,HRemark" +
+
+                       ") values("
+                       + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "" +
+                       "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() +
+                       "," + oSub.HPrice.ToString() + "," + oSub.HRelPrice.ToString() + "," + oSub.HRate.ToString() + "," + oSub.HAllMoney.ToString() +
+                       "," + oSub.HMoney.ToString() + ",'" + oSub.HDate.ToShortDateString() + "','" + oSub.HRemark + "'" +
+                       ") ");
                 }
+                //=========================淇濆瓨鍚庢帶鍒�  
+                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Xs_SeQuotationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Xs_SeQuotationBill_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;
@@ -206,44 +229,44 @@
                 //=================
                 omodel.HRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                 omodel.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"]);
-                omodel.HCusNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusNumber"]);
-                omodel.HLinkManID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HLinkManID"]);
+                //omodel.HCusNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusNumber"]);
+                omodel.HLinkManID = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLinkManID"]);
                 omodel.HCurID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCurID"]);
-                omodel.HCurNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCurNumber"]);
+                //omodel.HCurNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCurNumber"]);
                 omodel.HExRate = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HExRate"]);
                 omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
-                omodel.HEmpNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HEmpNumber"]);
+                //omodel.HEmpNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HEmpNumber"]);
                 omodel.HMangerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMangerID"]);
-                omodel.HMangerNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMangerNumber"]);
+                //omodel.HMangerNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMangerNumber"]);
                 omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
-                omodel.HDeptNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeptNumber"]);
+                //omodel.HDeptNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeptNumber"]);
                 omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
-                omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
-                omodel.HInnerBillNo2 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo2"]);
-                omodel.HContractName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HContractName"]);
-                omodel.HQuotationDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HQuotationDate"]);
-                omodel.HCondition = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCondition"]);
-                omodel.HQuotationStatus = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HQuotationStatus"]);
-                omodel.HSellSID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSellSID"]);
-                omodel.HCarriage = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HCarriage"]);
-                omodel.HCommision = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HCommision"]);
-                omodel.HSellBonus = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSellBonus"]);
-                omodel.HOtherMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HOtherMoney"]);
-                omodel.HExportRemark1 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExportRemark1"]);
-                omodel.HExportRemark2 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExportRemark2"]);
-                omodel.HPackMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HPackMoney"]);
-                omodel.HCarryBillMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HCarryBillMoney"]);
-                omodel.HTrailerMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HTrailerMoney"]);
-                omodel.HFileMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HFileMoney"]);
-                omodel.HORC = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HORC"]);
-                omodel.HSurrogateMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSurrogateMoney"]);
-                omodel.HApplyMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HApplyMoney"]);
-                omodel.HBuildMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HBuildMoney"]);
-                omodel.HProduceAreaCard = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HProduceAreaCard"]);
-                omodel.HExportOtherMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HExportOtherMoney"]);
-                omodel.HSumMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSumMoney"]);
-                omodel.HArkModel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HArkModel"]);
-                omodel.HArkQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HArkQty"]);
+                //omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
+                //omodel.HInnerBillNo2 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo2"]);
+                //omodel.HContractName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HContractName"]);
+                //omodel.HQuotationDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HQuotationDate"]);
+                //omodel.HCondition = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCondition"]);
+                //omodel.HQuotationStatus = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HQuotationStatus"]);
+                //omodel.HSellSID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSellSID"]);
+                //omodel.HCarriage = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HCarriage"]);
+                //omodel.HCommision = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HCommision"]);
+                //omodel.HSellBonus = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSellBonus"]);
+                //omodel.HOtherMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HOtherMoney"]);
+                //omodel.HExportRemark1 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExportRemark1"]);
+                //omodel.HExportRemark2 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExportRemark2"]);
+                //omodel.HPackMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HPackMoney"]);
+                //omodel.HCarryBillMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HCarryBillMoney"]);
+                //omodel.HTrailerMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HTrailerMoney"]);
+                //omodel.HFileMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HFileMoney"]);
+                //omodel.HORC = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HORC"]);
+                //omodel.HSurrogateMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSurrogateMoney"]);
+                //omodel.HApplyMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HApplyMoney"]);
+                //omodel.HBuildMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HBuildMoney"]);
+                //omodel.HProduceAreaCard = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HProduceAreaCard"]);
+                //omodel.HExportOtherMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HExportOtherMoney"]);
+                //omodel.HSumMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSumMoney"]);
+                //omodel.HArkModel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HArkModel"]);
+                //omodel.HArkQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HArkQty"]);
                 //
                 omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
                 omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
@@ -268,26 +291,26 @@
                     oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"].ToString());
                     //
                     oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
-                    oSub.HMaterNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMaterNumber"]);
+                    //oSub.HMaterNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMaterNumber"]);
                     oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
-                    oSub.HUnitNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HUnitNumber"]);
-                    oSub.HDisposeRate = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HDisposeRate"]);
-                    oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
-                    oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
-                    oSub.HRelPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelPrice"]);
-                    oSub.HRate = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRate"]);
-                    oSub.HAllMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HAllMoney"]);
-                    oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
-                    oSub.HDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HDate"]);
-                    oSub.HRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRemark"]);
-                    oSub.HType = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HType"]);
+                    //oSub.HUnitNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HUnitNumber"]);
+                    //oSub.HDisposeRate = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HDisposeRate"]);
+                    //oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
+                    //oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
+                    //oSub.HRelPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelPrice"]);
+                    //oSub.HRate = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRate"]);
+                    //oSub.HAllMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HAllMoney"]);
+                    //oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
+                    //oSub.HDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HDate"]);
+                    //oSub.HRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRemark"]);
+                    //oSub.HType = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HType"]);
                     //
                     oSub.HSourceInterID = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceInterID"].ToString());
                     oSub.HSourceEntryID = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceEntryID"].ToString());
                     oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
                     oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
-                    oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"].ToString());
-                    oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"].ToString());
+                    //oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"].ToString());
+                    //oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"].ToString());
                     DetailColl.Add(oSub);
                 }
                 sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
@@ -332,7 +355,7 @@
                 omodel.HRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                 omodel.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"]);
                 omodel.HCusNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusNumber"]);
-                omodel.HLinkManID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HLinkManID"]);
+                omodel.HLinkManID = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLinkManID"]);
                 omodel.HCurID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCurID"]);
                 omodel.HCurNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCurNumber"]);
                 omodel.HExRate = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HExRate"]);

--
Gitblit v1.9.1