From 908a189a83797f2e2037aa55f1841d2496137672 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 七月 2024 09:24:01 +0800
Subject: [PATCH] 增加休息日后端保存和批量保存
---
WebAPI/ListModels.cs | 26 +
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 242 ++++++++++++++
Model/Model.csproj | 1
WebAPI/Controllers/WebAPIController.cs | 495 +++++++++++++++++++++++++---
WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user | 36 +-
WebAPI/DLL/ClsGy_RestDay_Ctl.cs | 108 ++++++
WebAPI/Service/LuBaoSevice.cs | 38 ++
WebAPI/WebAPI.csproj | 1
Model/基础资料/基础资料/ClsGy_RestDay_Model.cs | 14
9 files changed, 876 insertions(+), 85 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 12b16a4..18bb2dc 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -138,6 +138,7 @@
<Compile Include="CRM\ClsSec_ProductRepairBillMain.cs" />
<Compile Include="CRM\ClsSec_ProductRepairBillSub.cs" />
<Compile Include="CRM\ClsSec_ProductRepairBillSub1.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RestDay_Model.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBillSub.cs" />
<Compile Include="MES\ClsSc_SourceLineRepairBillSub_Mater.cs" />
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_RestDay_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_RestDay_Model.cs"
new file mode 100644
index 0000000..96d13b2
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_RestDay_Model.cs"
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_RestDay_Model : DBUtility.ClsGy_Base_Model
+ {
+ public DateTime HRestDay;
+ public int HOrgID;
+ public int HDeptID;
+ public string HWeekDay;
+ }
+}
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index 7430745..37ca28d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -6808,5 +6808,247 @@
}
}
#endregion
+
+ #region 浼戞伅鏃� 鏌ヨ,瀹℃牳锛屽弽瀹℃牳锛岀鐢紝鍙嶇鐢�
+ /// <summary>
+ /// 浼戞伅鏃� 鏌ヨ
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Gy_BadReason/Gy_RestDayList")]
+ [HttpGet]
+ public object Gy_RestDayList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql1 = "select * from h_v_Gy_RestDay where 1 = 1";
+ string sql = sql1 + sWhere + " order by 浼戞伅鏃ヤ唬鐮� ";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_RestDay");
+
+ //娣诲姞鍒楀悕
+ 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;
+ }
+ }
+
+ /// <summary>
+ /// 浼戞伅鏃� 瀹℃牳銆佸弽瀹℃牳
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_BadReason/AuditGy_RestDay")]
+ [HttpGet]
+ public object AuditGy_RestDay(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_RestDay_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_RestDay where HItemID=" + HInterID, "Gy_RestDay");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_RestDay set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Gy_RestDay set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ /// <summary>
+ /// 浼戞伅鏃� 绂佺敤銆佸弽绂佺敤
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_BadReason/StopGy_RestDay")]
+ [HttpGet]
+ public object StopGy_RestDay(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_RestDay_Close", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_RestDay where HItemID=" + HInterID, "Gy_SupType");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_RestDay set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ oCN.RunProc("update Gy_RestDay set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index b91b18a..1c84ba2 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -150,21 +150,21 @@
/// <returns></returns>
[Route("Web/GetMAXNumber")]
[HttpGet]
- public object GetMAXNumber(string HBillType,string HName,string TableName)
+ public object GetMAXNumber(string HBillType, string HName, string TableName)
{
try
{
string HNumber = "";
- HNumber = DBUtility.ClsPub.CreateHNumber(HBillType,HName, TableName, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ HNumber = DBUtility.ClsPub.CreateHNumber(HBillType, HName, TableName, ref DBUtility.ClsPub.sExeReturnInfo, true);
//----------鍒涘缓铏氳〃------------------------
DataTable dt_Main = new DataTable("Json");
dt_Main.Columns.Add("HNumber", typeof(string));
-
+
//---------鍒涘缓鏂拌------------------------
DataRow dr_main = dt_Main.NewRow();//鍒涘缓鏂拌
dt_Main.Rows.Add(dr_main);//灏嗘柊琛屽姞鍏ュ埌琛ㄤ腑
dr_main["HNumber"] = DBUtility.ClsPub.isStrNull(HNumber);
-
+
if (HNumber == null)
{
@@ -252,7 +252,7 @@
public object GetUser(string UserName, string PassWord, string HOrgName)
{
try
- {
+ {
DataSet ds = null;
ClsCN oCnLoc = new ClsCN();
DAL.ClsUser oUser = new DAL.ClsUser();
@@ -321,7 +321,7 @@
return objjson;
}
}
- }
+ }
objjson.code = "0";
objjson.count = 1;
objjson.Message = "灞曞紑鎴愬姛锛�";
@@ -474,8 +474,8 @@
// return objJsonResult;
//}
- string sql = "update Gy_Czygl set " +
- "HWhID = " + HWhID +
+ string sql = "update Gy_Czygl set " +
+ "HWhID = " + HWhID +
", HWhName = '" + HWhName +
"', HSecManagerID = " + HSecManagerID +
", HSecManager = '" + HSecManager +
@@ -1289,7 +1289,7 @@
/// <returns></returns>
[Route("Web/GetSouceList_Json")]
[HttpGet]
- public object GetSouceList_Json(string HMaterID,string Value, Int64 HOrgID)
+ public object GetSouceList_Json(string HMaterID, string Value, Int64 HOrgID)
{
sWhere = " and HStopFlag=0 and HUSEORGID =" + HOrgID + "";
if (Value != "" && Value != null)
@@ -1298,7 +1298,7 @@
}
try
{
- string sql = "EXEC h_p_Gy_SouceViewList " + HMaterID+",'"+ sWhere + "'";
+ string sql = "EXEC h_p_Gy_SouceViewList " + HMaterID + ",'" + sWhere + "'";
ds = oCN.RunProcReturn(sql, "h_p_Gy_SouceViewList");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
@@ -1709,7 +1709,7 @@
string sql1 = "Select HItemID,HNumber ,HName from Gy_SellStyle where HStopflag=0 and HEndFlag=1 ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "Gy_SellStyle");
- }
+ }
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -1736,7 +1736,7 @@
objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
objjson.data = null;
return objjson;
- }
+ }
}
/// <summary>
@@ -2948,7 +2948,7 @@
objJsonResult.data = null;
return objJsonResult; ;
}
-
+
oCN.RunProc("delete Gy_ErrType where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
@@ -5237,7 +5237,7 @@
objJsonResult.data = null;
return objJsonResult; ;
}
-
+
oCN.RunProc("delete Gy_PostSkill where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
@@ -5584,7 +5584,7 @@
WebAPI.DLL.ClsGy_StockMoveStyle_Ctl oBill = new WebAPI.DLL.ClsGy_StockMoveStyle_Ctl();
List<Model.ClsGy_StockMoveStyle_Model> lsmain = new List<Model.ClsGy_StockMoveStyle_Model>();
msg1 = msg1.Replace("\\", "");
- msg1 = msg1.Replace("\n", "");
+ msg1 = msg1.Replace("\n", "");
lsmain = oListModels.getObjectByJson_Gy_StockMoveStyle(msg1);
foreach (Model.ClsGy_StockMoveStyle_Model oItem in lsmain)
{
@@ -8101,7 +8101,7 @@
ListModels oListModels = new ListModels();
try
{
-
+
WebAPI.DLL.ClsGy_ProjectMoney_Ctl oBill = new WebAPI.DLL.ClsGy_ProjectMoney_Ctl();
List<Model.ClsGy_ProjectMoney_Model> lsmain = new List<Model.ClsGy_ProjectMoney_Model>();
msg1 = msg1.Replace("\\", "");
@@ -8310,7 +8310,7 @@
return objJsonResult;
}
oCN.BeginTran();//寮�濮嬩簨鍔�
-
+
ds = oCN.RunProcReturn("select * from Gy_ProjectMoney where HItemID=" + HItemID, "Gy_ProjectMoney");
if (ds.Tables[0].Rows.Count > 0)
{
@@ -8402,7 +8402,7 @@
ListModels oListModels = new ListModels();
try
{
-
+
WebAPI.DLL.ClsGy_ErrMsgBackType_Ctl oBill = new WebAPI.DLL.ClsGy_ErrMsgBackType_Ctl();
List<Model.ClsGy_ErrMsgBackType_Model> lsmain = new List<Model.ClsGy_ErrMsgBackType_Model>();
msg1 = msg1.Replace("\\", "");
@@ -9816,7 +9816,7 @@
}
oCN.BeginTran();//寮�濮嬩簨鍔�
-
+
oCN.RunProc("delete Gy_PreventErrMould where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
@@ -10374,6 +10374,369 @@
objJsonResult.data = null;
return objJsonResult;
}
+ }
+ #endregion
+
+ #region 浼戞伅鏃� 璁剧疆鍒楄〃/淇濆瓨/缂栬緫/鍒犻櫎鏂规硶
+ /// <summary>
+ /// 浼戞伅鏃� 淇濆瓨
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveGy_RestDayList")]
+ [HttpPost]
+ public object SaveGy_RestDayList([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_RestDay ", "Gy_RestDay");
+ if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ {
+ //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
+ maxid += 1;
+ HItemID = maxid;
+ }
+ ListModels oListModels = new ListModels();
+ try
+ {
+
+ WebAPI.DLL.ClsGy_RestDay_Ctl oBill = new WebAPI.DLL.ClsGy_RestDay_Ctl();
+ List<Model.ClsGy_RestDay_Model> lsmain = new List<Model.ClsGy_RestDay_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_Gy_RestDay(msg1);
+ foreach (Model.ClsGy_RestDay_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+ oItem.HMakeEmp = msg2; //鍒涘缓浜�
+ DayOfWeek dayOfWeek = oItem.HRestDay.DayOfWeek;
+
+ // 瀹氫箟鏄熸湡鍑犵殑涓枃鏄犲皠鍏崇郴
+ Dictionary<DayOfWeek, string> chineseDayOfWeek = new Dictionary<DayOfWeek, string>
+ {
+ { DayOfWeek.Sunday, "鏄熸湡鏃�" },
+ { DayOfWeek.Saturday, "鏄熸湡鍏�" }
+ };
+
+ // 鑾峰彇涓枃鏄熸湡鍑犲悕绉�
+ oItem.HWeekDay = chineseDayOfWeek[dayOfWeek];
+ oBill.oModel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 浼戞伅鏃� 淇濆瓨
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveSumGy_RestDayList")]
+ [HttpPost]
+ public object SaveSumGy_RestDayList([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ JObject msgObj = JObject.Parse(msg1);
+ string HYear = msgObj["HYear"].ToString();
+ string HNumber1 = msgObj["HDeptNumber"].ToString()+'-' + msgObj["HOrgNumber"].ToString();
+ string HName1 = msgObj["HDeptName"].ToString()+'-'+msgObj["HOrgName"].ToString();
+ string HOrgID = msgObj["HOrgID"].ToString();
+ string HDeptID = msgObj["HDeptID"].ToString();
+ bool HStopflag = bool.Parse(msgObj["HStopflag"].ToString());
+ string HRemark= msgObj["HRemark"].ToString();
+ string HUSEORGID= msgObj["HUSEORGID"].ToString();
+ string HHelpCode= msgObj["HHelpCode"].ToString();
+ string HMakeEmp = msg2; //鍒涘缓浜�
+ bool Sunday = Convert.ToBoolean(msgObj["Sunday"]);
+ bool Saturday = Convert.ToBoolean(msgObj["Saturday"]);
+ List<Tuple<DateTime, string>> sundaysInYear = GetSundaysInYear(Convert.ToInt32(HYear), Sunday, Saturday);
+
+ foreach (var oItem in sundaysInYear)
+ {
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_RestDay ", "Gy_RestDay");
+ if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ {
+ //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
+ maxid += 1;
+ HItemID = maxid;
+ }
+ DateTime HRestDay = oItem.Item1;
+ string HWeekDay = oItem.Item2; // 鑾峰彇鏄熸湡瀛楃涓�
+ string HDate = oItem.Item1.ToString("yyyyMMdd");
+ string HNumber = "";
+ string HName = "";
+ HNumber = HNumber1 + '-' + HDate;
+
+ HName = HName1 + '-' + HDate;
+ //鍏堟煡鐪嬫暟鎹簱鏈夋病鏈�
+ ds = oCN.RunProcReturn("select * from Gy_RestDay where HRestDay='" + HRestDay + "' and HOrgID='" + HOrgID + "' and HDeptID='" + HDeptID + "'", "Gy_RestDay");
+ if (ds.Tables[0].Rows.Count<1)
+ {
+ oCN.RunProc("Insert into Gy_RestDay " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID," +
+ "HOrgID,HDeptID,HRestDay,HWeekDay) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "',''," + 0 +
+ "," + 0 + "," + 0 + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + DateTime.Now + "','" + HUSEORGID + "',' 鏈娴�','" + HMakeEmp + "','" + HUSEORGID + "'" +
+ ",'" + HOrgID.ToString() + "','" + HDeptID.ToString() + "','" + HRestDay.ToString() + "','" + HWeekDay.ToString() + "')");
+ }
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ /// <summary>
+ /// 浼戞伅鏃� 鑾峰彇淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("GetGy_RestDayDetailEdit")]
+ [HttpGet]
+ public ApiResult<DataSet> GetGy_RestDayDetailEdit(string HID)
+ {
+ var model = LuBaoSevice.GetGy_RestDayDetailEdit(HID);
+ return model;
+ }
+
+ /// <summary>
+ /// 浼戞伅鏃� 鑾峰彇淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("GetGy_RestDayDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> GetGy_RestDayDetail(string HName)
+ {
+ var model = LuBaoSevice.GetGy_RestDayDetail(HName);
+ return model;
+ }
+
+ /// <summary>
+ /// 浼戞伅鏃� 鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetGy_RestDay")]
+ [HttpGet]
+ public object DeltetGy_RestDay(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+
+ oCN.RunProc("delete Gy_RestDay where HItemID=" + HItemID);
+ 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;
+ }
+ }
+
+ //鑾峰彇涓�骞翠腑鐨勫懆鍏�,鍛ㄦ棩鎴栬�呬袱涓悓鏃惰幏鍙�
+ public List<Tuple<DateTime, string>> GetSundaysInYear(int HYear, bool Sunday,bool Saturday)
+ {
+ List<Tuple<DateTime, string>> Days = new List<Tuple<DateTime, string>>();
+ DateTime startDate = new DateTime(HYear, 1, 1);
+ DateTime endDate = new DateTime(HYear, 12, 31);
+ //鏄熸湡澶╁嬀閫�
+ if (Sunday && !Saturday)
+ {
+ while (startDate <= endDate)
+ {
+ if (startDate.DayOfWeek == DayOfWeek.Sunday)
+ {
+ Days.Add(Tuple.Create(startDate, "鏄熸湡澶�"));
+ }
+ startDate = startDate.AddDays(1);
+ }
+ }
+ //鏄熸湡鍏� 鍕鹃��
+ else if (!Sunday && Saturday)
+ {
+ while (startDate <= endDate)
+ {
+ if (startDate.DayOfWeek == DayOfWeek.Saturday)
+ {
+ Days.Add(Tuple.Create(startDate, "鏄熸湡鍏�"));
+ }
+ startDate = startDate.AddDays(1);
+ }
+ }
+ else if (Sunday && Saturday)
+ {
+ while (startDate <= endDate)
+ {
+ if (startDate.DayOfWeek == DayOfWeek.Saturday || startDate.DayOfWeek == DayOfWeek.Sunday)
+ {
+ string weekdayChinese;
+ if (startDate.DayOfWeek == DayOfWeek.Sunday)
+ {
+ weekdayChinese = "鏄熸湡澶�";
+ Days.Add(Tuple.Create(startDate, weekdayChinese));
+ }
+ else if (startDate.DayOfWeek == DayOfWeek.Saturday)
+ {
+ weekdayChinese = "鏄熸湡鍏�";
+ Days.Add(Tuple.Create(startDate, weekdayChinese));
+ }
+ }
+ startDate = startDate.AddDays(1);
+ }
+ }
+ return Days;
+ }
+
+ //杩斿洖鐨勫瓧娈�
+ public class DayOfWeekInfo
+ {
+ public DateTime Date { get; set; }
+ public string DayOfWeekText { get; set; }
}
#endregion
@@ -11497,7 +11860,7 @@
/// <returns></returns>
[Route("Web/GetSc_ICMOBillListView3")]
[HttpGet]
- public object GetSc_ICMOBillListView3(string ICMOBill, int OrganizationID,int HSourceID)
+ public object GetSc_ICMOBillListView3(string ICMOBill, int OrganizationID, int HSourceID)
{
if (ICMOBill != "")
{
@@ -11865,7 +12228,7 @@
/// <returns></returns>
[Route("Web/GetCheckItemByCheckProjectID")]
[HttpGet]
- public object GetCheckItemByCheckProjectID(int CheckProjectID,int HBatchQty)
+ public object GetCheckItemByCheckProjectID(int CheckProjectID, int HBatchQty)
{
if (CheckProjectID <= 0)
{
@@ -11984,17 +12347,17 @@
DataSet ds2;
DataSet ds1;
- // string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
- // from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
- // left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
- // left join Gy_Employee e on e.HItemID=t.HManagerID
- // where a.HInterID=" + MouldMaintainRuleID);
+ // string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ // from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
+ // left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+ // left join Gy_Employee e on e.HItemID=t.HManagerID
+ // where a.HInterID=" + MouldMaintainRuleID);
- // string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a
- //left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID
- // left join h_v_IF_Material m on b.HMaterID=m.HItemID
- //left join h_v_IF_Unit u on b.HUnitID=u.HItemID
- // where a.HInterID=" + MouldMaintainRuleID);
+ // string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a
+ //left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID
+ // left join h_v_IF_Material m on b.HMaterID=m.HItemID
+ //left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+ // where a.HInterID=" + MouldMaintainRuleID);
string sql1 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub_Item where hmainid=" + MouldMaintainRuleID);
string sql2 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub where hmainid=" + MouldMaintainRuleID);
@@ -12134,16 +12497,16 @@
List<object> list = new List<object>();
DataSet ds2;
DataSet ds1;
- // string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
- // from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
- // left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
- // left join Gy_Employee e on e.HItemID=t.HManagerID
- // where a.HInterID=" + EquipProjectID);
- // string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
- //left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
- // left join h_v_IF_Material m on b.HMaterID=m.HItemID
- //left join h_v_IF_Unit u on b.HUnitID=u.HItemID
- // where a.HInterID=" + EquipProjectID);
+ // string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ // from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
+ // left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+ // left join Gy_Employee e on e.HItemID=t.HManagerID
+ // where a.HInterID=" + EquipProjectID);
+ // string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
+ //left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
+ // left join h_v_IF_Material m on b.HMaterID=m.HItemID
+ //left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+ // where a.HInterID=" + EquipProjectID);
string sql1 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleBillList where HInterID=" + EquipProjectID);
string sql2 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleSub where hmainid=" + EquipProjectID);
@@ -12228,7 +12591,7 @@
/// <returns></returns>
[Route("Web/GetItemByEquipFile")]
[HttpGet]
- public object GetItemByEquipFile(int EquipProjectID,string Type,string HDate)
+ public object GetItemByEquipFile(int EquipProjectID, string Type, string HDate)
{
if (EquipProjectID <= 0)
{
@@ -12311,7 +12674,7 @@
{
case "DJ":
HView = "h_v_QJ_GetDotCheckItemList";
- break;
+ break;
default:
objjson.code = "0";
objjson.count = 0;
@@ -12369,8 +12732,8 @@
}
try
{
-
- string sql = string.Format(@"select * from h_v_QJ_GetDotCheckItemList where 鐐规璁″垝ID = " + HInterID );
+
+ string sql = string.Format(@"select * from h_v_QJ_GetDotCheckItemList where 鐐规璁″垝ID = " + HInterID);
ds = oCN.RunProcReturn(sql, "h_v_QJ_GetDotCheckItemList");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -12405,8 +12768,8 @@
/// <returns></returns>
[Route("Web/GetEquipmentBillsList")]
[HttpGet]
- public object GetEquipmentBillsList(string sWhere, string Type,string user)
- {
+ public object GetEquipmentBillsList(string sWhere, string Type, string user)
+ {
try
{
List<object> columnNameList = new List<object>();
@@ -12807,26 +13170,26 @@
/// <returns></returns>
[Route("Web/GetHSourceBillType")]
[HttpGet]
- public object GetHSourceBillType(string HName,int Num)
+ public object GetHSourceBillType(string HName, int Num)
{
try
{
ClsCN oCn = new ClsCN();
DataSet oDs = new DataSet();
//鏈夌殑鍗曞瓙婧愬崟鍒嗕负绾㈣摑鍗� 0浠ｈ〃钃濆崟 1浠ｈ〃绾㈠崟
- if (Num==0)
+ if (Num == 0)
{ //婧愬崟涓鸿摑鍗�
- oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "'and HRedBlueFlag ='"+ Num+"' ", "Xt_BillSourceSet");
+ oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "'and HRedBlueFlag ='" + Num + "' ", "Xt_BillSourceSet");
}
- else if (Num==1)
+ else if (Num == 1)
{ //婧愬崟涓虹孩鍗�
oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "' and HRedBlueFlag ='" + Num + "' ", "Xt_BillSourceSet");
}
- else if(Num==2)
+ else if (Num == 2)
{ //涓嶅垎绾㈣摑鍗�
oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "'", "Xt_BillSourceSet");
}
-
+
objjson.code = "1";
objjson.count = 1;
objjson.Message = "鑾峰彇鎴愬姛锛�";
@@ -12901,7 +13264,7 @@
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); //鏁版嵁搴撴搷浣滃伐鍏�
string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition";
ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //鏌ヨ褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鑿滃崟鏁版嵁
- if (ds.Tables[0]==null || ds.Tables[0].Rows.Count == 0) //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夎缃繃鑷畾涔変俊鎭紝鑻ヨ褰曟暟涓�0锛屽垯娌℃湁璁剧疆杩囷紝鍔犺浇鎵�鏈夌殑鑿滃崟淇℃伅
+ if (ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0) //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夎缃繃鑷畾涔変俊鎭紝鑻ヨ褰曟暟涓�0锛屽垯娌℃湁璁剧疆杩囷紝鍔犺浇鎵�鏈夌殑鑿滃崟淇℃伅
{
sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
ds = oCn.RunProcReturn(sql, "Gy_Menu");
@@ -13026,7 +13389,7 @@
List<MenuInit> menuInitList = new List<MenuInit>(); //鐢ㄤ互鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝浠ュ強瀵瑰簲鑺傜偣鏄惁琚�変腑闇�瑕佸姞杞芥樉绀�
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where HType = '" +HType + "' Order by HItemID ", "Gy_Menu"); //鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝鐢ㄤ簬涓簃enuInitList鍒楄〃鍏呭疄鏁版嵁
+ ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HItemID ", "Gy_Menu"); //鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝鐢ㄤ簬涓簃enuInitList鍒楄〃鍏呭疄鏁版嵁
DataSet ds1 = new DataSet();
for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //灏咷y_Menu_1涓殑鑿滃崟淇℃伅鍙婇�変腑鎯呭喌淇濆瓨鍒癿enuInitList鍒楄〃涓紝
@@ -13123,16 +13486,16 @@
//璁剧疆鏁版嵁搴撴搷浣滅殑鍥炴粴鐐癸紝鑻ュ湪鎻愪氦鍓嶆姤閿欙紝鍒欏洖婊氬埌璇ョ偣锛屾湡闂存搷浣滃彇娑�
oCN.BeginTran();
-
+
//鍒犻櫎褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鏁版嵁
string sql = "delete from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HTypes + "'";
oCN.RunProc(sql);
//鎻掑叆褰撳墠鐢ㄦ埛鏈�鏂扮殑鑷畾涔夋暟鎹�
- for(int i=0;i< saveDataList.Count; i++)
+ for (int i = 0; i < saveDataList.Count; i++)
{
sql = "select * from Gy_Menu_1 where HItemID = '" + saveDataList[i].HItemID + "'";
- ds = oCn.RunProcReturn(sql,"Gy_Menu_1");
+ ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
if (ds.Tables[0].Rows.Count > 0)
{
string HPartentID = ds.Tables[0].Rows[0]["HPartentID"].ToString();
@@ -13142,7 +13505,7 @@
string HType = ds.Tables[0].Rows[0]["HType"].ToString();
string HPicNum = ds.Tables[0].Rows[0]["HPicNum"].ToString();
- if(HPartentID == "0" || HPartentID == ds.Tables[0].Rows[0]["HItemID"].ToString())
+ if (HPartentID == "0" || HPartentID == ds.Tables[0].Rows[0]["HItemID"].ToString())
{
string HPosition = ds.Tables[0].Rows[0]["HPosition"].ToString();
sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "')";
@@ -13153,12 +13516,12 @@
sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','z')";
oCN.RunProc(sql);
}
-
+
}
}
//鎻愪氦鏁版嵁搴撴搷浣�
oCN.Commit();
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -13591,15 +13954,15 @@
/// <returns></returns>
[Route("Web/GetOtherInBillMain_TempList_New")]
[HttpGet]
- public object GetOtherInBillMain_TempList_New (string HBillType, string sHMaker, Int64 HOrgID)
+ public object GetOtherInBillMain_TempList_New(string HBillType, string sHMaker, Int64 HOrgID)
{
WebS.WebService1 oWebs = new WebS.WebService1();
try
{
List<object> columnNameList = new List<object>();
-
+
DataSet ds = oCN.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New1 '" + HBillType + "','" + sHMaker + "'," + HOrgID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New1");
-
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -13645,12 +14008,12 @@
/// <returns></returns>
[Route("Web/GetProcNoList")]
[HttpGet]
- public object GetProcNoList(int HInterID,string sWhere,string UserID)
+ public object GetProcNoList(int HInterID, string sWhere, string UserID)
{
List<object> columnNameList = new List<object>();
try
{
- ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "','" + UserID + "'" , "h_p_Sc_ProcNoList");
+ ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "','" + UserID + "'", "h_p_Sc_ProcNoList");
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/DLL/ClsGy_RestDay_Ctl.cs b/WebAPI/DLL/ClsGy_RestDay_Ctl.cs
new file mode 100644
index 0000000..78a82aa
--- /dev/null
+++ b/WebAPI/DLL/ClsGy_RestDay_Ctl.cs
@@ -0,0 +1,108 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsGy_RestDay_Ctl : DBUtility.ClsGy_Base_Ctl
+ {
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_RestDay_Model oModel = new Model.ClsGy_RestDay_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+ //
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Insert into " + MvarItemKey + " " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID," +
+ "HOrgID,HDeptID,HRestDay,HWeekDay) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "','" +DateTime.Now+ "','" + oModel.HUSEORGID + "','" + oModel.HUseFlag + "','" + oModel.HMakeEmp+ "','" + oModel.HUSEORGID + "'" +
+ ",'" + oModel.HOrgID.ToString() + "','" + oModel.HDeptID.ToString() + "','" + oModel.HRestDay.ToString() + "','" + oModel.HWeekDay.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HModifyTime='" + DateTime.Now + "'" +
+ ",HUSEORGID='" + oModel.HUSEORGID + "'" +
+ ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
+ ",HOrgID ='" + oModel.HOrgID + "'" +
+ ",HDeptID ='" + oModel.HDeptID + "'" +
+ ",HRestDay ='" + oModel.HRestDay + "'" +
+ ",HWeekDay ='" + oModel.HWeekDay + "'" +
+ ",HUseFlag='" + oModel.HUseFlag + "'" +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_RestDay_Ctl()
+ {
+ MvarItemKey = "Gy_RestDay";
+ MvarReportTitle = "闃查敊瑁呯疆璁剧疆";
+ oModel = new Model.ClsGy_RestDay_Model();
+ }
+
+
+
+ }
+}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 5d49cc9..0430f33 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1122,7 +1122,7 @@
List<Model.ClsGy_ProjectMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoney_Model>>(jsonString);
return list;
}
-
+
/// <summary>
/// 澶勭悊鏂板闃查敊瑁呯疆琛ㄧ殑json
/// </summary>
@@ -1134,6 +1134,30 @@
List<Model.ClsGy_PreventErrMould_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PreventErrMould_Model>>(jsonString);
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板浼戞伅鏃ヨ〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_RestDay_Model> getObjectByJson_Gy_RestDay(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_RestDay_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_RestDay_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板浼戞伅鏃ヨ〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_RestDay_Model> getObjectByJson_SumGy_RestDay(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_RestDay_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_RestDay_Model>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 澶勭悊鏂板淇濆吇绾у埆琛ㄧ殑json
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user
index 8fda302..515506b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-07-12T03:12:48.2429052Z;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
+ <History>True|2024-07-15T10:25:56.8513970Z;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -21,28 +21,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>07/12/2024 11:12:04</publishTime>
+ <publishTime>07/15/2024 18:25:44</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/12/2024 11:12:04</publishTime>
+ <publishTime>07/15/2024 18:25:44</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/12/2024 11:12:03</publishTime>
+ <publishTime>07/15/2024 18:25:43</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/12/2024 11:12:03</publishTime>
+ <publishTime>07/15/2024 18:25:43</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/12/2024 11:12:00</publishTime>
+ <publishTime>07/15/2024 18:25:40</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/12/2024 11:12:00</publishTime>
+ <publishTime>07/15/2024 18:25:40</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/12/2024 11:12:01</publishTime>
+ <publishTime>07/15/2024 18:25:41</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/12/2024 11:12:01</publishTime>
+ <publishTime>07/15/2024 18:25:41</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>07/12/2024 11:11:59</publishTime>
+ <publishTime>07/15/2024 18:25:39</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/12/2024 11:11:59</publishTime>
+ <publishTime>07/15/2024 18:25:39</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/12/2024 11:12:00</publishTime>
+ <publishTime>07/15/2024 18:25:40</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/12/2024 11:12:00</publishTime>
+ <publishTime>07/15/2024 18:25:40</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/12/2024 11:12:00</publishTime>
+ <publishTime>07/15/2024 18:25:40</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/12/2024 11:12:00</publishTime>
+ <publishTime>07/15/2024 18:25:40</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/12/2024 11:12:08</publishTime>
+ <publishTime>07/15/2024 18:25:49</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/12/2024 11:12:08</publishTime>
+ <publishTime>07/15/2024 18:25:49</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/12/2024 11:12:47</publishTime>
+ <publishTime>07/15/2024 18:25:56</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs
index c1d3017..7305810 100644
--- a/WebAPI/Service/LuBaoSevice.cs
+++ b/WebAPI/Service/LuBaoSevice.cs
@@ -662,6 +662,44 @@
}
/// <summary>
+ /// 浼戞伅鏃ユ牴鎹甶d鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_RestDayDetailEdit(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "鍚嶇О涓嶈兘涓虹┖" };
+ var dataSet = GetGy_RestDayEditDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ紤鎭棩鏁版嵁" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_RestDayEditDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select * from h_v_Gy_RestDay where HItemID= '" + HID + "' ", "h_v_Gy_RestDay");
+ return dataSet;
+ }
+
+ /// <summary>
+ /// 浼戞伅鏃ユ牴鎹櫥褰曚汉鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_RestDayDetail(string HName)
+ {
+ if (string.IsNullOrEmpty(HName))
+ return new ApiResult<DataSet> { code = -1, msg = "鍚嶇О涓嶈兘涓虹┖" };
+ var dataSet = GetGy_RestDayDb(HName);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ紤鎭棩鏁版嵁" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_RestDayDb(string HName)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select a.HDeptID,b.HNumber 閮ㄩ棬缂栫爜,b.HName 閮ㄩ棬鍚嶇О,c.HNumber 缁勭粐缂栫爜,c.Hname 缁勭粐鍚嶇О from Gy_Czygl a left join Gy_Department b on a.HDeptID = b.HItemID left join Xt_ORGANIZATIONS c on a.HUSEORGID = c.HItemID where a.Czymc = '" + HName + "' ", "Gy_Czygl");
+ return dataSet;
+ }
+
+ /// <summary>
/// 淇濆吇绾у埆鏍规嵁id鑾峰彇淇℃伅
/// </summary>
public static ApiResult<DataSet> GetGy_MaintainLevDetail(string HID)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 0e4d2d8..af8fee9 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -685,6 +685,7 @@
<Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
<Compile Include="DLL\ClsGy_ErrMsgBackType_Ctl.cs" />
<Compile Include="DLL\ClsGy_MaintainLev_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_RestDay_Ctl.cs" />
<Compile Include="DLL\ClsGy_PreventErrMould_Ctl.cs" />
<Compile Include="DLL\ClsGy_TaskClass_Ctl.cs" />
<Compile Include="DLL\ClsGy_ProjectClass_Ctl.cs" />
--
Gitblit v1.9.1