MES-WEB-API.git

			@@ -1871,6 +1871,66 @@
			return objJsonResult;
			}
			}

			#region 销售出库单列表-分页
			/// <summary>
			/// 销售出库单列表
			/// </summary>
			/// <returns></returns>
			[Route("Kf_SellOutBill/GetSellOutBillList_byPage")]
			[HttpGet]
			public object GetSellOutBillList_byPage(string sWhere, string user, string Organization, int page, int size)
			{
			try
			{
			List<object> columnNameList = new List<object>(); //定义声明变量，把通过 new List<object>()创建的实例，赋值给变量
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBillQuery", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			sWhere = sWhere.Replace("'", "''");

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("exec h_p_IF_SellOutBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_IF_SellOutBillList");
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_IF_SellOutBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_IF_SellOutBillList");
			}

			//添加列名
			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 = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			objJsonResult.Message = "Sucess！";
			objJsonResult.list = columnNameList;
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception ex)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			/// <summary>
			///销售出库单删除功能
			/// </summary>
			@@ -4032,7 +4092,7 @@
			lsmain = oListModels.getObjectByJson_Gy_MouldRepairWorkBillMain(msg2);
			foreach (Model.ClsSb_MouldRepairWorkBillMain oItem in lsmain)
			{
			//oItem.HMaker = "";
			oItem.HMaker = msg4;
			UserName = msg4; //制单人
			oItem.HBillType = "3807";
			oItem.HBillSubType = "3807";
			@@ -5102,7 +5162,7 @@
			string msg3 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();
			string msg5 = sArray[3].ToString();

			string msg6 = sArray[4].ToString();

			string UserName = "";
			ListModels oListModels = new ListModels();
			@@ -5136,6 +5196,7 @@
			//oItem.HBillNo = "";
			oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --日期
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
			//oItem.HMakeDate = "";
			//oItem.HYear = "";
			//oItem.HPeriod = "";
			@@ -5222,6 +5283,32 @@
			oBill.DetailColl.Add(oItemSub);

			}

			//表体数据
			//按 },{来拆分数组 //去掉【和】
			//如果是编辑就允许保存,否则不允许
			if (oBill.omodel.HInterID != 0)
			{
			msg6 = msg6.Substring(1, msg6.Length - 2);
			msg6 = msg6.Replace("\\", "");
			msg6 = msg6.Replace("\n", "");
			List<Model.ClsSc_MouldMaintainPlanBillSub_Plan> lss = new List<Model.ClsSc_MouldMaintainPlanBillSub_Plan>();
			lss = oListModels.getObjectByJson_Sc_MouldMaintainPlanBillSub_Plan(msg6);
			int l = 0;
			foreach (Model.ClsSc_MouldMaintainPlanBillSub_Plan oItem in lss)
			{

			l++;
			oItem.HEntryID = l;
			oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItem.HCloseType = false; //关闭类型
			oItem.HSourceInterID = 0; // 源单主内码
			oItem.HSourceEntryID = 0; //源单子内码
			oItem.HRelationQty = 0; //关联数量
			oBill.DetailCol2.Add(oItem);
			}
			}

			//保存
			//保存完毕后处理
			bool bResult;
			@@ -5537,7 +5624,7 @@
			foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
			{
			UserName = oItem.HMaker; //制单人
			DBUtility.ClsPub.CurUserName = UserName;
			DBUtility.ClsPub.CurUserName = msg5;
			oItem.HBillType = "3819";
			oItem.HBillSubType = "3819";