MES-WEB-API.git

			@@ -6,6 +6,7 @@
			using System.Web;
			using System.Web.Http;
			using WebAPI.Models;
			using Newtonsoft.Json;

			namespace WebAPI.Controllers.SCGL
			{
			@@ -26,7 +27,7 @@
			try
			{
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("Cg_PODemandPlanBill_Query", 1, false, user))
			if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -86,13 +87,11 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();

			int hentryid = int.Parse(sArray[2].ToString());//åè¡¨çé¡ºåºid
			int OperationType = int.Parse(sArray[3].ToString());//æ°æ®ç±»å 1æ·»å 3ä¿®æ¹
			string user = sArray[4].ToString();
			int OperationType = int.Parse(sArray[2].ToString());//æ°æ®ç±»å 1æ·»å 3ä¿®æ¹
			string user = sArray[3].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Cg_PODemandPlanBill_Edit", 1, false, user))
			if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -103,7 +102,11 @@

			omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<JIT_Cg_PODemandPlanBillMain>(msg2);
			string BillType = "4608";

			ds = ds = oCN.RunProcReturn($"select * from h_v_JIT_Cg_PODemandPlanBillList where hmainid={omdelMian.HInterID} and åæ®å·='{omdelMian.HBillNo}'", "h_v_JIT_Cg_PODemandPlanBillList");
			if (ds.Tables[0].Rows.Count > 0)
			{
			OperationType = 3;
			}

			if (OperationType == 1)//æ°å¢
			{
			@@ -126,7 +129,7 @@
			$",HRemark='{omdelMian.HRemark}',HExplanation='{omdelMian.HExplanation}' where HInterID={omdelMian.HInterID}");
			}
			//ä¿ååè¡¨
			objJsonResult = AddBillSub(msg3, hentryid);
			objJsonResult = AddBillSub(msg3);
			if (objJsonResult.code == "0")
			{
			objJsonResult.code = "0";
			@@ -152,16 +155,10 @@
			}
			}

			public json AddBillSub(string msg3, int hentryid)
			public json AddBillSub(string msg3)
			{
			if (hentryid != -1)
			{
			//è·åè¡¨æ ¼æ°æ®
			ds = oCN.RunProcReturn($"select * from h_v_JIT_Cg_PODemandPlanBillList where åæ®å·='{omdelMian.HBillNo}'", "h_v_JIT_Cg_PODemandPlanBillList");
			//å é¤åè¡¨
			oCN.RunProc("delete from JIT_Cg_PODemandPlanBillSub where HInterID='" + omdelMian.HInterID.ToString() + "' and HEntryID='" + hentryid + "'");
			}

			//å é¤åè¡¨
			oCN.RunProc("delete from JIT_Cg_PODemandPlanBillSub where HInterID='" + omdelMian.HInterID.ToString() + "'");

			omodelsub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JIT_Cg_PODemandPlanBillSub>>(msg3);
			int i = 1;
			@@ -177,7 +174,7 @@
			", HCloseMan, HEntryCloseDate, HSendQty, HReciveQty, HCloseStatus" +
			", HRemoveQty, HSeOrderBillNo, HUnReciveQty, HPOOrderBillDate, HPOOrderBillDeliveryDate" +
			", HPOOrderBillRemark, HPOOrderBillNote)" +
			$"values({omdelMian.HInterID}, {(hentryid == -1 ? i : omodelsub.Count == 1 ? hentryid : i == 1 ? hentryid : (i + ds.Tables[0].Rows.Count - 1))}, '{oSub.HLaterReason}', {(oSub.HMaterID == null ? 0 : oSub.HMaterID)}, '{oSub.HMaterName}'" +
			$"values({omdelMian.HInterID}, {i}, '{oSub.HLaterReason}', {(oSub.HMaterID == null ? 0 : oSub.HMaterID)}, '{oSub.HMaterName}'" +
			$", '{oSub.HMaterModel}', {(oSub.HUnitID == null ? 0 : oSub.HUnitID)}, '{oSub.HErpClsID}', {(oSub.HQty == null ? 0 : oSub.HQty)}, '{oSub.HRemark}'" +
			$", {(oSub.HPURCHASEORGID == null ? 0 : oSub.HPURCHASEORGID)}, '{oSub.HStatus}', {(oSub.HFixleadTime == null ? 0 : oSub.HFixleadTime)}, '{oSub.HDayPlanBillNo}', {oSub.HSourceInterID}" +
			$", {oSub.HSourceEntryID}, '{oSub.HSourceBillNo}', '{oSub.HSourceBillType}', {(oSub.HWorkShopID == null ? 0 : oSub.HWorkShopID)}, '{oSub.HDayPlanDate}'" +
			@@ -206,7 +203,7 @@
			try
			{
			//å é¤æé
			if (!DBUtility.ClsPub.Security_Log_second("Cg_PODemandPlanBill_Drop", 1, false, User))
			if (!DBUtility.ClsPub.Security_Log_second("JIT_Cg_PODemandPlanBill_Drop", 1, false, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -271,7 +268,7 @@
			try
			{
			//å³éæé
			if (!DBUtility.ClsPub.Security_Log_second("Cg_PODemandPlanBill_Close", 1, false, User))
			if (!DBUtility.ClsPub.Security_Log_second("JIT_Cg_PODemandPlanBill_Close", 1, false, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -284,11 +281,11 @@

			if (ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["åæ®ç¶æ"].ToString() == "2")
			if (ds.Tables[0].Rows[0]["åæ®ç¶æ"].ToString() == "3")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½ååæ®æ£å¨å®¡æ ¸,ä¸è½å³éï¼";
			objJsonResult.Message = "å½ååæ®å·²å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -323,5 +320,150 @@
			}
			}
			#endregion

			#region ææè®¡åå åå³é
			[Route("JIT_Cg_PODemandPlanBill/CancelClosePODemandPlanBillList")]
			[HttpGet]
			public object CancelClosePODemandPlanBillList(string HInterID, string User)
			{
			try
			{
			//å³éæé
			if (!DBUtility.ClsPub.Security_Log_second("JIT_Cg_PODemandPlanBill_Close", 1, false, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéå³éï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from h_v_JIT_Cg_PODemandPlanBillList where 1=1 and hmainid=" + HInterID, "h_v_JIT_Cg_PODemandPlanBillList");

			if (ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["åæ®ç¶æ"].ToString() != "3")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½ååæ®æ²¡æå¤äºå³éç¶æ!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();//å¼å¯äºå¡

			string HBillStatus = ds.Tables[0].Rows[0]["å®¡æ ¸äºº"].ToString() == "" ? "1" : "2";
			oCN.RunProc($"update JIT_Cg_PODemandPlanBillMain set HBillStatus='{HBillStatus}',HCloseMan='',HCloseDate=null where HInterID={HInterID}");

			oCN.Commit();//ç»æäºå¡

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éæåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			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 ææè®¡åå ææè®¡åæ¥è¡¨(éè´è®¢åç»´åº¦)
			public class ReportPODemandPlanBill
			{
			public int? HORGID;
			public DateTime HBEGINDATE;
			public DateTime HENDDATE;
			public int? HMATERIALID;
			public int? HSUPPLIERID;
			public string HXQD;
			public string HPURORDERNO;
			}
			[Route("JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList")]
			[HttpGet]
			public object ReportPODemandPlanBillList(string sWhere, string user)
			{
			try
			{
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æ¥çæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			ReportPODemandPlanBill Report = JsonConvert.DeserializeObject<ReportPODemandPlanBill>(sWhere);

			ds = oCN.RunProcReturn($"exec h_p_JIT_PODemandPlanBill_ReportList {Report.HORGID},'{Report.HBEGINDATE}','{Report.HENDDATE}',{Report.HMATERIALID},{Report.HSUPPLIERID},'{Report.HXQD}','{Report.HPURORDERNO}' ", "h_p_JIT_PODemandPlanBill_ReportList");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region ææè®¡åå ææè®¡åæ¥è¡¨
			[Route("JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList_S")]
			[HttpGet]
			public object ReportPODemandPlanBillList_S(string sWhere, string user)
			{
			try
			{
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æ¥çæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn($"exec h_p_JIT_PODemandPlanBill_S_ReportList '{sWhere.ToString()}' ", "h_p_JIT_PODemandPlanBill_S_ReportList");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}