From 8a0e28f065e7414bef9386ed35b381a10bbabdc5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 04 三月 2026 16:38:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/项目管理/工作任务/PM_WorkTaskBillController.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
index 9c62145..d47eaea 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
@@ -65,6 +65,7 @@
public string HDeleteManDate;
public string HBackerDate;
public string HBackRemark;
+ public string HTaskType;
public int HMainSourceInterID;
public int HMainSourceEntryID;
@@ -185,6 +186,7 @@
string HDeleteManDate = mainList[0].HDeleteManDate;
string HBackerDate = mainList[0].HBackerDate;
string HBackRemark = mainList[0].HBackRemark;
+ string HTaskType = mainList[0].HTaskType;
int HMainSourceInterID = mainList[0].HMainSourceInterID;
int HMainSourceEntryID = mainList[0].HMainSourceEntryID;
string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
@@ -212,7 +214,7 @@
{
string sql = "insert into PM_WorkTaskBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProjectID,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
- ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID,HTaskClassID)" +
+ ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID,HTaskClassID,HTaskType)" +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -243,6 +245,7 @@
"','" + HMainSourceBillType +
"','" + HOrderLevID +
"','"+ HTaskClassID+
+ "','"+ HTaskType +
"')";
//涓昏〃
@@ -281,6 +284,7 @@
"',HMainSourceBillType = '" + HMainSourceBillType +
"',HOrderLevID = '" + HOrderLevID +
"',HTaskClassID = '" + HTaskClassID +
+ "',HTaskType = '" + HTaskType +
"' where HInterID = " + HInterID;
oCN.RunProc(sql);
@@ -295,7 +299,7 @@
{
string sql = "insert into PM_WorkTaskBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProjectID,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
- ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID )" +
+ ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID,HTaskType )" +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -325,6 +329,7 @@
",'" + HMainSourceBillNo +
"','" + HMainSourceBillType +
"','" + HOrderLevID +
+ "','" + HTaskType +
"')";
//涓昏〃
oCN.RunProc(sql);
--
Gitblit v1.9.1