From 1ce0de5fe9438f3f237bdce8e261be94eee64a2b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 21 二月 2024 17:32:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/项目管理/工作任务/PM_WorkTaskBillController.cs | 299 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 287 insertions(+), 12 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 8762f56..75d10cd 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"
@@ -64,6 +64,7 @@
public int HMainSourceEntryID;
public string HMainSourceBillNo;
public string HMainSourceBillType;
+ public int HOrderLevID;
}
#endregion
@@ -181,6 +182,8 @@
int HMainSourceEntryID = mainList[0].HMainSourceEntryID;
string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
string HMainSourceBillType = mainList[0].HMainSourceBillType;
+ int HOrderLevID = mainList[0].HOrderLevID;
+
if (OperationType == 2)
@@ -202,7 +205,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)" +
+ ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID)" +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -223,7 +226,7 @@
"','" + HReceiveEmp +
"','" + HType +
"','" + HCopyEmp +
- "','" + HRemark +
+ "','" + HRemark +
"'," + HOrgID +
",'" + HMaker +
"','" + HMakerDate +
@@ -231,6 +234,7 @@
"," + HMainSourceEntryID +
",'" + HMainSourceBillNo +
"','" + HMainSourceBillType +
+ "','" + HOrderLevID +
"')";
//涓昏〃
@@ -267,6 +271,7 @@
",HMainSourceEntryID = " + HMainSourceEntryID +
",HMainSourceBillNo = '" + HMainSourceBillNo +
"',HMainSourceBillType = '" + HMainSourceBillType +
+ "',HOrderLevID = '" + HOrderLevID +
"' where HInterID = " + HInterID;
oCN.RunProc(sql);
@@ -280,7 +285,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)" +
+ ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID )" +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -309,6 +314,7 @@
"," + HMainSourceEntryID +
",'" + HMainSourceBillNo +
"','" + HMainSourceBillType +
+ "','" + HOrderLevID +
"')";
//涓昏〃
oCN.RunProc(sql);
@@ -401,6 +407,101 @@
string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
ds = oCN.RunProcReturn(sql, "h_v_PM_WorkTaskBillList");
}
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヤ綔浠诲姟鍒楄〃 涓嬫帹鏁版嵁鏌ヨ
+ /// <summary>
+ /// 杩斿洖椤圭洰闃舵鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("PM_WorkTaskBill/XTList")]
+ [HttpGet]
+ public object XTList(string HInterID,string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskBillMyList where HInterID ='"+ HInterID + "' and 鎺ュ崟浜�='"+user+"'", "h_v_PM_WorkTaskBillMyList");
+
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁㈠崟绛夌骇鍒楄〃 鏌ヨ
+ /// <summary>
+ /// 杩斿洖椤圭洰闃舵鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("PM_WorkTaskBill/getOrder")]
+ [HttpGet]
+ public object getOrder()
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //if (HItemID == null || HItemID.Equals(""))
+ //{
+ //ds = oCN.RunProcReturn("select * from Gy_OrderLev ", "Gy_OrderLev");
+ //}
+ //else
+ //{
+ // string sql = "select * from Gy_OrderLev where HItemID='"+ HItemID + "'";
+ // ds = oCN.RunProcReturn(sql, "Gy_OrderLev");
+ //}
+ ds = oCN.RunProcReturn("select * from Gy_OrderLev ", "Gy_OrderLev");
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -961,6 +1062,163 @@
}
#endregion
+ #region 宸ヤ綔浠诲姟 寮�濮嬩换鍔�/鎾ら攢寮�濮嬪姛鑳�
+ [Route("PM_WorkTaskBill/BeginPM_WorkTaskBill")]
+ [HttpGet]
+ public object BeginPM_WorkTaskBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "PM_WorkTaskBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 0 寮�濮嬩换鍔� 1 鎾ら攢浠诲姟 2缁撴潫浠诲姟
+ if (Type == 0)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁瀛樺湪
+ DataSet ds;
+ string sql = "select * from PM_WorkTaskBillMain where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, "PM_WorkTaskBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HMainSourceBillType"])== "4759")
+ {
+ var lInterID = ds.Tables[0].Rows[0]["HMainSourceInterID"];
+ string sql1 = "update PM_WorkTaskBillMain set HTaskStatus='宸插紑濮�' where HinterID = " + HInterID;
+ oCN.RunProc(sql1);
+ string sql2 = "update PM_CustomerTaskBillMain set HTaskStatus='宸插紑濮�' where HinterID = " + lInterID;
+ oCN.RunProc(sql2);
+ }
+ else
+ {
+ string sql2 = "update PM_WorkTaskBillMain set HTaskStatus='宸插紑濮�' where HinterID = " + HInterID;
+ oCN.RunProc(sql2);
+ }
+
+
+ }
+ }
+ else if(Type==1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁瀛樺湪
+ DataSet ds;
+ string sql = "select * from PM_WorkTaskBillMain where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, "PM_WorkTaskBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ var lInterID = ds.Tables[0].Rows[0]["HMainSourceInterID"];
+ string sql1 = "update PM_WorkTaskBillMain set HTaskStatus='鏈紑濮�' where HinterID = " + HInterID;
+ oCN.RunProc(sql1);
+ string sql2 = "update PM_CustomerTaskBillMain set HTaskStatus='鏈紑濮�' where HinterID = " + lInterID;
+ oCN.RunProc(sql2);
+ }
+ }
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヤ綔浠诲姟 鍌績娆℃暟鍔熻兘
+ [Route("PM_WorkTaskBill/UpdateHHasten")]
+ [HttpGet]
+ public object UpdateHHasten(string HInterID, int HHasten, string user)
+ {
+ try
+ {
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "PM_WorkTaskBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ DataSet ds;
+ string sql = "select * from PM_WorkTaskBillMain where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, "PM_WorkTaskBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ string sql1 = "update PM_WorkTaskBillMain set HHasten='"+ HHasten+ "' where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql1, "PM_WorkTaskBillMain");
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 浠诲姟姹囨姤 鏂板/缂栬緫-淇濆瓨
#region 浠诲姟姹囨姤 琛ㄥご鏁版嵁
public class PM_WorkTaskReportBill_Main
@@ -1266,6 +1524,30 @@
string HSourceBillNo = oSub.HSourceBillNo;
string HSourceBillType = oSub.HSourceBillType;
bool HFinishFlag = oSub.HFinishFlag;
+
+ if (HFinishFlag==true)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁瀛樺湪
+ DataSet ds;
+ string sqls = "select * from PM_WorkTaskBillMain where HinterID = " + HSourceInterID;
+ ds = oCN.RunProcReturn(sqls, "PM_WorkTaskBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ var lInterID = ds.Tables[0].Rows[0]["HMainSourceInterID"];
+ string sql1 = "update PM_WorkTaskBillMain set HTaskStatus='宸插畬鎴�' where HinterID = " + HSourceInterID;
+ oCN.RunProc(sql1);
+ string sql2 = "update PM_CustomerTaskBillMain set HTaskStatus='宸插畬鎴�' where HinterID = " + lInterID;
+ oCN.RunProc(sql2);
+ }
+ }
string sql = "insert into PM_WorkTaskReportBillSub" +
"(HInterID,HBillNo_bak,HEntryID,HRemark,HProjectID,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HFinishFlag) " +
@@ -2014,15 +2296,6 @@
string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
-
- //娣诲姞鍒楀悕
- foreach (DataColumn col in ds.Tables[1].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
-
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -2050,5 +2323,7 @@
}
}
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1