MES-WEB-API.git

			@@ -94,13 +94,13 @@
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = @"SELECT HMaterID,HMaterCode,HMaterName,è§æ ¼åå· HMaterSpec,HUnitID,HUnitNumber,HUnitName
			string sql = @"SELECT HMaterID,HMaterCode,HMaterName,è§æ ¼åå· HMaterSpec,HUnitID,HUnitNumber,HUnitName,
			HProcID,HProcNumber,HProcName,HSourceID,HSourceNumber,HSourceName,å·¥æ¶ HTimes,æ°é HQty,å·¥ä»· HPrice,éé¢ HMoney, HSumMoney,HOtherSubsidy,HOtherDeduct,HPayMoney FROM h_v_Pay_GroupBalBillList where 1 = 1 " + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Pay_GroupBalBillList");
			string sql1 = @"select
			HEmpID ,b.HNumber HEmpNumber, b.HName HEmpName, b.HEmpRate HEmpRate, HBaseTimes, HMoney, HOtherSubsidy, HOtherSubsidy, HYF,'' HISZF ,'' HISFT , a.HRemark
			from Pay_GroupBalBillEmp a
			left join Gy_Employee b on a.HEmpID = b.HItemID " + sqlWhere.Replace("hmainid", "HInterID");
			left join Gy_Employee b on a.HEmpID = b.HItemID where 1 = 1 " + sqlWhere.Replace("hmainid", "HInterID");
			ds1 = oCN.RunProcReturn(sql1, "Pay_GroupBalBillEmp");
			list.Add(ds.Tables[0]);
			list.Add(ds1.Tables[0]);
			@@ -120,6 +120,146 @@
			}
			#endregion



			#region è®¾å¤ä¿å»è®¡åè¡¨ ä¿å/ç¼è¾
			/// <summary>
			/// ä¿åæ¨¡å·ç»´ä¿®å
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("Pay_GroupBalBill/AddBill")]
			[HttpPost]
			public object AddBill([FromBody] JObject sMainSub)
			{
			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 msg4 = sArray[2].ToString();

			string UserName = "";
			ListModels oListModels = new ListModels();
			try
			{
			DLL.ClsPay_GroupBalBill oBill = new DLL.ClsPay_GroupBalBill();
			List<Models.ClsPay_GroupBalBillMain> lsmain = new List<Models.ClsPay_GroupBalBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Pay_GroupBalBillMain(msg2);
			foreach (Models.ClsPay_GroupBalBillMain oItem in lsmain)
			{
			UserName = oItem.HMaker; //å¶åäºº
			oItem.HBillType = "2202";
			oItem.HBillSubType = "2202";
			//oItem.HInterID =0;
			//oItem.HBillNo = "";
			oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --æ¥æ
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼æ²¡æåæ®æ¥æï¼æ æ³ä¿åï¼";
			objJsonResult.data = 1;
			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_GroupBalBillSub> ls = new List<Models.ClsPay_GroupBalBillSub>();
			ls = oListModels.getObjectByJson_Pay_GroupBalBillSub(msg3);
			int i = 0;
			foreach (Models.ClsPay_GroupBalBillSub item in ls)
			{
			i++;
			item.HEntryID = i;
			//oItemSub.HCloseMan = ""; //è¡å³é
			item.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			item.HCloseType = false; //å³éç±»å
			//oItemSub.HRemark = ""; //å¤æ³¨
			item.HSourceInterID = 0; // æºåä¸»åç
			item.HSourceEntryID = 0; //æºåååç
			//oItemSub.HSourceBillNo = ""; //æºååå·
			//oItemSub.HSourceBillType = ""; //æºåç±»å
			item.HRelationQty = 0; //å³èæ°é
			oBill.DetailColl.Add(item);

			}
			//éä»¶é¡¹è¡¨ä½æ°æ®
			//æ },{æ¥æåæ°ç» //å»æãåã
			msg4 = msg4.Substring(1, msg4.Length - 2);
			msg4 = msg4.Replace("\\", "");
			msg4 = msg4.Replace("\n", ""); //\n
			//msg2 = msg2.Replace("'", "â");
			List<Models.ClsPay_GroupBalBillEmp> ls1 = new List<Models.ClsPay_GroupBalBillEmp>();
			ls1 = oListModels.getObjectByJson_Pay_GroupBalBillEmp(msg4);
			int j = 0;
			foreach (Models.ClsPay_GroupBalBillEmp oItemSub in ls1)
			{

			j++;
			oItemSub.HEntryID = j;
			//oItemSub.HCloseMan = ""; //è¡å³é
			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false; //å³éç±»å
			//oItemSub.HRemark = ""; //å¤æ³¨
			oItemSub.HSourceInterID = 0; // æºåä¸»åç
			oItemSub.HSourceEntryID = 0; //æºåååç
			//oItemSub.HSourceBillNo = ""; //æºååå·
			//oItemSub.HSourceBillType = ""; //æºåç±»å
			oItemSub.HRelationQty = 0; //å³èæ°é
			oBill.DetailEmpColl.Add(oItemSub);

			}
			//ä¿å
			//ä¿åå®æ¯åå¤ç
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			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;
			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;
			}
			}
			#endregion

			/// <summary>
			///å·¥èµç»ç®ä¸ªäººåå é¤åè½
			/// </summary>