MES-WEB-API.git

			@@ -45,7 +45,7 @@
			{
			try
			{
			LogService.Write("æ§è¡äº0");
			List<object> a = new List<object>();
			//å¤ææ¯å¦ææ¥è¯¢æé
			if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Query", 1, false, user))
			{
			@@ -55,13 +55,19 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			LogService.Write("æ§è¡äº");
			ds = Sc_GetMESBeginStepWorkBill(sWhere);
			foreach (DataColumn col in ds.Tables[0].Columns)//éådsä¸ç¬¬ä¸ä¸ªè¡¨ï¼Tables[0]ï¼çææåï¼Columnsï¼æ¯æ¬¡å¾ªç¯ä¸ï¼colåéä¼ææå½ååçå¼ç¨
			{
			Type dataType = col.DataType; //è·åå½åæ°æ®ç±»åä¼ å¥ èªå®ä¹åédatadataType
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //åç¬¦ä¸²æ¼æ¥ // å°åååæ°æ®ç±»åä¿¡æ¯æ¼æ¥æä¸ä¸ªJSONæ ¼å¼çåç¬¦ä¸²
			a.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "è¿åè®°å½æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = a;
			return objJsonResult;
			}
			catch (Exception ex)
			@@ -101,7 +107,7 @@
			return new ApiResult<DataSet> { code = -1, msg = "IDä¸è½ä¸ºç©º" };
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MESBeginWorkBillList_NEW where hmainid= " + HID + " ", "h_v_Sc_MESBeginWorkBillList_NEW");
			var dataSet = oCN.RunProcReturn("select * from h_v_Sc_MESBeginWorkBillList_Edit where hmainid= " + HID + " ", "h_v_Sc_MESBeginWorkBillList_Edit");
			if (dataSet == null \|\| dataSet.Tables[0].Rows.Count == 0)
			return new ApiResult<DataSet> { code = -1, msg = "ä¸åå¨å¼å·¥åå·" };

			@@ -160,9 +166,39 @@
			return objJsonResult;
			}

			bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.BeginTran();//å¼å§äºå¡

			//å é¤åæ§å¶=========================================
			DataSet Ds;

			string sql1 = "exec h_p_Sc_MESBeginWorkBill_BeforeDelCtrl " + HInterID + ",'" + oBill.omodel.HBillNo + "','" + UserName + "'";
			Ds = oCN.RunProcReturn(sql1, "h_p_Sc_MESBeginWorkBill_BeforeDelCtrl");
			if (Ds == null \|\| Ds.Tables.Count == 0 \|\| Ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :å é¤åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (Ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :" + Ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sc_MESBeginWorkBill_AfterDelCtrl", UserName, ref DBUtility.ClsPub.sExeReturnInfo);
			if (IsDete)
			{
			oCN.Commit();//æäº¤äºå¡

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			@@ -176,6 +212,7 @@
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			}
			@@ -185,6 +222,7 @@
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªæ¾å°";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			}
			@@ -204,6 +242,7 @@
			{
			string ModRightNameCheck = "MES_MESBeginWorkBill_Check";
			DBUtility.ClsPub.CurUserName = CurUserName;
			string sql = "";
			try
			{
			//å®¡æ ¸æé
			@@ -246,7 +285,7 @@
			return objJsonResult;
			}
			if (IsAudit == 0) //å®¡æ ¸å¤æ
			{
			{
			if (oBill.omodel.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			@@ -278,8 +317,30 @@
			}
			if (IsAudit == 0) //å®¡æ ¸æäº¤
			{
			//å®¡æ ¸åæ§å¶===============================================Begin===================================================================
			sql = "exec h_p_Sc_MESBeginWorkBill_BeforeCheckCtrl " + HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Sc_MESBeginWorkBill_BeforeCheckCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :å®¡æ ¸åå¤æå¤±è´¥ï¼æ è¿åä¿¡æ¯ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;

			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//å®¡æ ¸åæ§å¶===============================================End===================================================================

			//å®¡æ ¸æäº¤
			if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			if (oBill.CheckBill(lngBillKey, oBill.omodel.HBillNo, "h_p_Sc_MESBeginWorkBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -298,8 +359,30 @@
			}
			if (IsAudit == 1) //åå®¡æ ¸æäº¤
			{
			//åå®¡æ ¸åæ§å¶===============================================Begin===================================================================
			sql = "exec h_p_Sc_MESBeginWorkBill_BeforeUnCheckCtrl " + HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Sc_MESBeginWorkBill_BeforeUnCheckCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :åå®¡æ ¸åå¤æå¤±è´¥ï¼æ è¿åä¿¡æ¯ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;

			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//åå®¡æ ¸åæ§å¶===============================================End===================================================================

			//åå®¡æ ¸æäº¤AbandonCheck
			if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			if (oBill.AbandonCheck(lngBillKey, oBill.omodel.HBillNo, "h_p_Sc_MESBeginWorkBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -387,8 +470,9 @@
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string UserName = sArray[1].ToString();
			string refSav = sArray[2].ToString();
			string msg3 = sArray[1].ToString();
			string UserName = sArray[2].ToString();
			string refSav = sArray[3].ToString();
			DBUtility.ClsPub.CurUserName = UserName;
			//ä¿åæé
			if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
			@@ -487,6 +571,27 @@
			return objJsonResult;
			}
			oBill.omodel = oItem;
			}

			// è¡¨ä½æ°æ®
			//æ },{æ¥æåæ°ç» //å»æãåã
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			List<Models.ClsSc_MESBeginWorkBillSub_RelationBill> ls = new List<Models.ClsSc_MESBeginWorkBillSub_RelationBill>();
			ls = oListModels.getObjectByJson_Sc_MESBeginWorkBillSub_RelationBill(msg3);
			int i = 0;
			foreach (Models.ClsSc_MESBeginWorkBillSub_RelationBill oItemSub in ls)
			{
			i++;
			oItemSub.HEntryID = i;


			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false; //å³éç±»å

			oBill.DetailCol2.Add(oItemSub);

			}

			//ä¿å
			@@ -1026,29 +1131,93 @@
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Sc_ICMOBillWorkQtyStatus_Tmp where HInterID=" + HInterID + " and HSourceInterID=" + HICMOInterID + " and HSourceEntryID=" + HICMOEntryID, "Sc_ICMOBillWorkQtyStatus_Tmp");
			string HBillNo = "";
			if (ds.Tables[0].Rows.Count == 0) {
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥æ æ°æ®!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
			}


			oCN.BeginTran();
			//å é¤å·¥åºæ±æ¥åè¡¨
			string sql1 = string.Format(@"delete Sc_ProcessReportSub where HInterID='" + HInterID + "' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
			oCN.RunProc(sql1);
			//å é¤å·¥åºæ±æ¥ä¸»è¡¨
			string sql = string.Format(@"delete Sc_ProcessReportMain where HInterID='" + HInterID + "'");

			//å é¤åæ§å¶=========================================
			DataSet Ds;

			string sql1 = "exec h_p_Sc_ICMOBillWorkQtyStatus_BeforeDelCtrl " + HInterID + ",'" + HBillNo + "','" + UserName + "'";
			Ds = oCN.RunProcReturn(sql1, "h_p_Sc_ICMOBillWorkQtyStatus_BeforeDelCtrl");
			if (Ds == null \|\| Ds.Tables.Count == 0 \|\| Ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :å é¤åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (Ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :" + Ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			//å é¤äº§éæ±æ¥è¡¨
			string sql = string.Format(@"delete Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "'");
			oCN.RunProc(sql);
			double sumqty = double.Parse(ds.Tables[0].Rows[0]["HQty"].ToString()) + double.Parse(ds.Tables[0].Rows[0]["HBadQty"].ToString()) + double.Parse(ds.Tables[0].Rows[0]["HWasterQty"].ToString()); //æ±æ¥æ°é+ä¸è¯+æ¥åº
			//ååçäº§ç¶æä¸´æ¶è¡¨Sc_ICMOBillStatus_Tmpæåæ±æ¥æ°é HSplitRelationQty
			oCN.RunProc("update Sc_ICMOBillStatus_Tmp set HSplitRelationQty=HSplitRelationQty-" + sumqty + " where HICMOBillNo='" + ds.Tables[0].Rows[0]["HICMOBillNo"].ToString() + "' and HSourceID='" + ds.Tables[0].Rows[0]["HSourceID"].ToString() + "' and HICMOInterID='" + ds.Tables[0].Rows[0]["HICMOInterID"].ToString() + "' and HICMOEntryID='" + ds.Tables[0].Rows[0]["HICMOEntryID"].ToString() + "' and HInterID=" + ds.Tables[0].Rows[0]["HSourceInterID"].ToString());

			//å é¤åæ§å¶==================================================================================
			string sql2 = "exec h_p_Sc_ICMOBillWorkQtyStatus_AfterDelCtrl " + HInterID + ",'" + HBillNo + "','" + UserName + "'";
			Ds = oCN.RunProcReturn(sql2, "h_p_Sc_ICMOBillWorkQtyStatus_AfterDelCtrl");
			if (Ds == null \|\| Ds.Tables.Count == 0 \|\| Ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :" + Ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			if (Ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :" + Ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==============================================================================================

			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤èµæºæåï¼";
			objJsonResult.Message = "å é¤äº§éæ±æ¥åæåï¼";
			objJsonResult.data = ds;
			return objJsonResult;
			}
			catch (Exception e)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message.ToString();
			objJsonResult.data = null;

			oCN.RollBack();
			}
			return objJsonResult;
			}
			@@ -1333,6 +1502,7 @@
			{
			string ModRightNameCheck = "MES_ProcExchReport_Check";
			DBUtility.ClsPub.CurUserName = CurUserName;
			string sql = "";
			try
			{
			string StrMessage = "";
			@@ -1408,8 +1578,30 @@
			}
			if (IsAudit == 0) //å®¡æ ¸æäº¤
			{
			//å®¡æ ¸åæ§å¶===============================================Begin===================================================================
			sql = "exec h_p_Sc_ICMOBillWorkQtyStatus_BeforeCheckCtrl " + HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Sc_ICMOBillWorkQtyStatus_BeforeCheckCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :å®¡æ ¸åå¤æå¤±è´¥ï¼æ è¿åä¿¡æ¯ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;

			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//å®¡æ ¸åæ§å¶===============================================End===================================================================

			//å®¡æ ¸æäº¤
			if (oBill.CheckBill(HSourceID, HSourceInterID, HSourceEntryID, HSourceBillNo, HICMOInterID, HICMOEntryID, lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			if (oBill.CheckBill(HSourceID, HSourceInterID, HSourceEntryID, HSourceBillNo, HICMOInterID, HICMOEntryID, lngBillKey, oBill.omodel.HBillNo, "h_p_Sc_ICMOBillWorkQtyStatus_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -1428,8 +1620,30 @@
			}
			if (IsAudit == 1) //åå®¡æ ¸æäº¤
			{
			//åå®¡æ ¸åæ§å¶===============================================Begin===================================================================
			sql = "exec h_p_Sc_ICMOBillWorkQtyStatus_BeforeUnCheckCtrl " + HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Sc_ICMOBillWorkQtyStatus_BeforeUnCheckCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :åå®¡æ ¸åå¤æå¤±è´¥ï¼æ è¿åä¿¡æ¯ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;

			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//åå®¡æ ¸åæ§å¶===============================================End===================================================================

			//åå®¡æ ¸æäº¤AbandonCheck
			if (oBill.AbandonCheck(HSourceID, HSourceInterID, HSourceEntryID, HSourceBillNo, HICMOInterID, HICMOEntryID, lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			if (oBill.AbandonCheck(HSourceID, HSourceInterID, HSourceEntryID, HSourceBillNo, HICMOInterID, HICMOEntryID, lngBillKey, oBill.omodel.HBillNo, "h_p_Sc_ICMOBillWorkQtyStatus_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -1507,8 +1721,9 @@
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string UserName = sArray[1].ToString();
			string refSav = sArray[2].ToString();
			string msg3 = sArray[1].ToString();
			string UserName = sArray[2].ToString();
			string refSav = sArray[3].ToString();
			DBUtility.ClsPub.CurUserName = UserName;
			//ä¿åæé
			if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
			@@ -1526,6 +1741,7 @@
			string BillNo = "";
			long MainId = 0;
			string EntyID = "";

			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.code = "0";
			@@ -1557,7 +1773,7 @@
			return objJsonResult;
			}
			}

			//çäº§è®¢åç¼å·ãçäº§è®¢åä¸»IDãçäº§è®¢åä¸»ID+åID
			BillNo = oItem.HMainSourceBillNo;
			MainId = oItem.HMainSourceInterID;
			EntyID = oItem.HMainSourceEntryID;
			@@ -1579,43 +1795,96 @@
			oBill.omodel = oItem;
			}

			//ä¿å
			//ä¿åå®æ¯åå¤ç
			// è¡¨ä½æ°æ®
			//æ },{æ¥æåæ°ç» //å»æãåã
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			List<Models.ClsSc_MESBeginWorkBillSub_RelationBill> ls = new List<Models.ClsSc_MESBeginWorkBillSub_RelationBill>();
			ls = oListModels.getObjectByJson_Sc_MESBeginWorkBillSub_RelationBill(msg3);
			int i = 0;
			foreach (Models.ClsSc_MESBeginWorkBillSub_RelationBill oItemSub in ls)
			{
			i++;
			oItemSub.HEntryID = i;


			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false; //å³éç±»å

			oBill.DetailCol2.Add(oItemSub);

			}

			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			oCN.BeginTran();
			//ä¿®æ¹éè¶çäº§åçç¶æ
			oCN.RunProc("update AIS20200908101915zs..T_PRD_MOENTRY_A set FSTATUS=4,FCONVEYDATE=getdate() where FENTRYID=" + (EntyID).Split('-')[1]);

			//æ ¹æ®çäº§è®¢ååIDæ¾å¯¹åºççäº§ç¨ææ¸å
			DataSet Ds = oCN.RunProcReturn("select b.FID,b.FBILLNO,b.FDOCUMENTSTATUS from Sc_ICMOBillSub a left join AIS20200908101915zs..T_PRD_PPBOM b on a.HERPEntryID=b.FMOENTRYID where a.HEntryID=" + (EntyID).Split('-')[1], "Sc_ICMOBillSub");
			//æ¥æ¾å½åçäº§è®¢åæç»ç¶æ
			DataSet Dss = oCN.RunProcReturn("select FSTATUS from AIS20200908101915zs..T_PRD_MOENTRY_A where FENTRYID=" + (EntyID).Split('-')[1], "AIS20200908101915zs..T_PRD_MOENTRY_A");
			//å¤æéè¶çäº§åçç¶æä¸ä¸º4åæ§è¡å¼å·¥
			if (Dss.Tables[0].Rows[0][0].ToString() != "4")
			{
			oCN.RunProc("update AIS20200908101915zs..T_PRD_MOENTRY_A set FSTATUS=4,FCONVEYDATE=getdate() where FENTRYID=" + (EntyID).Split('-')[1]);
			}
			else
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å¼å·¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//è®¿é®éè¶
			//var loginRet = InvokeHelper.Login();
			//var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			//if (isSuccess == 0)
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "æä½å¤±è´¥,éè¶è´¦å·ç»å½å¼å¸¸ã" + loginRet;
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//var json = new
			//{
			// //CreateOrgId = 0,
			// Numbers = BillNo,
			// //Ids = (EntyID).Split('-')[0],
			// PkEntryIds = (EntyID).Split('-')[1]
			//};
			//Console.Write("json=" + json);
			//var result = InvokeHelper.ExcuteOperation("PRD_MO", "ToStart", JsonConvert.SerializeObject(json));
			//if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			//{
			// oCN.RollBack();
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "å¯¹åºéè¶äºçäº§è®¢åæ´æ¹å¼å·¥ç¶æå¤±è´¥ï¼" + result;
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			var loginRet = InvokeHelper.Login();
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æä½å¤±è´¥,éè¶è´¦å·ç»å½å¼å¸¸ã" + loginRet;
			objJsonResult.data = null;
			return objJsonResult;
			}
			var json = new
			{
			//CreateOrgId = 0,
			//Numbers = BillNo,
			Ids = Ds.Tables[0].Rows[0][0].ToString(),
			//PkEntryIds = (EntyID).Split('-')[1]
			};
			//LogService.Write("json=" + json);
			string result1 = string.Empty;
			string result2 = string.Empty;

			//å¤æå½åç¨çäº§ææ¸ååç¶æââå·²åå»ºååæäº¤åå®¡æ ¸ãä»¥æäº¤ååªå®¡æ ¸--A:åå»ºï¼B:æäº¤,C:å®¡æ ¸,D:éæ°å®¡æ ¸
			if (Ds.Tables[0].Rows[0][2].ToString() == "A"\|\| Ds.Tables[0].Rows[0][2].ToString() == "D")
			{
			result1 = InvokeHelper.Submit("PRD_PPBOM", JsonConvert.SerializeObject(json));
			result2 = InvokeHelper.Audit("PRD_PPBOM", JsonConvert.SerializeObject(json));
			}
			if (Ds.Tables[0].Rows[0][2].ToString() == "B")
			{
			result2 = InvokeHelper.Audit("PRD_PPBOM", JsonConvert.SerializeObject(json));
			}
			LogService.Write("result2=" + result2);
			//å¤æå®¡æ ¸æ¯å¦æå
			if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"å¯¹åºçäº§ç¨ææ¸å,åå·{Ds.Tables[0].Rows[0][1].ToString()},å®¡æ ¸å¤±è´¥ï¼" + result2;
			objJsonResult.data = null;
			return objJsonResult;
			}

			//ä¿å
			////æ§è¡ä¿å
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			if (bResult)
			@@ -1654,5 +1923,247 @@
			}
			}
			#endregion

			#region PDAå¼å·¥å æ«ææµè½¬å¡ æ¥åºå¯¹åºä¿¡æ¯
			[Route("Sc_MESBeginStepWorkBill/GetHProcExchInterID")]
			[HttpGet]
			public object GetHProcExchInterID(string HBarCode, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			if (HBarCode == null \|\| HBarCode.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¡ç ä¿¡æ¯ä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			string sql = "select a.*,b.HName HMaterName,b.HNumber HMaterNumbers,b.HModel HModel,c.HName HDeptName from Sc_ICMOBillStatus_Tmp a " +
			"left join Gy_Material b on a.HMaterID=b.HItemID left join Gy_Department c on a.HDeptID=c.HItemID where HSourceBillNo = '" + HBarCode + "'";
			ds = oCN.RunProcReturn(sql, "ï»¿Sc_ICMOBillStatus_Tmp");
			}

			if (ds.Tables[0].Rows.Count > 0)
			{
			//æ·»å åå
			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;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å·¥åºæµè½¬å¡ï¼" + HBarCode + " ,æ²¡æè¿è¡æ´¾å·¥æä½";
			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 PDAå¼å·¥åä¿å/ç¼è¾
			/// <summary>
			/// å¼å·¥å
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("Sc_MESBeginStepWorkBill/SaveSc_MESBeginWorkBill")]
			[HttpPost]
			public object SaveSc_MESBeginWorkBill([FromBody] JObject msg)
			{

			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string UserName = sArray[1].ToString();
			string refSav = sArray[2].ToString();

			//ä¿åæé
			if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, false, UserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ ä¿åæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//å¤æä¼è®¡ææ¯å¦åç
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s;
			objJsonResult.data = null;
			return objJsonResult;
			}

			LogService.Write("å¼å·¥:1" + msg1);

			ListModels oListModels = new ListModels();
			try
			{
			DLL.ClsSc_MESBeginWorkBill oBill = new DLL.ClsSc_MESBeginWorkBill();
			List<Models.ClsSc_MESBeginWorkBillMain> lsmain = new List<Models.ClsSc_MESBeginWorkBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Gy_MESBeginWorkFrom(msg2);
			foreach (Models.ClsSc_MESBeginWorkBillMain oItem in lsmain)
			{
			if (refSav == "Add")
			{
			//åæ®å·æ¯å¦éå¤
			if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·éå¤ï¼ä¸åè®¸ä¿åï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			if (refSav == "Update")
			{
			if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®æè¯¯ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//å¤ææ¯å¦å¯ç¼è¾
			if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®å·²ç»è¢«å®¡æ ¸ï¼ä¸åè®¸ä¿®æ¹ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (BillOld.omodel.HBillStatus > 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®å¤äºä¸å¯ç¼è¾ç¶æï¼ä¸åè®¸ä¿®æ¹ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s + "ï¼ä¸åè®¸ä¿®æ¹";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			oItem.HMaker = UserName;
			oItem.HBillType = "3787";
			oItem.HBillSubType = "3787";
			oItem.HBillStatus = 1; //åæ®ç¶æï¼1æªå®¡ï¼2å®¡æ ¸éè¿ï¼3å³éï¼4ä½åºï¼5å®¡æ ¸éå,6å®¡æ ¸ä¸,7å·²éï¼8å·²åå¤ï¼9ç»æ¡ï¼10éªè¯,11ä¸è¾¾ï¼12å¼å·¥,13ç³è¯·å®¡æ¹,15ç³è¯·æ£éªï¼16 å¤å®åæ ¼ï¼17å¤å®ä¸åæ ¼ï¼
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
			oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
			oItem.HBarCodeMakeDate = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"))); //æ«ææ¥æï¼å¹´-æ-æ¥-æ¶-å-ç§ï¼
			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼æ²¡æåæ®æ¥æï¼æ æ³ä¿åï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oBill.omodel = oItem;
			}


			LogService.Write("å¼å·¥:2" + msg1);
			//ä¿å
			//ä¿åå®æ¯åå¤ç
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			LogService.Write("å¼å·¥:2.1" + msg1);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			if (bResult)
			{
			objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //è¿åä¸»ID
			//ç³»ç»åæ° èªå¨å®¡æ ¸
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			LogService.Write("å¼å·¥:2.8");
			objJsonResult.Verify = "Y";
			}
			}

			}
			else
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			objJsonResult.Verify = "N";
			}

			LogService.Write("å¼å·¥:3" + msg1);

			if (bResult)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä¿åæåï¼";
			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.Message;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			#endregion
			}
			}