From 54ed49030fce5baec77d21f1349c235cd097d80b Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 07 九月 2023 14:09:27 +0800
Subject: [PATCH] 项目阶段汇报：增加HProjectID字段、设置源单信息
---
WebAPI/Controllers/项目管理/项目阶段/Gy_ProjectStageController.cs | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
index e2a1b2b..9bf78e5 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
@@ -1426,10 +1426,8 @@
public int HInterID;
public string HBillNo;
public string HDate;
- public int HProID;
+ public int HProjectID;
public string HProNumber;
- public string HMainSourceBillNo;
- public string HMainSourceBillType;
public int HProjectStageID;
public string HProjectStageName;
public string HStageNote;
@@ -1445,6 +1443,12 @@
public int HOrgID;
public string HRemark;
public string HMaker;
+
+ public int HMainSourceInterID;
+ public int HMainSourceEntryID;
+ public string HMainSourceBillNo;
+ public string HMainSourceBillType;
+
public string HUpdater;
public string HChecker;
public string HMakerDate;
@@ -1559,10 +1563,8 @@
int HInterID = mainList[0].HInterID;
string HBillNo = mainList[0].HBillNo;
string HDate = mainList[0].HDate;
- int HProID = mainList[0].HProID;
+ int HProjectID = mainList[0].HProjectID;
string HProNumber = mainList[0].HProNumber;
- string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
- string HMainSourceBillType = mainList[0].HMainSourceBillType;
int HProjectStageID = mainList[0].HProjectStageID;
string HStageNote = mainList[0].HStageNote;
string HRelationGoods = mainList[0].HRelationGoods;
@@ -1575,6 +1577,12 @@
double HRate = mainList[0].HRate;
int HOrgID = mainList[0].HOrgID;
string HRemark = mainList[0].HRemark;
+
+ int HMainSourceInterID = mainList[0].HMainSourceInterID;
+ int HMainSourceEntryID = mainList[0].HMainSourceEntryID;
+ string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
+ string HMainSourceBillType = mainList[0].HMainSourceBillType;
+
string HMaker = mainList[0].HMaker;
string HMakerDate = mainList[0].HMakerDate;
string HUpdater = mainList[0].HUpdater;
@@ -1600,7 +1608,7 @@
{
string sql = "insert into PM_ProjectReportBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate" +
- ",HProNumber,HProjectStageID,HStageNote,HRelationGoods,HIsKey,HReportEmpID,HReportNote,HReportGoods,HReceiveEmp,HCopyEmp,HRate,HOrgID) " +
+ ",HProjectID,HProNumber,HProjectStageID,HStageNote,HRelationGoods,HIsKey,HReportEmpID,HReportNote,HReportGoods,HReceiveEmp,HCopyEmp,HRate,HOrgID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType) " +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -1613,7 +1621,8 @@
",'" + HRemark +
"','" + HMaker +
"','" + HMakerDate +
- "','" + HProNumber +
+ "'," + HProjectID +
+ ",'" + HProNumber +
"'," + HProjectStageID +
",'" + HStageNote +
"','" + HRelationGoods +
@@ -1625,7 +1634,11 @@
"','" + HCopyEmp +
"'," + HRate +
"," + HOrgID +
- ")";
+ "," + HMainSourceInterID +
+ "," + HMainSourceEntryID +
+ ",'" + HMainSourceBillNo +
+ "','" + HMainSourceBillType +
+ "')";
//涓昏〃
oCN.RunProc(sql);
@@ -1645,7 +1658,8 @@
",HRemark = '" + HRemark +
"',HUpdater = '" + HUpdater +
"',HUpdateDate = '" + HUpdaterDate +
- "',HProNumber = '" + HProNumber +
+ "',HProjectID = " + HProjectID +
+ ",HProNumber = '" + HProNumber +
"',HProjectStageID = " + HProjectStageID +
",HStageNote = '" + HStageNote +
"',HRelationGoods = '" + HRelationGoods +
@@ -1657,7 +1671,11 @@
"',HCopyEmp = '" + HCopyEmp +
"',HRate = " + HRate +
",HOrgID = " + HOrgID +
- " where HInterID = " + HInterID;
+ ",HMainSourceInterID = " + HMainSourceInterID +
+ ",HMainSourceEntryID = " + HMainSourceEntryID +
+ ",HMainSourceBillNo = '" + HMainSourceBillNo +
+ "',HMainSourceBillType = '" + HMainSourceBillType +
+ "' where HInterID = " + HInterID;
oCN.RunProc(sql);
@@ -1670,7 +1688,7 @@
{
string sql = "insert into PM_ProjectReportBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate" +
- ",HProNumber,HProjectStageID,HStageNote,HRelationGoods,HIsKey,HReportEmpID,HReportNote,HReportGoods,HReceiveEmp,HCopyEmp,HRate,HOrgID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType,HMainSourceBillNo) " +
+ ",HProjectID,HProNumber,HProjectStageID,HStageNote,HRelationGoods,HIsKey,HReportEmpID,HReportNote,HReportGoods,HReceiveEmp,HCopyEmp,HRate,HOrgID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType,HMainSourceBillNo) " +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -1683,7 +1701,8 @@
",'" + HRemark +
"','" + HMaker +
"','" + HMakerDate +
- "','" + HProNumber +
+ "'," + HProjectID +
+ ",'" + HProNumber +
"'," + HProjectStageID +
",'" + HStageNote +
"','" + HRelationGoods +
@@ -1695,8 +1714,8 @@
"','" + HCopyEmp +
"'," + HRate +
"," + HOrgID +
- "," + HProID +
- "," + HProjectStageID +
+ "," + HMainSourceInterID +
+ "," + HMainSourceEntryID +
",'" + HMainSourceBillType +
"','" + HMainSourceBillNo +
"')";
@@ -1707,7 +1726,7 @@
oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "鏂板椤圭洰闃舵姹囨姤锛�" + HBillNo + "','LMES-椤圭洰闃舵姹囨姤妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
//淇濆瓨瀛愯〃
- objJsonResult = AddBillSub_ProjectReportBill(msg3, HInterID, HBillNo, OperationType,HProID, HProjectStageID, HMainSourceBillType, HMainSourceBillNo);
+ objJsonResult = AddBillSub_ProjectReportBill(msg3, HInterID, HBillNo, OperationType,HMainSourceInterID, HMainSourceEntryID, HMainSourceBillType, HMainSourceBillNo);
if (objJsonResult.code == "0")
{
--
Gitblit v1.9.1