MES-WEB-API.git

			@@ -34,7 +34,7 @@
			public DAL.ClsPay_WorkTimesBill BillOld = new DAL.ClsPay_WorkTimesBill(); //å¯¹åºåæ®ç±»


			#region èå¤æ±æ¥ååè¡¨
			#region èå¤æ±æ¥ååè¡¨ä¿¡æ¯
			/// <summary>
			/// è·åèå¤æ±æ¥ååè¡¨ä¿¡æ¯
			/// </summary>
			@@ -591,7 +591,7 @@
			}
			#endregion

			#region èå¤æ±æ¥åç¼è¾
			#region èå¤æ±æ¥åæ¨¡å ä»åè¡¨éä¸æå¼åæ®ï¼è¿ååæ®ä¿¡æ¯æ¶è°ç¨
			/// <summary>
			/// èå¤æ±æ¥åç¼è¾æ¶ï¼æ ¹æ®åæ®IDè·ååæ®ä¿¡æ¯
			/// </summary>
			@@ -624,62 +624,7 @@
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è¿åèå¤æ±æ¥åä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion



			#region[èå¤æ±æ¥åç¼è¾æ¶è·åè¡¨å¤´æ°æ®]
			[Route("Pay_WorkTimesBill/Pay_WorkTimesBillListCheckDetail")]
			[HttpGet]
			public ApiResult<DataSet> Pay_WorkTimesBillListCheckDetail(string HID)
			{
			if (string.IsNullOrEmpty(HID))
			return new ApiResult<DataSet> { code = -1, msg = "IDä¸è½ä¸ºç©º" };
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Pay_WorkTimesBillList where hmainid= " + HID + " ", "h_v_Pay_WorkTimesBillList");
			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 };
			}
			#endregion

			#region[èå¤æ±æ¥åç¼è¾æ¶è·åè¡¨ä½æ°æ®]
			[Route("Pay_WorkTimesBill/Pay_WorkTimesBillListProjectDetai")]
			[HttpGet]
			public object Pay_WorkTimesBillListProjectDetai(Int64 HInterID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_Pay_WorkTimesBill_EditInit " + HInterID, "h_p_Pay_WorkTimesBill_EditInit");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æªæ¥è¯¢å°è¯¥èå¤æ±æ¥åï¼è¯·å·æ°æ°æ®åéæ°éæ©ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			@@ -694,154 +639,119 @@
			objJsonResult.data = null;
			return objJsonResult;
			}


			}
			#endregion

			#region èå¤æ±æ¥åä¿å
			/// <summary>
			/// æ°å¢åæ®-ä¿åæé®
			///åæ°ï¼string sqlã
			///è¿åå¼ï¼objectã
			/// èå¤æ±æ¥åä¿å
			/// </summary>
			[Route("Pay_WorkTimesBill/SaveGetWorkTimesBillList")]
			[Route("Pay_WorkTimesBillController/GetPay_WorkTimesBill_Save_Json")]
			[HttpPost]
			public object SaveGetWorkTimesBillList([FromBody] JObject msg)
			public object GetPay_WorkTimesBill_Save_Json([FromBody] JObject sMainSub)
			{
			var _value = msg["msg"].ToString();
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string refSav = sArray[2].ToString();
			string msg4 = sArray[3].ToString();

			string UserName = "";
			string s = "";
			DBUtility.ClsPub.CurUserName = msg4; //æä½äºº
			ListModels oListModels = new ListModels();
			string sMainStr = sArray[0].ToString(); //ä¸»è¡¨æ°æ®
			string sSubStr = sArray[1].ToString(); //åè¡¨æ°æ®
			string OperationType = sArray[2].ToString(); //æä½ç±»åï¼1æ°å¢ã2ç¼è¾ï¼
			string HMaker = sArray[3].ToString(); //å¶åäºº
			try
			{
			//ç¼è¾æé
			if (!DBUtility.ClsPub.Security_Log_second("Pay_WorkTimesBill_Edit", 1, false, msg4))
			//å¤ææé
			if (OperationType == "1")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ ä¿åæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DLL.ClsPay_WorkTimesBill oBill = new DLL.ClsPay_WorkTimesBill();
			List<Models.ClsPay_WorkTimesBillMain> lsmain = new List<Models.ClsPay_WorkTimesBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Pay_WorkTimesBillMain(msg2);
			foreach (Models.ClsPay_WorkTimesBillMain oItem in lsmain)
			{
			if (refSav == "Add")
			{
			//åæ®å·æ¯å¦éå¤
			if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·éå¤ï¼ä¸åè®¸ä¿åï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			if (refSav == "Update")
			{
			if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®æè¯¯ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//å¤ææ¯å¦å¯ç¼è¾
			if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®å·²ç»è¢«å®¡æ ¸ï¼ä¸åè®¸ä¿®æ¹ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (BillOld.omodel.HBillStatus > 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®å¤äºä¸å¯ç¼è¾ç¶æï¼ä¸åè®¸ä¿®æ¹ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s + "ï¼ä¸åè®¸ä¿®æ¹";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			UserName = oItem.HMaker; //å¶åäºº
			oItem.HBillType = "2203";
			oItem.HBillSubType = "2203";
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
			oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
			BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
			//å¤ææ°å¢æé
			if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼æ²¡æåæ®æ¥æï¼æ æ³ä¿åï¼";
			objJsonResult.data = 1;
			objJsonResult.Message = "æ¨æ²¡æè¯¥æ¨¡åæ°å¢æé,è¯·ä¸ç®¡çåèç³»ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oBill.omodel = oItem;
			}
			//è¡¨ä½æ°æ®
			//æ },{æ¥æåæ°ç» //å»æãåã
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			//msg2 = msg2.Replace("'", "â");
			List<Models.ClsPay_WorkTimesBillSub> ls = new List<Models.ClsPay_WorkTimesBillSub>();
			ls = oListModels.getObjectByJson_Pay_WorkTimesBillSub(msg3);
			int i = 0;
			foreach (Models.ClsPay_WorkTimesBillSub oItemSub in ls)
			{
			i++;
			oItemSub.HEntryID = i;
			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate("");
			oItemSub.HCloseType = false; //å³éç±»å
			oItemSub.HSourceInterID = 0; // æºåä¸»åç
			oItemSub.HSourceEntryID = 0; //æºåååç
			oBill.DetailColl.Add(oItemSub);
			}
			//ä¿å
			//ä¿åå®æ¯åå¤ç
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
			//å¤æç¼è¾æé
			if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¨æ²¡æè¯¥æ¨¡åç¼è¾æé,è¯·ä¸ç®¡çåèç³»ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//è¡¨å¤´èµå¼
			sMainStr = sMainStr.Replace("\\", "");
			sMainStr = sMainStr.Replace("\n", "");
			sMainStr = "[" + sMainStr.ToString() + "]";
			List<Model.ClsPay_WorkTimesBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_WorkTimesBillMain>>(sMainStr);
			foreach (Model.ClsPay_WorkTimesBillMain oItem in lsmain)
			{
			//åæ®å·æ¯å¦éå¤
			if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·éå¤ï¼ä¸åè®¸ä¿åï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//å¤æä¼è®¡ææ¯å¦åç
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod_Pay(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s;
			objJsonResult.data = null;
			return objJsonResult;
			}

			oItem.HYear = sYear;
			oItem.HPeriod = sPeriod;
			DBUtility.ClsPub.CurUserName = oItem.HMaker;
			oBill.omodel = oItem;
			}
			//è¡¨ä½èµå¼
			//æ },{æ¥æåæ°ç» //å»æãåã
			sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
			sSubStr = sSubStr.Replace("\\", "");
			sSubStr = sSubStr.Replace("\n", "");
			sSubStr = "[" + sSubStr.ToString() + "]";
			List<Model.ClsPay_WorkTimesBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_WorkTimesBillSub>>(sSubStr);
			int i = 0;
			foreach (Model.ClsPay_WorkTimesBillSub oItemSub in ls)
			{
			i++;
			oItemSub.HEntryID = i;
			oBill.DetailColl.Add(oItemSub);
			}

			//ä¿å
			bool bResult;
			if (OperationType == "1") //æ°å¢ä¿å
			{
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else //ç¼è¾ä¿å
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}

			if (bResult)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä¿åæåï¼";
			//WebAPIController.Add_Log("éè´§åä¸æ¨", UserName, "çæéè´§å");
			objJsonResult.data = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			@@ -849,7 +759,7 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			@@ -857,12 +767,33 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = 1;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼" + e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion




















			/// <summary>
			/// éè¿çç»æ¥è¯¢èåä¿¡æ¯
			///åæ°ï¼string sqlã