From f66d4e7970b06a9842a9364845ea8a83c0169712 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 05 三月 2026 13:41:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/ClsWL_YayBillMain.cs | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/DAL/ClsWL_YayBillMain.cs b/DAL/ClsWL_YayBillMain.cs
index bf3cd02..280fe75 100644
--- a/DAL/ClsWL_YayBillMain.cs
+++ b/DAL/ClsWL_YayBillMain.cs
@@ -126,6 +126,7 @@
",HSurer_Trans='" + omodel.HSurer_Trans.ToString() + "'" +
",HDate_Trans='" + omodel.HDate_Trans.ToString() + "'" +
",HSurer_Receive='" + omodel.HSurer_Receive.ToString() + "'" +
+ ",HExRate='" + omodel.HExRate.ToString() + "'" +
",HDate_Receive='" + omodel.HDate_Receive.ToString() + "'" +
",HSurer_Accounting='" + omodel.HSurer_Accounting.ToString() + "'" +
",HDate_Accounting='" + omodel.HDate_Accounting.ToString() + "'" +
@@ -144,7 +145,7 @@
"(HInterID,HBillNo_bak,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HMaterID,HUnitID,HMouldID,HMouldLength,HMouldHeight,HMouldWidth" +
- ",HMouldFoldHeight,HVolume,HQty,HSNP,HMouldQty) values("
+ ",HMouldFoldHeight,HVolume,HQty,HSNP,HScatteredVolume,HMouldQty) values("
+ SafeInt(omodel.HInterID.ToString(), 0) + ",'" // HInterID int
+ SafeString(omodel.HBillNo.ToString()) + "'," // HBillNo_bak varchar(50)
+ (oSub.HEntryID) + ",'" // HEntryID int
@@ -168,6 +169,7 @@
+ (oSub.HVolume.ToString() == "" ? 0 : oSub.HVolume) + "," // HVolume dec(18,8)
+ (oSub.HQty.ToString() == "" ? 0 : oSub.HQty) + "," // HQty dec(18,8)
+ (oSub.HSNP.ToString() == "" ? 0 : oSub.HSNP) + "," // HSNP dec(18,8)
+ + (oSub.HScatteredVolume) + "," // HSNP dec(18,8)
+ (oSub.HMouldQty.ToString() == "" ? 0 : oSub.HMouldQty) + ")"; // HMouldQty dec(18,8)
oCn.RunProc(sql);
}
@@ -229,6 +231,7 @@
// 鑾峰彇褰撳墠鏃ユ湡鏃堕棿锛岀敤浜庣┖鏃ユ湡瀛楁鐨勯粯璁ゅ��
// 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
string currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ string safeDateTime = "2000-01-01";
// 杈呭姪鏂规硶锛氬畨鍏ㄨ浆鎹负瀛楃涓诧紝澶勭悊null鍜岀┖瀛楃涓�
@@ -245,7 +248,7 @@
"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," +
+ "HSurer_Pick,HDate_Pick,HSurer_Trans,HDate_Trans,HSurer_Receive,HExRate," +
"HDate_Receive,HSurer_Accounting,HDate_Accounting) " +
"values(" +
SafeInt(omodel.HInterID.ToString(), 0) + "," + // HInterID
@@ -301,20 +304,21 @@
SafeDateTime(omodel.HDateForRequestedPick?.ToString(), "'" + currentDateTime + "'") + "," +
SafeDateTime(omodel.HDataForRequestedArrived?.ToString(), "'" + currentDateTime + "'") + "," +
SafeInt(omodel.HCarryStatus?.ToString(), 1) + "," + // HCarryStatus
- SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + currentDateTime + "'") + "," +
+ 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(), "'" + currentDateTime + "'") + "," +
+ SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + safeDateTime + "'") + "," +
"'" + SafeString(omodel.HSurer_Pick) + "'," +
- SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + currentDateTime + "'") + "," +
+ SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + safeDateTime + "'") + "," +
"'" + SafeString(omodel.HSurer_Trans) + "'," +
- SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + currentDateTime + "'") + "," +
+ SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + safeDateTime + "'") + "," +
"'" + SafeString(omodel.HSurer_Receive) + "'," +
- SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + currentDateTime + "'") + "," +
+ "'" + omodel.HExRate + "'," +
+ SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + safeDateTime + "'") + "," +
"'" + SafeString(omodel.HSurer_Accounting) + "'," +
- SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + currentDateTime + "'") + ")";
+ SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + safeDateTime + "'") + ")";
oCn.RunProc(sql);
//涓昏〃
@@ -326,7 +330,7 @@
"(HInterID,HBillNo_bak,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HMaterID,HUnitID,HMouldID,HMouldLength,HMouldHeight,HMouldWidth" +
- ",HMouldFoldHeight,HVolume,HQty,HSNP,HMouldQty) values("
+ ",HMouldFoldHeight,HVolume,HQty,HSNP,HScatteredVolume,HMouldQty) values("
+ SafeInt(omodel.HInterID.ToString(), 0) + ",'" // HInterID int
+ SafeString(omodel.HBillNo.ToString()) + "'," // HBillNo_bak varchar(50)
+ (oSub.HEntryID) + ",'" // HEntryID int
@@ -350,6 +354,7 @@
+ (oSub.HVolume.ToString() == "" ? 0 : oSub.HVolume) + "," // HVolume dec(18,8)
+ (oSub.HQty.ToString() == "" ? 0 : oSub.HQty) + "," // HQty dec(18,8)
+ (oSub.HSNP.ToString() == "" ? 0 : oSub.HSNP) + "," // HSNP dec(18,8)
+ + (oSub.HScatteredVolume) + "," // HSNP dec(18,8)
+ (oSub.HMouldQty.ToString() == "" ? 0 : oSub.HMouldQty) + ")"; // HMouldQty dec(18,8)
oCn.RunProc(sql);
}
--
Gitblit v1.9.1