MES-WEB-API.git

			@@ -8,6 +8,7 @@
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using System.Diagnostics;
			using System.Threading;

			namespace WebAPI.Controllers.SCGL.æ¥è®¡åç®¡ç
			{
			@@ -42,7 +43,8 @@
			omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);

			ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID == null ? 0 : omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
			$",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");
			$",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}" +
			$",'{omdelMian.HMastersDate}','{omdelMian.sWheres}'", "h_p_JIT_Sc_WorkBillSortBill_Query");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -220,14 +222,16 @@
			" HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
			" HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
			"HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
			"HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty)values" +
			"HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
			",HICMOInterID,HICMOEntryID)values" +
			$"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
			$"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
			$"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
			$" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}," +
			$" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
			$"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
			$"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty})";
			$"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty}," +
			$"{HMainSourceInterID},{HMainSourceEntryID})";

			//LogService.Write("sql:" + sql);
			//ä¸»è¡¨
			@@ -241,6 +245,13 @@
			var HICMOEntrySEQ = list[i]["çäº§è®¢åæç»è¡å·"].ToString();
			var HSourceID = list[i]["HSourceID"].ToString();
			var HYX = list[i]["ä¼åçº§"].ToString();
			var HWorkQty = list[i]["å°æ¶äº§è½"].ToString();
			var HProdTimes = list[i]["çäº§å¨æ"].ToString();
			var HReadyTimes = list[i]["å¼å·¥ä½é"].ToString();
			var HLastBeginDate = list[i]["æè¿å¼å·¥æ¥æ"].ToString();
			var HLastEndDate = list[i]["æè¿å®å·¥æ¥æ"].ToString();
			var HOrderNeedQty = list[i]["è®¢åéæ±æ°é"].ToString();
			var HOrderCommitDate = list[i]["è®¢åäº¤è´§æ"].ToString();

			if (HSourceID == "" \|\| HSourceID == "0")
			{
			@@ -272,7 +283,10 @@
			return objJsonResult;
			}

			oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["åæ®å·"].ToString()}'");
			oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX}" +
			$",HWorkQty={HWorkQty},HProdTimes={HProdTimes},HReadyTimes={HReadyTimes},HLastBeginDate='{HLastBeginDate}'" +
			$",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}'" +
			$" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["åæ®å·"].ToString()}'");
			}

			oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["æ¥è®¡åæ°éæ»é"].ToString()} where HInterID={(HInterID==0?int.Parse(list[i]["hmainid"].ToString()):HInterID)} and HBillNo='{(HBillNo==""?list[i]["åæ®å·"].ToString(): HBillNo)}'");
			@@ -289,8 +303,8 @@
			objJsonResult = AddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
			, HBillNo == "" ? list[i]["åæ®å·"].ToString() : HBillNo
			, DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
			, int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()));

			, int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString())
			, list[i]);
			if (objJsonResult.count == 1)
			{
			TrueCount += 1;
			@@ -299,7 +313,7 @@
			//ä¸»è¡¨ææ°æ® åè¡¨æ æ°æ®
			if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "")
			{
			objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
			objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0, list[i]);
			}
			}
			}
			@@ -332,11 +346,10 @@
			}
			}

			public json AddBillSub(string HInterID, string HBillNo, DateTime date, int HQTY)
			public json AddBillSub(string HInterID, string HBillNo, DateTime date, int HQTY, Dictionary<string, string> dic)
			{
			//è·åè¡¨æ ¼æ°æ®
			ds = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where åæ®å·='{HBillNo}'", "h_v_JIT_Sc_WorkBillSortBillList");

			int count = 0;
			if (ds.Tables[0].Rows.Count > 0)
			{
			@@ -345,7 +358,7 @@
			{
			if (DateTime.Parse(ds.Tables[0].Rows[i]["æ¥è®¡åçäº§æ¥æ"].ToString()) == date)
			{
			oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY}" +
			oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY},HUseTimes={(dic["å°æ¶äº§è½"]=="0"?0: HQTY / float.Parse(dic["å°æ¶äº§è½"].ToString()))}" +
			$" where HInterID={HInterID} and HEntryID={ds.Tables[0].Rows[i]["hsubid"].ToString()}");
			count += 1;
			}
			@@ -356,9 +369,9 @@
			{
			//æå¥åè¡¨
			oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
			"HMasterDate,HQty)" +
			"HMasterDate,HQty,HUseTimes)" +
			$"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
			$" '{date}', {HQTY})");
			$" '{date}', {HQTY},{(dic["å°æ¶äº§è½"] == "0" ? 0 : HQTY / float.Parse(dic["å°æ¶äº§è½"].ToString()))})");
			}

			objJsonResult.code = "1";
			@@ -2586,5 +2599,102 @@
			}
			#endregion

			#region çäº§æ¥è®¡åå¹³å° æ°æ®åå¤ è®¾ç½®ä»»å¡åç¸å³ä¿¡æ¯
			[Route("JIT_DayPlanPlatFormBill/ReadyData")]
			[HttpGet]
			public object ReadyData(string HICOMNum)
			{
			try
			{
			var list = HICOMNum.Split(',');
			DataTable dt = new DataTable("date");
			dt.Columns.Add("HICMOInterID", typeof(string));
			dt.Columns.Add("HICMOEntryID", typeof(string));
			dt.Columns.Add("å°æ¶äº§è½", typeof(string));
			dt.Columns.Add("çäº§å¨æ", typeof(decimal));
			dt.Columns.Add("å¼å·¥ä½é", typeof(decimal));
			dt.Columns.Add("æè¿å¼å·¥æ¥æ", typeof(DateTime));
			dt.Columns.Add("æè¿å®å·¥æ¥æ", typeof(DateTime));
			dt.Columns.Add("è®¢åéæ±æ°é", typeof(decimal));
			dt.Columns.Add("è®¢åäº¤è´§æ", typeof(DateTime));

			for (int i = 0; i < list.Length; i++)
			{
			string HICMOInterID = list[i].Split(';')[0].ToString();
			string HICMOEntryID = list[i].Split(';')[1].ToString();

			Thread.Sleep(100);
			ds = oCN.RunProcReturn("exec h_p_Sc_GetInfoByICMOBillNo " + HICMOInterID+","+ HICMOEntryID, "h_p_Sc_GetInfoByICMOBillNo");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{

			}
			else
			{
			DataRow dr = dt.NewRow();
			dr["å°æ¶äº§è½"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["äº§è½"]);
			dr["çäº§å¨æ"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["çäº§å¨æ"]);
			dr["å¼å·¥ä½é"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["å¼å·¥ä½é"]);
			dr["æè¿å¼å·¥æ¥æ"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["æè¿å¼å·¥æ¥æ"]);
			dr["æè¿å®å·¥æ¥æ"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["æè¿å®å·¥æ¥æ"]);
			dr["è®¢åéæ±æ°é"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["è®¢åéæ±æ°"]);
			dr["è®¢åäº¤è´§æ"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["è®¢åäº¤è´§æ"]);
			dr["HICMOInterID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HICMOInterID"]);
			dr["HICMOEntryID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HICMOEntryID"]);
			dt.Rows.Add(dr);
			}
			}

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

			#region ç¼ºæåææ¥è¡¨
			public class MaterialShorAnalysis
			{
			public int? HORGID;
			public DateTime HBEGINDATE;
			public DateTime HENDDATE;
			}
			[Route("JIT_DayPlanPlatFormBill/MaterialShorAnalysisReport")]
			[HttpGet]
			public object MaterialShorAnalysisReport(string sWhere)
			{
			try
			{
			MaterialShorAnalysis Report = JsonConvert.DeserializeObject<MaterialShorAnalysis>(sWhere);

			ds = oCN.RunProcReturn($"exec h_p_JIT_MaterialShorAnalysisReportList {Report.HORGID},'{Report.HBEGINDATE}','{Report.HENDDATE}' ", "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

			}
			}