From 56c3c9f9ba09449a1217d16b227f6ff3420a742d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 23 八月 2023 10:33:51 +0800
Subject: [PATCH] 批量确认采购订单，送货单表体新增字段（物流公司，物流单号，到货日期，箱号）
---
DAL/采购管理/ClsCg_POInStockBill.cs | 21 ++++-----------------
DAL/采购管理/ClsCg_POOrderBill.cs | 13 +++++++++++--
DAL/SCM/ClsSup_QuotePriceBill.cs | 10 +++++-----
Model/采购管理/ClsCg_POInStockBillSub.cs | 4 ++++
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/DAL/SCM/ClsSup_QuotePriceBill.cs b/DAL/SCM/ClsSup_QuotePriceBill.cs
index a0f9840..b3ea41c 100644
--- a/DAL/SCM/ClsSup_QuotePriceBill.cs
+++ b/DAL/SCM/ClsSup_QuotePriceBill.cs
@@ -21,8 +21,8 @@
base.MvarItemKeySub4 = "";
base.MvarItemKey="Sup_QuotePriceBillMain";
base.MvarReportTitle="渚涘簲鍟嗘姤浠峰崟";
- base.BillType="1507";
- base.HBillSubType = "1507";
+ base.BillType= "1121";
+ base.HBillSubType = "1121";
}
#region 鍥哄畾浠ｇ爜
@@ -122,9 +122,9 @@
",HSupID,HQuoteEmp,HQuoteDept,HBeginDate,HEndDate,HPayConditionID" +
",HCurID,HExplanation,HInnerBillNo" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
- "," + omodel.HSupID.ToString() + ",'" + omodel.HQuoteEmp + "','" + omodel.HQuoteDept + "','" + omodel.HBeginDate + "','" + omodel.HEndDate + "'" +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMakeDate + "','" + omodel.HMakeDate +
+ "'," + omodel.HSupID.ToString() + ",'" + omodel.HQuoteEmp + "','" + omodel.HQuoteDept + "','" + omodel.HBeginDate + "','" + omodel.HEndDate + "'" +
", " + omodel.HPayConditionID.ToString() + "," + omodel.HCurID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
") ");
//鎻掑叆瀛愯〃
diff --git "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs" "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
index ec69dc0..4562e65 100644
--- "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
+++ "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
@@ -22,21 +22,16 @@
base.MvarReportTitle = "鏀舵枡閫氱煡鍗�";
base.BillType = "1103";
base.HBillSubType = "1103";
-
}
-
#region 鍥哄畾浠ｇ爜
-
~ClsCg_POInStockBill()
{
DetailColl = null;
}
-
#endregion 鑷畾涔夋柟娉�
public override void DeleteRelation(ref string sReturn, long lngBillKey)
{
DataSet Ds = new DataSet();
-
Ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBill_UpdateBillRelateData_back " + lngBillKey.ToString(), "H_p_SRM_POInStockBill_UpdateBillRelateData_back");
if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
@@ -48,7 +43,6 @@
return;
}
sReturn = "鍙嶅啓鍏宠仈鏁伴噺鎴愬姛锛�";
-
}
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
@@ -111,13 +105,11 @@
}
//
Ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBill_UpdateBillRelateData " + omodel.HInterID.ToString(), "H_p_SRM_POInStockBill_UpdateBillRelateData");
-
if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
sReturn = "鏇存柊鍏宠仈鏁伴噺澶辫触锛�";
oCn.RollBack();
return false;
-
}
if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 2)
{
@@ -125,7 +117,6 @@
oCn.RollBack();
return false;
}
-
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -172,15 +163,16 @@
",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HRelationQty,HRelationMoney" +
",HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HWWOrderDetaiLID" +
",HPropertyID,HSecUnitID,HSecUnitRate,HTaxPrice,HTaxMoney,HMainSourceInterID,HBatChNo" +
- ",HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID,HReturnedQty,HDetailID,F_xbkf_Combo,FSHDD) values("
+ ",HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID,HReturnedQty,HDetailID,F_xbkf_Combo,FSHDD,HExpressNumberSub" +
+ ",HExpressSupplierSub,HPlanArrivalDate,HBoxNumber) values("//
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
",'" + oSub.HDate + "','" + oSub.HKFDate + "'," + oSub.HKFPeriod.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HPassQty.ToString() + "," + oSub.HBadQty.ToString() + "," + oSub.HPrice.ToString() +
"," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HStatus + "," + oSub.HSPID.ToString() + ",'','" + oSub.HEntryCloseDate +
- "',0,''," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType.ToString() +
+ "',0,'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType.ToString() +
"'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HRelationQty + "," + oSub.HRelationMoney +
"," + oSub.HWWOrderInterID.ToString() + "," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HWWOrderDetaiLID.ToString() +
"," + oSub.HPropertyID.ToString() + ",0," + oSub.HSecUnitRate.ToString() + "," + oSub.HTaxPrice.ToString() + "," + oSub.HTaxMoney.ToString() + "," + oSub.HMainSourceInterID.ToString() + ",'" + oSub.HBatChNo +
- "'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() + ",'" + oSub.F_xbkf_Combo.ToString() + "','" + oSub.FSHDD.ToString() + "') ");
+ "'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() + ",'" + oSub.F_xbkf_Combo.ToString() + "','" + oSub.FSHDD.ToString() + "','" + oSub.HExpressNumberSub + "','" + oSub.HExpressSupplierSub + "','" + oSub.HPlanArrivalDate + "','" + oSub.HBoxNumber + "'" + ") ");//鐗╂祦鍗曞彿涓虹憺涓庣惇浣跨敤
}
//鍥炲～鍏宠仈鏁伴噺
//oCn.RunProc("exec H_p_SRM_POInStockBill_UpdateBillRelateData " + omodel.HInterID.ToString());
@@ -200,7 +192,6 @@
return false;
}
-
//鐢熸垚K3鍗曟嵁
//鏂板瀛愯〃銆佷富琛�
//oCn.RunProc("exec h_p_IFK3_ToERP_CGPOInStockBill_Insert " + omodel.HInterID.ToString() + "," + omodel.HBillerID.ToString());
@@ -210,13 +201,9 @@
//oCn.RunProc("exec h_p_IFK3_ToERP_CGPOInStockBill_Check " + omodel.HInterID.ToString() + "," + omodel.HBillerID.ToString());
////鏇存柊搴撳瓨
//oCn.RunProc("exec h_p_IFK3_ToERP_CGPOInStockBill_RelationInfoCtrl " + omodel.HInterID.ToString());
-
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
- //
-
-
}
catch (Exception e)
{
diff --git "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBill.cs" "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBill.cs"
index 9650659..ea96dcc 100644
--- "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBill.cs"
+++ "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBill.cs"
@@ -168,8 +168,17 @@
try
{
- oCn.RunProc(" exec H_p_SRM_POOrderBill_Confirm " + lngBillKey + ",'" + HBillNo + "','" + HUser + "'");
- sReturn = "";
+ string[] HBillInter = HBillNo.Split(',');
+ foreach (var item in HBillInter)
+ {
+ HBillNo = item.Split('@')[0];
+ lngBillKey = long.Parse(item.Split('@')[1]);
+
+ oCn.RunProc(" exec H_p_SRM_POOrderBill_Confirm '" + lngBillKey + "','" + HBillNo + "','" + HUser + "'");
+ }
+ //oCn.RunProc($@" exec H_p_SRM_POOrderBill_Confirm '{lngBillKey}','{HBillNo}','{HUser}' ");
+ //oCn.RunProc(" exec H_p_SRM_POOrderBill_Confirm '" + lngBillKey + "','" + HBillNo + "','" + HUser + "'");
+ //sReturn = "";
}
catch (Exception e)
{
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs"
index 37373c5..91490a1 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs"
@@ -46,5 +46,9 @@
public Int64 HDetailID;
public string F_xbkf_Combo;
public string FSHDD;
+ public string HExpressNumberSub; //物流单号
+ public string HExpressSupplierSub; //物流公司
+ public string HPlanArrivalDate; //到货日期
+ public string HBoxNumber; //箱号
}
}
--
Gitblit v1.9.1