From a5fa0991eeb084e3ddaac69fce80dfd32d06db41 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 19 四月 2024 13:31:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/销售管理/ClsXs_SeOutStockBackBillForLayUI.cs | 5 +++--
Model/销售管理/ClsXs_SeOutStockBillMain.cs | 1 +
DAL/仓库管理/ClsKf_SellOutBillForLayUI.cs | 8 +++++++-
DAL/销售管理/ClsXs_SeOrderBill.cs | 8 ++++----
Model/仓库管理/ClsKf_SellOutBillMain.cs | 4 ++++
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 8 ++++----
Model/销售管理/ClsXs_SeOutStockBackBillMain.cs | 1 +
7 files changed, 24 insertions(+), 11 deletions(-)
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
index 1c94b1c..942808f 100644
--- "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
@@ -187,6 +187,9 @@
",HInnerBillNo = '" + omodel.HInnerBillNo + "'" +
",HCarriage = " + omodel.HCarriage + "" +
",HCheckStatusMan = '" + omodel.HCheckStatusMan + "'" +
+ ",HProjectID = '" + omodel.HProjectID.ToString() + "'" +
+ ",HGroupID = '" + omodel.HGroupID.ToString() + "'" +
+ ",HPriceType = '" + omodel.HPriceType + "'" +
" where HInterID = " + lngBillKey;
//鏇存柊涓昏〃
oCn.RunProc(mainSql);
@@ -364,7 +367,7 @@
",HDeptID,HManagerID,HEmpID,HSupID,HSecManagerID,HKeeperID,HWHID,HSCWHID,HCurID,HExRate,HSellSID,HLinkMan,HLinkPhone" +
",HSeOrderBillNo" +
",HConveyCompID,HConveyTypeID,HConveyMoney" +
- ",HExplanation,HInnerBillNo,HRedBlueFlag,HCarriage,HCheckStatusMan" +
+ ",HExplanation,HInnerBillNo,HRedBlueFlag,HCarriage,HCheckStatusMan,HProjectID,HGroupID,HPriceType" +
") " +
"values(" +
"" + omodel.HInterID.ToString() + "" +
@@ -414,6 +417,9 @@
"," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + "" +
"," + omodel.HCarriage + "" +
",'" + omodel.HCheckStatusMan + "'" +
+ ",'" + omodel.HProjectID.ToString() + "'" +
+ ",'" + omodel.HGroupID.ToString() + "'" +
+ ",'" + omodel.HPriceType + "'" +
") ";
oCn.RunProc(mainSql);
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
index a540055..185066c 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
@@ -169,9 +169,9 @@
"','" + oSub.HCusMaterNumber +
"','" + oSub.HCusModel +
"','" + oSub.HCusMaterName +
- "','" + oSub.HWhID +
"'," + (oSub.HisStockGoods?1:0) +
- ")";
+ ",'" + oSub.HWhID +
+ "')";
oCn.RunProc(subSql);
}
@@ -385,9 +385,9 @@
"','" + oSub.HCusMaterNumber +
"','" + oSub.HCusModel +
"','" + oSub.HCusMaterName +
- "','" + oSub.HWhID +
"'," + (oSub.HisStockGoods?1:0) +
- ")";
+ ",'" + oSub.HWhID +
+ "')";
oCn.RunProc(subSql);
}
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillForLayUI.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillForLayUI.cs"
index 938e7cd..69e5a8a 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillForLayUI.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillForLayUI.cs"
@@ -89,6 +89,7 @@
",HAddress='" + omodel.HAddress + "'" +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HProjectID='" + omodel.HProjectID + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
//DeleteRelation(ref sReturn, lngBillKey);
@@ -164,12 +165,12 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HAddress,HSSID,HCusID,HWHID,HCurID,HExRate" +
- ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo" +
+ ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo,HProjectID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
",'" + omodel.HAddress + "'," + omodel.HSSID.ToString() + "," + omodel.HCusID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
- ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'"+
+ ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','"+omodel.HProjectID.ToString()+"'"+
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsXs_SeOutStockBackBillSub oSub in DetailColl)
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs"
index b6a1213..aa1a698 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs"
@@ -32,6 +32,10 @@
public string HCheckStatusMan; //核销人
public double HExRate; //汇率
+ public Int64 HProjectID; //工程项目
+ public Int64 HGroupID; //班组
+ public string HPriceType; //varchar(20) --单价类型（成本价，结算价）
+
public Int64 HOrgID; //组织
}
}
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillMain.cs"
index 4a49240..0ab09eb 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillMain.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillMain.cs"
@@ -17,5 +17,6 @@
public Int64 HWHID;//
public string HExplanation;// varchar(200) --摘要
public string HInnerBillNo;// varchar(50) --内部单据号
+ public Int64 HProjectID; //工程项目
}
}
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs"
index e9e7461..2a5870e 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs"
@@ -15,6 +15,7 @@
public Int64 HCurID;// int --币别 (Gy_Currency)
public Single HExRate;// money --汇率 (选择完币别带出)
public Int64 HWHID;// 仓库
+ public Int64 HProjectID; // g工程项目
public string HExplanation;// varchar(200) --摘要
public string HInnerBillNo;// varchar(50) --内部单据号
public Int64 HConveyTypeID;// 运输方式
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index 92ff4de..b9f0333 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -287,7 +287,7 @@
long HConveyCompID = mainList[0].HConveyCompID;//杩愯緭鍏徃
long HConveyMoney = (long)mainList[0].HConveyMoney;//杩愯垂
long HDFflag = Convert.ToInt32(mainList[0].HDFflag); //鏄惁鍨粯
-
+ long HProjectID = mainList[0].HProjectID;//宸ョ▼椤圭洰
string HBillType = mainList[0].HBillType;
string HBillSubType = mainList[0].HBillSubType;
@@ -348,14 +348,14 @@
,HAddress,HSSID,HCurID,HWHID,HExRate,HEmpID,HExplanation,HInnerBillNo,HSeOrderBillNo_M
,HConveyTypeID,HConveyCompID,HConveyMoney,HLinkMan,HLinkPhone
,HSALEORGID,HDELIVERYORGID,HOWNERID,HOWNERTYPEID
- ,HChecker,HCheckDate,HCloseMan,HCloseDate,HERPInterID,HERPBillType,HDFflag)
+ ,HChecker,HCheckDate,HCloseMan,HCloseDate,HERPInterID,HERPBillType,HDFflag,HProjectID)
values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1402 + "','" +
1402 + "','" + HDate + "','" + HBillNo + "'," + HBillStatus + "," + HCusID +
"," + HManagerID + "," + HDeptID + ",'" + HRemark + "','" + HMaker + "','" + HMakeDate +
"','" + HAddress + "'," + HSSID + "," + HCurID + "," + HWHID + "," + HExRate + "," + HEmpID + ",'" +
HExplanation + "','" + HInnerBillNo + "','" + HSeOrderBillNo_M + "','" + HConveyTypeID + "','" + HConveyCompID + "','" + HConveyMoney + "','" + HLinkMan + "','" + HLinkPhone + "'," + HSALEORGID + "," + HDELIVERYORGID + "," + HOWNERID + ",'"
+ HOWNERTYPEID + "','" + HChecker + "','" + HCheckDate + "','" + HCloseMan + "','" + HCloseDate + "'," + HERPInterID +
- ",'" + HERPBillType + "'," + HDFflag + ")";
+ ",'" + HERPBillType + "'," + HDFflag + ",'"+ HProjectID + "')";
oCN.RunProc(sql);
@@ -366,7 +366,7 @@
"HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
",HCusID='" + HCusID + "', HCurID='" + HCurID + "', HWHID = '" + HWHID
+ "',HExRate='" + HExRate + "',HEmpID='" + HEmpID + "',HSeOrderBillNo_M='" + HSeOrderBillNo_M + "',HManagerID='" + HManagerID + "',HDeptID='" + HDeptID + "',HOWNERID='" + HOWNERID
- + "',HAddress='" + HAddress + "' where HInterID=" + HInterID;
+ + "',HAddress='" + HAddress + "',HProjectID='"+ HProjectID + "' where HInterID=" + HInterID;
oCN.RunProc(sql);
//鍒犻櫎瀛愯〃
--
Gitblit v1.9.1