From 33cfe29fcdd731c3c759dcae74bdcfaeecd309ea Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 15 十一月 2023 17:57:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 DAL/销售管理/ClsXs_ExceptiveCheckRequestBill.cs |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBill.cs"
index 2dae0d1..d6db0f8 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBill.cs"
@@ -119,6 +119,7 @@
                 string mainSql = "Insert Into Xs_ExceptiveCheckRequestBillMain   " +
                 "(" +
                 "HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
                 ",HDeptID,HEmpID,HCurID,HExRate,HCusID,HManagerID,HReason,HSendMoney,HLeftMoney,HOrgID,HSendQty,HLastSendDate,HCreditRating_Q,HMaxCreditRating_Q" +
                 ") " +
                 " values('" +
@@ -132,6 +133,10 @@
                 ",'" + omodel.HRemark + "'" +
                 ",'" + DBUtility.ClsPub.CurUserName +  "'" +
                 ",getdate()" +
+                "," + omodel.HMainSourceInterID +
+                "," + omodel.HMainSourceEntryID +
+                ",'" + omodel.HMainSourceBillNo + "'" +
+                ",'" + omodel.HMainSourceBillType + "'" +
                 "," + omodel.HDeptID +
                 "," + omodel.HEmpID +
                 "," + omodel.HCurID +
@@ -213,6 +218,11 @@
                 omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
                 omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
                 omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+
+                omodel.HMainSourceInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceInterID"]);
+                omodel.HMainSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceEntryID"]);
+                omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
+                omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
                 //========================================================     
                 omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
                 omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);

--
Gitblit v1.9.1