From c0cee04d997030777bd85d198d82cc2567f4773f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 02 二月 2024 18:18:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/销售管理/ClsXs_ExceptiveCheckRequestBill.cs | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 da15e29..0c9bcd1 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"
@@ -64,6 +64,7 @@
",HOrgID=" + omodel.HOrgID +
",HSendQty=" + omodel.HSendQty +
",HLastSendDate='" + omodel.HLastSendDate + "'" +
+ ",HPlanPayDate='" + omodel.HPlanPayDate + "'" +
",HCreditRating_Q=" + omodel.HCreditRating_Q +
",HMaxCreditRating_Q=" + omodel.HMaxCreditRating_Q +
" where HInterID=" + lngBillKey.ToString();
@@ -120,7 +121,7 @@
"(" +
"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" +
+ ",HDeptID,HEmpID,HCurID,HExRate,HCusID,HManagerID,HReason,HSendMoney,HLeftMoney,HOrgID,HSendQty,HLastSendDate,HPlanPayDate,HCreditRating_Q,HMaxCreditRating_Q" +
") " +
" values('" +
this.BillType +
@@ -149,6 +150,7 @@
"," + omodel.HOrgID +
"," + omodel.HSendQty +
",'" + omodel.HLastSendDate + "'" +
+ ",'" + omodel.HPlanPayDate + "'" +
"," + omodel.HCreditRating_Q +
"," + omodel.HMaxCreditRating_Q +
")";
@@ -218,6 +220,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"]);
@@ -232,6 +239,8 @@
omodel.HSendQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSendQty"]);
omodel.HLastSendDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HLastSendDate"]);
+ omodel.HPlanPayDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HPlanPayDate"]);
+
omodel.HCreditRating_Q = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HCreditRating_Q"]);
omodel.HMaxCreditRating_Q = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HMaxCreditRating_Q"]);
//
--
Gitblit v1.9.1