From a37a23572325c5acac8e8a8f32dd61a9f61faf01 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 26 八月 2024 10:20:17 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/工资管理/Pay_ProcPriceRequestBillController.cs | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ProcPriceRequestBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ProcPriceRequestBillController.cs"
index 2a41966..010cf89 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ProcPriceRequestBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ProcPriceRequestBillController.cs"
@@ -619,6 +619,8 @@
public string HBacker;
public string HBackerDate;
public string HBackRemark;
+ public string HChangeType;
+ public Double HChangeValue;
}
#endregion
#region 瀛愯〃
@@ -651,6 +653,7 @@
public double HRelationMoney;
public string HCloseMan;
public string HEntryCloseDate;
+ public int HWorkCenterID;
}
#endregion
#region 瀹氶鐢宠鍗� 鏂板/缂栬緫
@@ -756,7 +759,8 @@
string HBacker = mainList[0].HBacker;
string HBackerDate = mainList[0].HBackerDate;
string HBackRemark = mainList[0].HBackRemark;
-
+ string HChangeType = mainList[0].HChangeType;
+ Double HChangeValue = mainList[0].HChangeValue;
//淇濆瓨鍓嶆帶鍒�
DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Pay_ProcPriceRequestBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Pay_ProcPriceRequestBill_BeforeSaveCtrl");
if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
@@ -785,7 +789,7 @@
{
string sql = "insert into Pay_ProcPriceRequestBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID" +
- ",HExplanation,HRemark,HMaker,HMakeDate) " +
+ ",HExplanation,HRemark,HMaker,HMakeDate,HChangeType,HChangeValue) " +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -801,7 +805,9 @@
"','" + HRemark +
"','" + HMaker +
"','" + HMakerDate +
- "')";
+ "','" + HChangeType +
+ "'," + HChangeValue +
+ ")";
//涓昏〃
oCn.RunProc(sql);
@@ -810,6 +816,7 @@
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0) //缂栬緫
{
+
string sql = "update Pay_ProcPriceRequestBillMain set " +
"HYear = " + HYear +
", HPeriod = " + HPeriod +
@@ -821,7 +828,9 @@
"', HRemark = '" + HRemark +
"', HUpdater = '" + HUpdater +
"', HUpdateDate = '" + HUpdaterDate +
- "' where HInterID = " + HInterID;
+ "', HChangeType = '" + HChangeType +
+ "', HChangeValue = " + HChangeValue +
+ " where HInterID = " + HInterID;
oCn.RunProc(sql);
@@ -912,12 +921,12 @@
string HSourceBillType = oSub.HSourceBillType;
double HRelationQty = oSub.HRelationQty;
double HRelationMoney = oSub.HRelationMoney;
-
+ int HWorkCenterID = oSub.HWorkCenterID;
string sql = "insert into Pay_ProcPriceRequestBillSub" +
"(HInterID,HEntryID,HMaterID,HProcID,HSourceID,HOldPrice,HPrice,HOldFixPrice,HFixPrice,HBeginDate,HEndDate,HCostFlag,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo" +
- ",HSourceBillType,HRelationQty,HRelationMoney) " +
+ ",HSourceBillType,HRelationQty,HRelationMoney,HWorkCenterID) " +
"values(" +
"" + HInterID +
"," + HEntryID +
@@ -938,6 +947,7 @@
"','" + HSourceBillType +
"'," + HRelationQty +
"," + HRelationMoney +
+ "," + HWorkCenterID +
")";
oCn.RunProc(sql);
--
Gitblit v1.9.1