From 69d1e112acf87dc96c4beb55c9a8abd1286fa287 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 06 五月 2024 17:15:24 +0800
Subject: [PATCH] 1. 必录项 标识加上 2.工作任务 增加 任务类别 的 字段 以及 选择基础资料功能； 3.工程项目中 项目列表 选择现在会 报错；完善；
---
WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs | 22 ++++++++++++++--------
WebAPI/Controllers/项目管理/工作任务/PM_WorkTaskBillController.cs | 7 +++++--
2 files changed, 19 insertions(+), 10 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 844703b..e6009d5 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"
@@ -66,6 +66,7 @@
public string HMainSourceBillNo;
public string HMainSourceBillType;
public int HOrderLevID;
+ public int HTaskClassID;
}
#endregion
@@ -184,7 +185,7 @@
string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
string HMainSourceBillType = mainList[0].HMainSourceBillType;
int HOrderLevID = mainList[0].HOrderLevID;
-
+ int HTaskClassID = mainList[0].HTaskClassID;
if (OperationType == 2)
@@ -206,7 +207,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,HTaskClassID)" +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -236,6 +237,7 @@
",'" + HMainSourceBillNo +
"','" + HMainSourceBillType +
"','" + HOrderLevID +
+ "','"+ HTaskClassID+
"')";
//涓昏〃
@@ -273,6 +275,7 @@
",HMainSourceBillNo = '" + HMainSourceBillNo +
"',HMainSourceBillType = '" + HMainSourceBillType +
"',HOrderLevID = '" + HOrderLevID +
+ "',HTaskClassID = '" + HTaskClassID +
"' where HInterID = " + HInterID;
oCN.RunProc(sql);
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
index 82f7912..1205101 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
@@ -34,6 +34,12 @@
public DAL.ClsPM_ProjectMoneyBillMain BillNew4 = new DAL.ClsPM_ProjectMoneyBillMain(); //椤圭洰璐圭敤鍗曞搴斿崟鎹被
public DAL.ClsPM_ProjectMoneyBillMain BillOld4 = new DAL.ClsPM_ProjectMoneyBillMain();
+ public DAL.ClsPM_ProjectBeginBillMain BillNew5 = new DAL.ClsPM_ProjectBeginBillMain(); //椤圭洰鍚姩鍗曞搴斿崟鎹被
+ public DAL.ClsPM_ProjectBeginBillMain BillOld5 = new DAL.ClsPM_ProjectBeginBillMain();
+
+ public DAL.ClsPM_ProjectEndBillMain BillNew6 = new DAL.ClsPM_ProjectEndBillMain(); //椤圭洰楠屾敹鍗曞搴斿崟鎹被
+ public DAL.ClsPM_ProjectEndBillMain BillOld6 = new DAL.ClsPM_ProjectEndBillMain();
+
#region 宸ョ▼椤圭洰 鏂板/缂栬緫
#region 宸ョ▼椤圭洰 琛ㄥご鏁版嵁
public class PM_ProjectBill_Main
@@ -3255,7 +3261,7 @@
if (refSav == "Add")
{
//鍗曟嵁鍙锋槸鍚﹂噸澶�
- if (BillNew1.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ if (BillNew5.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3266,7 +3272,7 @@
}
if (refSav == "Update")
{
- if (BillOld1.ShowBill(oItem.HInterID, ref s) == false)
+ if (BillOld5.ShowBill(oItem.HInterID, ref s) == false)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3275,7 +3281,7 @@
return objJsonResult;
}
//鍒ゆ柇鏄惁鍙紪杈�
- if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null)
+ if (BillOld5.omodel.HChecker != "" && BillOld5.omodel.HChecker != null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3283,7 +3289,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (BillOld1.omodel.HBillStatus > 1)
+ if (BillOld5.omodel.HBillStatus > 1)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3893,7 +3899,7 @@
if (refSav == "Add")
{
//鍗曟嵁鍙锋槸鍚﹂噸澶�
- if (BillNew1.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ if (BillNew6.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3904,7 +3910,7 @@
}
if (refSav == "Update")
{
- if (BillOld1.ShowBill(oItem.HInterID, ref s) == false)
+ if (BillOld6.ShowBill(oItem.HInterID, ref s) == false)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3913,7 +3919,7 @@
return objJsonResult;
}
//鍒ゆ柇鏄惁鍙紪杈�
- if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null)
+ if (BillOld6.omodel.HChecker != "" && BillOld6.omodel.HChecker != null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3921,7 +3927,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (BillOld1.omodel.HBillStatus > 1)
+ if (BillOld6.omodel.HBillStatus > 1)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1