From 14ae0e21c8660dbb3ac20a5b0d9db9b6dde3cfb9 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 25 三月 2026 17:07:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/ClsWL_YayBillMain.cs | 136 ++++++++++++++++-----------------------------
1 files changed, 49 insertions(+), 87 deletions(-)
diff --git a/DAL/ClsWL_YayBillMain.cs b/DAL/ClsWL_YayBillMain.cs
index 280fe75..5a7a9f1 100644
--- a/DAL/ClsWL_YayBillMain.cs
+++ b/DAL/ClsWL_YayBillMain.cs
@@ -63,7 +63,7 @@
//淇濆瓨鍓嶆帶鍒�=========================================
string HBillNote = "";
- DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
+ DataSet ds = oCn.RunProcReturn("Exec h_p_WL_YayBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
if (ds == null)
{
sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
@@ -175,7 +175,7 @@
}
//=========================淇濆瓨鍚庢帶鍒�
- DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_WL_YayBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
if (ds2 == null)
@@ -213,7 +213,7 @@
//淇濆瓨鍓嶆帶鍒�=========================================
string HBillNote = "";
- DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
+ DataSet ds = oCn.RunProcReturn("Exec h_p_WL_YayBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
if (ds == null)
{
sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
@@ -231,95 +231,57 @@
// 鑾峰彇褰撳墠鏃ユ湡鏃堕棿锛岀敤浜庣┖鏃ユ湡瀛楁鐨勯粯璁ゅ��
// 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
string currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- string safeDateTime = "2000-01-01";
+ string safeDateTime = "null";
// 杈呭姪鏂规硶锛氬畨鍏ㄨ浆鎹负瀛楃涓诧紝澶勭悊null鍜岀┖瀛楃涓�
-
-
string sql = "Insert Into WL_YayBillMain " +
"(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus," +
- "HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HRemark,HBacker,HBackDate," +
- "HBackRemark,HChecker,HCheckDate,HMaker,HMakeDate,HUpDater,HUpDateDate," +
- "HCloseMan,HCloseDate,HCloseType,HDeleteMan,HDeleteDate," +
- "HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo," +
- "HPrintQty,HOrgID,HCusID,HBeginAddr,HEndAddr,HPickAddr," +
- "HArriverAddr,HTransType,HCarTypeID,HCarTypeMaxVolume,HTotalVolume," +
+ "HRemark,HMaker,HMakeDate,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo," +
+ "HOrgID,HCusID,HBeginAddr,HEndAddr,HPickAddr,HArriverAddr,HTransType,HCarTypeID,HCarTypeMaxVolume,HTotalVolume," +
"HLoadingRate,HContractTransportInterID,HContractTransportEntryID," +
"HContractTransportBillNo,HCarrierID,HDistance,HTransportTimes," +
"HTransportTyep,HSSID,HCurID,HMoney,HDateForRequestedPick," +
- "HDataForRequestedArrived,HCarryStatus,HDate_CarrierSure," +
- "HDate_AllocationDriver,HCarID,HDriverID,HSurer_Arrive,HDate_Arrive," +
- "HSurer_Pick,HDate_Pick,HSurer_Trans,HDate_Trans,HSurer_Receive,HExRate," +
- "HDate_Receive,HSurer_Accounting,HDate_Accounting) " +
- "values(" +
- SafeInt(omodel.HInterID.ToString(), 0) + "," + // HInterID
- "0,0," + // HYear, HPeriod - 闇�瑕佷粠HDate璁＄畻锛岃繖閲屽厛缁�0
- "'" + SafeString(this.BillType) + "'," +
- "'" + SafeString(this.HBillSubType) + "'," +
- SafeDateTime(omodel.HDate.ToString(), "'" + currentDateTime + "'") + "," +
- "'" + SafeString(omodel.HBillNo) + "'," +
- SafeInt(omodel.HBillStatus.ToString(), 1) + "," + // HBillStatus
- SafeInt(omodel.HCheckItemNowID.ToString(), 0) + "," + // HCheckItemNowID
- SafeInt(omodel.HCheckItemNextID.ToString(), 0) + "," + // HCheckItemNextID
- SafeInt(omodel.HCheckFlowID.ToString(), 0) + "," + // HCheckFlowID
- "'" + SafeString(omodel.HRemark) + "'," +
- "'" + SafeString(omodel.HBacker) + "'," +
- SafeDateTime(omodel.HBackDate?.ToString(), "NULL") + "," +
- "'" + SafeString(omodel.HBackRemark) + "'," +
- "'" + SafeString(omodel.HChecker) + "'," +
- SafeDateTime(omodel.HCheckDate?.ToString(), "NULL") + "," +
- "'" + SafeString(omodel.HMaker) + "',getdate()," + // HMaker, HMakeDate
- "'" + SafeString(omodel.HUpDater) + "'," +
- SafeDateTime(omodel.HUpDateDate?.ToString(), "NULL") + "," +
- "'" + SafeString(omodel.HCloseMan) + "'," +
- SafeDateTime(omodel.HCloseDate?.ToString(), "NULL") + "," +
- (omodel.HCloseType.ToString() == "1" ? "1" : "0") + "," + // HCloseType
- "'" + SafeString(omodel.HDeleteMan) + "'," +
- SafeDateTime(omodel.HDeleteDate?.ToString(), "NULL") + "," +
- "'" + SafeString(omodel.HMainSourceBillType) + "'," +
- SafeInt(omodel.HMainSourceInterID.ToString(), 0) + "," + // HMainSourceInterID
- SafeInt(omodel.HMainSourceEntryID.ToString(), 0) + "," + // HMainSourceEntryID
- "'" + SafeString(omodel.HMainSourceBillNo) + "'," +
- SafeInt(omodel.HPrintQty.ToString(), 0) + "," + // HPrintQty
- SafeInt(omodel.HOrgID.ToString(), 0) + "," + // HOrgID
- SafeInt(omodel.HCusID?.ToString(), 0) + "," + // HCusID
- SafeInt(omodel.HBeginAddr?.ToString(), 0) + "," + // HBeginAddr
- SafeInt(omodel.HEndAddr?.ToString(), 0) + "," + // HEndAddr
- "'" + SafeString(omodel.HPickAddr) + "'," +
- "'" + SafeString(omodel.HArriverAddr) + "'," +
- "'" + SafeString(omodel.HTransType) + "'," +
- SafeInt(omodel.HCarTypeID?.ToString(), 0) + "," + // HCarTypeID
- SafeDecimal(omodel.HCarTypeMaxVolume?.ToString(), 0) + "," + // HCarTypeMaxVolume
- SafeDecimal(omodel.HTotalVolume?.ToString(), 0) + "," + // HTotalVolume
- SafeDecimal(omodel.HLoadingRate?.ToString(), 0) + "," + // HLoadingRate
- SafeInt(omodel.HContractTransportInterID?.ToString(), 0) + "," + // HContractTransportInterID
- SafeInt(omodel.HContractTransportEntryID?.ToString(), 0) + "," + // HContractTransportEntryID
- "'" + SafeString(omodel.HContractTransportBillNo) + "'," +
- SafeInt(omodel.HCarrierID?.ToString(), 0) + "," + // HCarrierID
- SafeDecimal(omodel.HDistance?.ToString(), 0) + "," + // HDistance
- SafeDecimal(omodel.HTransportTimes?.ToString(), 0) + "," + // HTransportTimes
- "'" + SafeString(omodel.HTransportTyep) + "'," +
- SafeInt(omodel.HSSID?.ToString(), 0) + "," + // HSSID
- SafeInt(omodel.HCurID?.ToString(), 0) + "," + // HCurID
- SafeDecimal(omodel.HMoney?.ToString(), 0) + "," + // HMoney
- SafeDateTime(omodel.HDateForRequestedPick?.ToString(), "'" + currentDateTime + "'") + "," +
- SafeDateTime(omodel.HDataForRequestedArrived?.ToString(), "'" + currentDateTime + "'") + "," +
- SafeInt(omodel.HCarryStatus?.ToString(), 1) + "," + // HCarryStatus
- SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + safeDateTime + "'") + "," +
- SafeDateTime(omodel.HDate_AllocationDriver?.ToString(), "'" + currentDateTime + "'") + "," +
- SafeInt(omodel.HCarID?.ToString(), 0) + "," + // HCarID
- SafeInt(omodel.HDriverID?.ToString(), 0) + "," + // HDriverID
- "'" + SafeString(omodel.HSurer_Arrive) + "'," +
- SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + safeDateTime + "'") + "," +
- "'" + SafeString(omodel.HSurer_Pick) + "'," +
- SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + safeDateTime + "'") + "," +
- "'" + SafeString(omodel.HSurer_Trans) + "'," +
- SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + safeDateTime + "'") + "," +
- "'" + SafeString(omodel.HSurer_Receive) + "'," +
- "'" + omodel.HExRate + "'," +
- SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + safeDateTime + "'") + "," +
- "'" + SafeString(omodel.HSurer_Accounting) + "'," +
- SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + safeDateTime + "'") + ")";
-
+ "HDataForRequestedArrived,HExRate" +
+ ") values(" +
+ "" + omodel.HInterID + "" +
+ "," + "year(getdate())" + "" +
+ "," + "month(getdate())" + "" +
+ ",'" + this.BillType + "'" +
+ ",'" + this.HBillSubType + "'" +
+ ",'" + omodel.HDate + "'" +
+ ",'" + omodel.HBillNo + "'" +
+ "," + 1 + "" +
+ ",'" + omodel.HRemark + "'" +
+ ",'" + omodel.HMaker + "'" +
+ "," + "getdate()" + "" +
+ ",'" + omodel.HMainSourceBillType + "'" +
+ ",'" + omodel.HMainSourceInterID + "'" +
+ ",'" + omodel.HMainSourceEntryID + "'" +
+ ",'" + omodel.HMainSourceBillNo + "'" +
+ ",'" + omodel.HOrgID + "'" +
+ ",'" + omodel.HCusID + "'" +
+ ",'" + omodel.HBeginAddr + "'" +
+ ",'" + omodel.HEndAddr + "'" +
+ ",'" + omodel.HPickAddr + "'" +
+ ",'" + omodel.HArriverAddr + "'" +
+ ",'" + omodel.HTransType + "'" +
+ ",'" + omodel.HCarTypeID + "'" +
+ ",'" + omodel.HCarTypeMaxVolume + "'" +
+ ",'" + omodel.HTotalVolume + "'" +
+ ",'" + omodel.HLoadingRate + "'" +
+ ",'" + omodel.HContractTransportInterID + "'" +
+ ",'" + omodel.HContractTransportEntryID + "'" +
+ ",'" + omodel.HContractTransportBillNo + "'" +
+ ",'" + omodel.HCarrierID + "'" +
+ ",'" + omodel.HDistance + "'" +
+ ",'" + omodel.HTransportTimes + "'" +
+ ",'" + omodel.HTransportTyep + "'" +
+ ",'" + omodel.HSSID + "'" +
+ ",'" + omodel.HCurID + "'" +
+ ",'" + omodel.HMoney + "'" +
+ ",'" + omodel.HDateForRequestedPick + "'" +
+ ",'" + omodel.HDataForRequestedArrived + "'" +
+ ",'" + omodel.HExRate + "'" +
+ ")";
oCn.RunProc(sql);
//涓昏〃
//鎻掑叆瀛愯〃
@@ -359,7 +321,7 @@
oCn.RunProc(sql);
}
//=========================淇濆瓨鍚庢帶鍒�
- DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_WL_YayBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
if (ds2 == null)
{
--
Gitblit v1.9.1