~yxj/MES-WEB-API.git

			@@ -38,6 +38,18 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string user = sArray[2].ToString();//用户名

			//判断是否有编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无编辑权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			bool bResult;
			try
			{
			@@ -57,6 +69,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			BillNew.omodel.HPRDORGID= mainList[0].HPRDORGID;//组织
			BillNew.omodel.HInterID = mainList[0].HInterID;//递入type得到的单据ID
			BillNew.omodel.HYear = sYear;
			BillNew.omodel.HPeriod = sPeriod;
			@@ -112,6 +125,14 @@
			BillNew.omodel.HMaterIDD = ClsPub.isStrNull(mainList[0].HMaterIDD);
			List<Model.ClsSc_ProcessExchangeBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(msg3);
			BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
			if (BillNew.omodel.HICMOInterID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "请选择任务单！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			for (int i = 0; i < subList.ToArray().Length; i++)
			{
			if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
			@@ -182,7 +203,7 @@
			oSub.HFstProc = "否";
			oSub.HKeyProc = DBUtility.ClsPub.isStrNull(subList[i].HKeyProc);
			oSub.HSupID = DBUtility.ClsPub.isLong(subList[i].HSupID);
			oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].HSupFlag);
			oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].isEntrust);
			oSub.HBackProc = DBUtility.ClsPub.isBool(subList[i].HBackProc);
			oSub.HEdit = DBUtility.ClsPub.isBool(subList[i].HEdit);
			if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
			@@ -208,6 +229,8 @@
			oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(subList[i].HTechnologyParameter);
			oSub.HPicNum = DBUtility.ClsPub.isStrNull(subList[i].HPicNum);
			oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(subList[i].HProcCheckNote);
			oSub.HMouldNo = "";
			oSub.HProcWorkNum = "";
			BillNew.DetailColl.Add(oSub);
			}
			}
			@@ -255,9 +278,9 @@
			/// </summary>
			/// <param name="hmainid">生产任务单ID</param>
			/// <returns>object</returns>
			[Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
			[Route("Sc_ProcessExchangeBill/GetICMOBillList")]
			[HttpGet]
			public object GetICMOBillDetail(int hmainid,int OrganizationID)
			public object GetICMOBillList(int hmainid,int HEntryID, int OrganizationID)
			{
			try
			{
			@@ -269,7 +292,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid + " and HSTOCKINORGID="+ OrganizationID, "h_v_Sc_ICMOBillListDetail");
			ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -297,6 +320,52 @@
			}
			}

			/// <summary>
			/// 返回生产任务单明细行
			/// </summary>
			/// <param name="hmainid">生产任务单ID</param>
			/// <returns>object</returns>
			[Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
			[HttpGet]
			public object GetICMOBillDetail(int hmainid,int HEntryID, int OrganizationID)
			{
			try
			{
			if (hmainid == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "生产任务单ID为0！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此生产任务单无明细行！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			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;
			}
			}

			//
			}