MES-WEB-API.git

			@@ -15,7 +15,8 @@
			public DBUtility.ClsPub.Enum_BillStatus BillStatus;//单据状态（新增，修改，浏览，更新单价，变更）
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			public DAL.ClsSb_EquipDotCheckBill BillNew = new DAL.ClsSb_EquipDotCheckBill(); //对应单据类
			public DAL.ClsSb_EquipDotCheckBill BillOld = new DAL.ClsSb_EquipDotCheckBill(); //对应单据类
			public DAL.ClsSb_EquipDotCheckBill BillOld = new DAL.ClsSb_EquipDotCheckBill(); //对应单据类
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); //获取系统参数

			#region 设备点检记录表

			@@ -38,15 +39,34 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (sWhere == null \|\| sWhere.Equals(""))

			string sReturn = "";
			string HViewName = "h_v_Sb_EquipDotCheckBillList";//视图命名
			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckBillList " + sWhere + " order by hmainid desc", "h_v_Sb_EquipDotCheckBillList");
			if (oSystemParameter.omodel.WMS_CampanyName == "九菱")
			{
			HViewName = "h_v_Sb_EquipDotCheckBillMainList";
			}
			}
			else
			{
			string sql1 = "select * from h_v_Sb_EquipDotCheckBillList where 1 = 1";
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据读取失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from " + HViewName + " " + sWhere + " order by hmainid desc", HViewName);
			}
			else
			{
			string sql1 = "select * from " + HViewName + " " + " where 1 = 1";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBillList");
			ds = oCN.RunProcReturn(sql, HViewName);
			}
			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			@@ -285,7 +305,29 @@
			return objJsonResult;
			}

			bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//删除前控制
			DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_Sb_EquipDotCheckBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + user + "'", "h_p_Sb_EquipDotCheckBill_BeforeDelCtrl");
			if (BeforeDs == null \|\| BeforeDs.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除前判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterDelCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo);
			if (IsDete)
			{
			objJsonResult.code = "0";
			@@ -506,8 +548,8 @@
			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false; //关闭类型
			//oItemSub.HRemark = ""; //备注
			oItemSub.HSourceInterID = 0; // 源单主内码
			oItemSub.HSourceEntryID = 0; //源单子内码
			//oItemSub.HSourceInterID = 0; // 源单主内码
			//oItemSub.HSourceEntryID = 0; //源单子内码
			//oItemSub.HSourceBillNo = ""; //源单单号
			//oItemSub.HSourceBillType = ""; //源单类型
			//oItemSub.HRelationQty = 0; //关联数量