MES-WEB-API.git

			@@ -45,7 +45,9 @@
			{
			try
			{
			List<object> a = new List<object>();
			LogService.Write("æ§è¡äº0");

			//å¤ææ¯å¦ææ¥è¯¢æé
			if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Query", 1, false, user))
			{
			@@ -57,11 +59,18 @@
			}
			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 +110,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 +169,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 +215,7 @@
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			}
			@@ -185,6 +225,7 @@
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªæ¾å°";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			}
			@@ -204,6 +245,7 @@
			{
			string ModRightNameCheck = "MES_MESBeginWorkBill_Check";
			DBUtility.ClsPub.CurUserName = CurUserName;
			string sql = "";
			try
			{
			//å®¡æ ¸æé
			@@ -246,7 +288,7 @@
			return objJsonResult;
			}
			if (IsAudit == 0) //å®¡æ ¸å¤æ
			{
			{
			if (oBill.omodel.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			@@ -278,8 +320,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 +362,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 +473,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 +574,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,27 +1134,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();

			//å é¤åæ§å¶=========================================
			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;
			}
			@@ -1331,6 +1505,7 @@
			{
			string ModRightNameCheck = "MES_ProcExchReport_Check";
			DBUtility.ClsPub.CurUserName = CurUserName;
			string sql = "";
			try
			{
			string StrMessage = "";
			@@ -1406,8 +1581,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;
			@@ -1426,8 +1623,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;
			@@ -1505,8 +1724,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))
			@@ -1578,6 +1798,27 @@
			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)
			{