MES-WEB-API.git

			@@ -98,6 +98,40 @@
			return objJsonResult;
			}
			}

			/// <summary>
			/// æ ¹æ®ç¹å»è¡æ é¢æ¶é´æ¥è¯¢ç¼ºæåæ
			/// </summary>
			/// <param name="sWhere"></param>
			/// <param name="user"></param>
			/// <returns></returns>
			[Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHDateTimeList")]
			[HttpGet]
			public object JIT_DayPlanPlatFormBillHDateTimeList(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];
			//objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region çäº§æ¥è®¡åå¹³å° ä¿å
			@@ -129,7 +163,7 @@

			public json AddBillMain(string msg1)
			{
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string[] sArray = msg1.Split(new string[] { "&å" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();

			@@ -160,7 +194,7 @@

			LogService.CustomWriteLog("2:", DateTime.Now.ToString("yyyy-MM-dd"));
			int TrueCount = 0, SumCount = 0;

			LogService.CustomWriteLog("list.Count:"+ list.Count, DateTime.Now.ToString("yyyy-MM-dd"));
			for (int i = 0; i < list.Count; i++)
			{
			TrueCount = 0;
			@@ -169,6 +203,7 @@
			var HBillNo = "";
			if (list[i]["åæ®å·"].ToString() == "" && list[i]["hmainid"].ToString() == "")
			{
			LogService.CustomWriteLog("2.01:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
			var HICMOBillNo = list[i]["çäº§è®¢åå·"].ToString();
			var HOrderType = list[i]["è®¢åç±»å"].ToString();
			var HICMOEntrySEQ = list[i]["çäº§è®¢åæç»è¡å·"].ToString();
			@@ -178,13 +213,14 @@
			var HProdORGID = list[i]["HProdORGID"].ToString();
			var HMaterID = list[i]["HMaterID"].ToString();
			var HMaterName = list[i]["ç©æåç§°"].ToString();
			var HMaterModel = list[i]["è§æ ¼åå·"].ToString();
			var HMaterModel = list[i]["è§æ ¼åå·"].ToString().Replace("'", "''");
			var HUnitID = list[i]["HUnitID"].ToString();
			var HSeOrderBillQty = list[i]["éå®è®¢åæ°é"].ToString();
			//var HOrderNeedQty = list[i]["è®¢åéæ±æ°é"].ToString();
			var HSplitQty = list[i]["æåæ°é"].ToString();
			var HDayPlanSumQty = list[i]["æ¥è®¡åæ°éæ»é"].ToString();
			var HPlanBeginDate = list[i]["è®¡åå¼å§æ¥æ"].ToString();
			var HPlanEndDate = list[i]["è®¡åç»ææ¥æ"].ToString();
			var HSeOrderBillNo = list[i]["éå®è®¢åå·"].ToString();
			var HICMOBillType = list[i]["çäº§è®¢ååæ®ç±»å"].ToString();
			var HSourceStockInQty = list[i]["äº§çº¿å¥åºæ°é"].ToString();
			@@ -193,6 +229,9 @@
			var HMainSourceInterID = list[i]["æºåä¸»åç "].ToString();
			var HMainSourceEntryID = list[i]["æºåååç "].ToString();
			var HPlanQty = list[i]["è®¡åæ°é"].ToString();
			var HEmpID = list[i]["HEmpID"].ToString();

			LogService.CustomWriteLog("2.05:" + i, DateTime.Now.ToString("yyyy-MM-dd"));

			if (HSourceID == ""\|\| HSourceID == "0")
			{
			@@ -203,7 +242,7 @@
			return objJsonResult;
			}

			ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
			ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
			$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
			if (ds.Tables[0].Rows.Count > 0)
			{
			@@ -225,7 +264,7 @@
			" HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
			"HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
			"HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
			",HICMOInterID,HICMOEntryID)values" +
			",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID)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)}," +
			@@ -233,7 +272,7 @@
			$" 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},'{HPlanEndDate}','{HEmpID}')";

			//LogService.Write("sql:" + sql);
			//ä¸»è¡¨
			@@ -241,6 +280,9 @@
			}
			else
			{
			LogService.CustomWriteLog("2.0:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
			HBillNo = list[i]["åæ®å·"].ToString();
			HInterID = int.Parse(list[i]["hmainid"].ToString());
			var HMainSourceInterID = list[i]["æºåä¸»åç "].ToString();
			var HMainSourceEntryID = list[i]["æºåååç "].ToString();
			var HICMOBillNo = list[i]["çäº§è®¢åå·"].ToString();
			@@ -254,6 +296,10 @@
			var HLastEndDate = list[i]["æè¿å®å·¥æ¥æ"].ToString();
			var HOrderNeedQty = list[i]["è®¢åéæ±æ°é"].ToString();
			var HOrderCommitDate = list[i]["è®¢åäº¤è´§æ"].ToString();
			var HPlanEndDate = list[i]["è®¡åç»ææ¥æ"].ToString();
			var HSplitQty = list[i]["æåæ°é"].ToString();

			LogService.CustomWriteLog("2.1:"+i, DateTime.Now.ToString("yyyy-MM-dd"));

			if (HSourceID == "" \|\| HSourceID == "0")
			{
			@@ -278,16 +324,20 @@

			if (ds.Tables[0].Rows.Count > 1)
			{
			LogService.CustomWriteLog("ç¬¬" + i + 1 + "è¡çäº§èµæºæéå¤,è¯·ä¿®æ¹", DateTime.Now.ToString("yyyy-MM-dd"));
			LogService.CustomWriteLog($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
			$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", DateTime.Now.ToString("yyyy-MM-dd"));
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"ç¬¬{i + 1}è¡çäº§èµæºæéå¤,è¯·ä¿®æ¹!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			LogService.CustomWriteLog("2.2:" + i, DateTime.Now.ToString("yyyy-MM-dd"));

			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}'" +
			$",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}',HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty}" +
			$" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["åæ®å·"].ToString()}'");
			}

			@@ -295,6 +345,7 @@

			int SumDay = 31; //å¨æä¸¤æä¹å·® DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;

			LogService.CustomWriteLog("2.3:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
			for (int j = 0; j < SumDay; j++)
			{
			//ä¸»è¡¨åè¡¨é½ææ°æ®
			@@ -305,7 +356,7 @@
			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())
			, Math.Round(double.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()),1)
			, list[i]);
			if (objJsonResult.count == 1)
			{
			@@ -315,22 +366,29 @@
			//ä¸»è¡¨ææ°æ® åè¡¨æ æ°æ®
			if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "")
			{
			//LogService.CustomWriteLog("3:"+ HInterID+","+ HBillNo, DateTime.Now.ToString("yyyy-MM-dd"));
			objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0, list[i]);
			}
			}

			LogService.CustomWriteLog("2.4:" + i, DateTime.Now.ToString("yyyy-MM-dd"));

			if (TrueCount != SumCount)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = objJsonResult.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			if (TrueCount != SumCount)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = objJsonResult.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			LogService.CustomWriteLog("2.5:", DateTime.Now.ToString("yyyy-MM-dd"));

			//åæ¥æ¥è®¡åå·¥å
			oCN.RunProc("exec REALESE_SC_ICMOBILLSTATUS_TMP");

			LogService.CustomWriteLog("2.6:", DateTime.Now.ToString("yyyy-MM-dd"));

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -348,8 +406,8 @@
			}
			}

			public json AddBillSub(string HInterID, string HBillNo, DateTime date, int HQTY, Dictionary<string, string> dic)
			{
			public json AddBillSub(string HInterID, string HBillNo, DateTime date, double 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;
			@@ -366,14 +424,14 @@
			}
			}
			}


			if (count != 1)
			{
			//æå¥åè¡¨
			oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
			"HMasterDate,HQty,HUseTimes)" +
			$"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
			$" '{date}', {HQTY},{(dic["å°æ¶äº§è½"] == "0" ? 0 : HQTY / float.Parse(dic["å°æ¶äº§è½"].ToString()))})");
			$" '{date}', {HQTY},{ ( (dic["å°æ¶äº§è½"] == "0.0000" ? 0 : HQTY / float.Parse(dic["å°æ¶äº§è½"].ToString())).ToString()=="éæ°å" ? 0 : dic["å°æ¶äº§è½"] == "0.0000" ? 0 : HQTY / float.Parse(dic["å°æ¶äº§è½"].ToString())) })");
			}

			objJsonResult.code = "1";
			@@ -775,9 +833,10 @@
			sw.Start();//å¼å§è®¡æ¶

			//è·åå½åå³æ¶åºå åºåæ°é+åºåç»ç»+ç©æ+è´§ä¸»+ä»åº
			//åæ¥è¯¢å³æ¶åºåæ¹å¼ï¼select * from h_v_jit_InventoryList
			ds = oCN.RunProcReturn(@"
			select * from h_v_jit_InventoryList
			", "h_v_jit_InventoryList");
			exec h_p_jit_Inventory_UsableList
			", "h_p_jit_Inventory_UsableList");
			ListInventory = ds.ToModelList<PRD_Inventory>();
			//è½¦é´ ä»åºå¯¹ç§åè¡¨
			ds = oCN.RunProcReturn(@"
			@@ -1529,6 +1588,14 @@
			{
			sqlName = "AIS20230129011339";
			}
			else if (oSystemParameter.omodel.WMS_CampanyName == "å¯è´å¥ç¹")
			{
			sqlName = "AIS20210820164804";
			}
			else if (oSystemParameter.omodel.WMS_CampanyName == "æ·»åº·ç§æ")
			{
			sqlName = "AIS20240809105013";
			}
			else
			{
			sqlName = "AIS20210811135644";
			@@ -1701,7 +1768,8 @@
			F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
			FNOTE = Purchase.FNOTE,
			FPURCHASEQTY = Purchase.FPURCHASEQTY,
			FJOINQTY = Purchase.FJOINQTY
			FJOINQTY = Purchase.FJOINQTY,
			FDAYPLANBILLNO = _item.FDAYPLANBILLNO
			});
			//æ£é¤æ¥è®¡åæç»å·²è¢«åéçæ°é
			DayPlanPpbomls.NeedQty = 0;
			@@ -1764,7 +1832,8 @@
			F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
			FNOTE = Purchase.FNOTE,
			FPURCHASEQTY = Purchase.FPURCHASEQTY,
			FJOINQTY = Purchase.FJOINQTY
			FJOINQTY = Purchase.FJOINQTY,
			FDAYPLANBILLNO = _item.FDAYPLANBILLNO
			});
			//æ´æ°è®¡åæ°éï¼å©ä½éè¦æçï¼ ç»§ç»å»è®¡ç®ä¸ä¸ä¸ªéè´è®¢å
			DayPlanPpbomls.NeedQty -= Qty;
			@@ -2545,7 +2614,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "çäº§æç»è¡éå¤,éå¤ççäº§è®¢åå·:" + ds.Tables[0].Rows[i]["çäº§è®¢åå·"].ToString() + ",æç»è¡å·:" + ds.Tables[0].Rows[i]["çäº§è®¢åæç»è¡å·"].ToString();
			objJsonResult.Message = "çäº§æç»è¡éå¤,éå¤ççäº§è®¢åå·:" + dt.Tables[0].Rows[i]["çäº§è®¢åå·"].ToString() + ",æç»è¡å·:" + dt.Tables[0].Rows[i]["çäº§è®¢åæç»è¡å·"].ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2604,11 +2673,11 @@
			#region çäº§æ¥è®¡åå¹³å° æ°æ®åå¤ è®¾ç½®ä»»å¡åç¸å³ä¿¡æ¯
			[Route("JIT_DayPlanPlatFormBill/ReadyData")]
			[HttpGet]
			public object ReadyData(string HICOMNum)
			public object ReadyData(string SWhere)
			{
			try
			{
			var list = HICOMNum.Split(',');
			var list = SWhere.Split(',');
			DataTable dt = new DataTable("date");
			dt.Columns.Add("HICMOInterID", typeof(string));
			dt.Columns.Add("HICMOEntryID", typeof(string));
			@@ -2624,9 +2693,10 @@
			{
			string HICMOInterID = list[i].Split(';')[0].ToString();
			string HICMOEntryID = list[i].Split(';')[1].ToString();
			string HSourceID = list[i].Split(';')[2].ToString();

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

			@@ -2698,5 +2768,62 @@
			}
			#endregion

			#region æ ¹æ®ç©æIDè·åå·¥èºè·¯çº¿ åè¡¨
			[Route("JIT_DayPlanPlatFormBill/GetRoutingListByMater")]
			[HttpGet]
			public object GetRoutingListByMater(int HMaterID, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			int IsHavingPermissions = 1;

			//å¤ææ¯å¦æå·¥èºè·¯çº¿ç¼è¾æé
			if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
			{
			IsHavingPermissions = 0;
			}

			ds = oCN.RunProcReturn("select * from h_v_JIT_GetRoutingList_Mater where HMaterID = " + HMaterID , "h_v_JIT_GetRoutingList_Mater");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½åç©ææ²¡æç»´æ¤å·¥èºè·¯çº¿ï¼è¯·èç³»è®¡åé¨è¿è¡ç»´æ¤";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.IsHavingPermissions = IsHavingPermissions;
			return objJsonResult;
			}
			else
			{
			//æ·»å åå
			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));//è·åå°DataColumnåå¯¹è±¡çåå
			}

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