MES-WEB-API.git

			@@ -237,6 +237,8 @@
			var HPlanQty = list[i]["è®¡åæ°é"].ToString();
			var HEmpID = list[i]["HEmpID"].ToString();
			var HWorkQty = list[i]["å°æ¶äº§è½"].ToString();
			var HSourceName = list[i]["çäº§èµæº"].ToString();
			var HWorkQty_ProdLine = list[i]["äº§çº¿æ»äº§è½"].ToString();

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

			@@ -274,7 +276,7 @@
			" HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
			"HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
			"HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
			",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID,HWorkQty)values" +
			",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID,HWorkQty,HSourceName,HWorkQty_ProdLine)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)}," +
			@@ -282,7 +284,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},'{HPlanEndDate}','{HEmpID}','{HWorkQty}')";
			$"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}','{HEmpID}','{HWorkQty}','{HSourceName}','{HWorkQty_ProdLine}')";

			//LogService.Write("sql:" + sql);
			//ä¸»è¡¨
			@@ -308,6 +310,26 @@
			var HOrderCommitDate = list[i]["è®¢åäº¤è´§æ"].ToString();
			var HPlanEndDate = list[i]["è®¡åç»ææ¥æ"].ToString();
			var HSplitQty = list[i]["æåæ°é"].ToString();
			var HSourceName = list[i]["çäº§èµæº"].ToString();
			var HWorkQty_ProdLine = list[i]["äº§çº¿æ»äº§è½"].ToString();

			var HOrderType = list[i]["è®¢åç±»å"].ToString();
			var HWorkShopID = list[i]["HWorkShopID"].ToString();
			var HProdORGID = list[i]["HProdORGID"].ToString();
			var HMaterID = list[i]["HMaterID"].ToString();
			var HMaterName = list[i]["ç©æåç§°"].ToString();
			var HMaterModel = list[i]["è§æ ¼åå·"].ToString().Replace("'", "''");
			var HUnitID = list[i]["HUnitID"].ToString();
			var HSeOrderBillQty = list[i]["éå®è®¢åæ°é"].ToString();
			var HDayPlanSumQty = list[i]["æ¥è®¡åæ°éæ»é"].ToString();
			var HPlanBeginDate = list[i]["è®¡åå¼å§æ¥æ"].ToString();
			var HSeOrderBillNo = list[i]["éå®è®¢åå·"].ToString();
			var HICMOBillType = list[i]["çäº§è®¢ååæ®ç±»å"].ToString();
			var HSourceStockInQty = list[i]["äº§çº¿å¥åºæ°é"].ToString();
			var HLeftPlanQty = list[i]["æªææ°é"].ToString();
			var HOrderLev = list[i]["è®¢åççº§"].ToString();
			var HPlanQty = list[i]["è®¡åæ°é"].ToString();
			var HEmpID = list[i]["HEmpID"].ToString();

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

			@@ -333,26 +355,141 @@
			return objJsonResult;
			}

			ds = oCN.RunProcReturn($"select HInterID,HICMOBillNo from Sc_WorkBillSortBillMain with(nolock) where HMainSourceInterID={HMainSourceInterID}" +
			$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");

			if (ds.Tables[0].Rows.Count > 1)
			if (oSystemParameter.omodel.WMS_CampanyName == "æ·»åº·ç§æ") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			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"));
			//çæå å°çäº§èµæºååçäº§
			string[] HSourceNameArr = HSourceName.Split(new char[]{'&'});

			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}',HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty}" +
			$" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["åæ®å·"].ToString()}'");
			if (HSourceNameArr.Length >= 2)
			{
			for (int s = 0; s < HSourceNameArr.Length; s++)
			{
			if (s == 0)
			{
			ds = oCN.RunProcReturn("select HItemID from Gy_Source with(nolock) where HName = '" + HSourceNameArr[s] + "'", "Gy_Source");

			var HSourceID_Child = ds.Tables[0].Rows[0]["HItemID"];

			oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID_Child == "" ? 0.ToString() : HSourceID_Child)}" +
			$",HYX={HYX},HWorkQty={HWorkQty},HProdTimes={HProdTimes},HReadyTimes={HReadyTimes},HLastBeginDate='{HLastBeginDate}'" +
			$",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}'" +
			$",HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty},HSourceName='{HSourceName}',HWorkQty_ProdLine={HWorkQty_ProdLine}" +
			$" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["åæ®å·"].ToString()}'");
			}
			else
			{
			ds = oCN.RunProcReturn("select HItemID from Gy_Source with(nolock) where HName = '" + HSourceNameArr[s] + "'", "Gy_Source");

			var HSourceID_Child = ds.Tables[0].Rows[0]["HItemID"];

			//æ°å¢ååçäº§èµæºçæäº§è®°å½
			ds = oCN.RunProcReturn($"select HInterID,HICMOBillNo from Sc_WorkBillSortBillMain with(nolock) where HMainSourceInterID={HMainSourceInterID}" +
			$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID_Child}", "Sc_WorkBillSortBillMain");

			if (ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"ç¬¬{i + 1}è¡çäº§èµæºæéå¤,è¯·ä¿®æ¹!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//æ°å¢åæ®å· id
			var HBillNo_New = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//è·å¾ä¸ä¸ªæ°çåæ®å·
			var HInterID_New = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//è·å¾ä¸ä¸ªæ°çid

			string sql = $"insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
			"HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
			"HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HProdORGID," +
			" HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
			" HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
			"HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
			"HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
			",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID,HWorkQty,HSourceName,HWorkQty_ProdLine,HRemark)values" +
			$"({HInterID_New},'{HBillNo_New}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
			$"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
			$"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID_Child == "" ? 0.ToString() : HSourceID_Child)}, {(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},'{HPlanEndDate}','{HEmpID}','{HWorkQty}','{HSourceName}','{HWorkQty_ProdLine}','{"ååçäº§"}')";

			//LogService.Write("sql:" + sql);
			//ä¸»è¡¨
			oCN.RunProc(sql);

			//æå¥åè¡¨æ°æ®
			for (int j = 0; j < 180; j++)
			{
			//ä¸»è¡¨ææ°æ® åè¡¨æ æ°æ®
			//if (j == 180 - 1 && SumCount == 0 && HInterID_New != 0 && HBillNo_New != "")
			//{
			// objJsonResult = AddBillSub(HInterID_New.ToString(), HBillNo_New, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0, list[i]);
			//}


			if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
			{
			////ä¿ååè¡¨
			objJsonResult = AddBillSub(HInterID_New == 0 ? list[i]["hmainid"].ToString() : HInterID_New.ToString()
			, HBillNo_New == "" ? list[i]["åæ®å·"].ToString() : HBillNo_New
			, DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
			, 0
			, list[i]);
			}
			}
			}
			}
			}
			else
			{
			ds = oCN.RunProcReturn($"select HInterID,HICMOBillNo from Sc_WorkBillSortBillMain with(nolock) where HMainSourceInterID={HMainSourceInterID}" +
			$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");

			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}',HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty},HSourceName='{HSourceName}',HWorkQty_ProdLine={HWorkQty_ProdLine}" +
			$" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["åæ®å·"].ToString()}'");
			}
			}
			else
			{
			ds = oCN.RunProcReturn($"select HInterID,HICMOBillNo from Sc_WorkBillSortBillMain with(nolock) where HMainSourceInterID={HMainSourceInterID}" +
			$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");

			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}',HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty},HSourceName='{HSourceName}',HWorkQty_ProdLine={HWorkQty_ProdLine}" +
			$" 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)}'");
			@@ -3058,11 +3195,11 @@
			#region éè¿ç©æå¹éäº§åå¨å·æ¸å
			[Route("JIT_DayPlanPlatFormBill/GetMouldByMater")]
			[HttpGet]
			public object GetMouldByMater(string HMaterID,string HSourceID)
			public object GetMouldByMater(string HMaterID,string HSourceID,string HPCDate)
			{
			try
			{
			ds = oCN.RunProcReturn("exec h_p_Gy_MaterialMouldByMater " + HMaterID + "," + HSourceID, "h_p_Gy_MaterialMouldByMater");
			ds = oCN.RunProcReturn("exec h_p_Gy_MaterialMouldByMater " + HMaterID + "," + HSourceID + ",'" + HPCDate + "'", "h_p_Gy_MaterialMouldByMater");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -3110,11 +3247,63 @@
			#region æäº§åå°å¨å·å ç¨æ¶é´åå¥æ°æ®åº
			[Route("JIT_DayPlanPlatFormBill/AddMouldOccupancyTime")]
			[HttpGet]
			public object AddMouldOccupancyTime(string HMouldID, string HSourceID, string HICMOInterID, string HICMOEntryID, string HMouldPCTime)
			public object AddMouldOccupancyTime(string HMouldID, string HSourceID, string HICMOInterID, string HICMOEntryID, string HICMOBillNo, string HMouldPCTime)
			{
			try
			{
			ds = oCN.RunProcReturn("exec h_p_JIT_AddMouldOccupancyTime " + HMouldID + "," + HSourceID + "," + HICMOInterID + "," + HICMOEntryID + ",'" + HMouldPCTime + "'", "h_p_JIT_AddMouldOccupancyTime");
			ds = oCN.RunProcReturn("exec h_p_JIT_AddMouldOccupancyTime " + HMouldID + "," + HSourceID + "," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HMouldPCTime + "'", "h_p_JIT_AddMouldOccupancyTime");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = "";
			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_DayPlanPlatFormBill/GetChildSource")]
			[HttpGet]
			public object GetChildSource(string HSourceID)
			{
			try
			{
			ds = oCN.RunProcReturn("select HItemID åèµæºID,HNumber åèµæºä»£ç ,HName åèµæºåç§°,HCubicleQty åèµæºå·¥ä½æ° from Gy_Source with(nolock) where HParentID = " + HSourceID + " order by HName asc", "Gy_Source");

			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_DayPlanPlatFormBill/GetSourceByMater")]
			[HttpGet]
			public object GetSourceByMater(string HMaterID)
			{
			try
			{
			ds = oCN.RunProcReturn("exec h_p_Sc_ICMOGetWorkSource_TK " + HMaterID + ",'',''", "h_p_Sc_ICMOGetWorkSource_TK");

			objJsonResult.code = "1";
			objJsonResult.count = 1;