~yxj/MES-WEB-API.git

			@@ -93,23 +93,12 @@
			DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain();
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
			if (IsDete)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.RunProc("Delete From Gy_EquipFileBillMain where HInterID=" + lngBillKey);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			@@ -184,14 +173,14 @@
			string HModel2 = list[0].HModel2; // √ varchar(100) //设备型号
			int HMaterID = list[0].HMaterID; // √ int //对应物料
			int HUnitID = list[0].HUnitID; // √ int //单位
			DateTime HOutComDate = list[0].HOutComDate; // √ datetime //设备出厂日期
			string HOutComDate = list[0].HOutComDate; // √ datetime //设备出厂日期
			string HOutComNo = list[0].HOutComNo; // √ varchar(100) //设备出厂编号
			int HDeptID = list[0].HDeptID; // √ int //使用部门（gy_Department）
			int HUseEmpID = list[0].HUseEmpID; //√ int //使用负责人（gy_Employee）
			int HRepairEmpID = list[0].HRepairEmpID; //√ int //维护负责人（gy_Employee）
			string HAddress = list[0].HAddress; // √ varchar(500) //安装地点
			DateTime HSetupDate = list[0].HSetupDate; //√ datetime //安装日期
			DateTime HStartupDate = list[0].HStartupDate; //√ datetime //运行开始日期
			string HSetupDate = list[0].HSetupDate; //√ datetime //安装日期
			string HStartupDate = list[0].HStartupDate; //√ datetime //运行开始日期
			string HStatus = list[0].HStatus; // √ varchar(20) //当前状态（空闲、占用、加工、关机、异常停机）
			int HEquipFileTypeID = list[0].HEquipFileTypeID; //√ int //设备类别（Gy_EquipFileType)
			string HProNum = list[0].HProNum; // √ varchar(100) //工程编码
			@@ -202,6 +191,8 @@
			int HMakeSupID = list[0].HMakeSupID; // int //制造商 (Gy_Supplier)
			string HMaker = msg4;
			string HMakeDate = DateTime.Now.Date.ToString();
			int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
			int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;

			if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
			{
			@@ -217,11 +208,11 @@
			oCN.RunProc("Insert into Gy_EquipFileBillMain " +
			" (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
			",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
			"HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear) " +
			"HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID) " +
			" Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
			",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
			"','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
			"','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+
			"','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+ "','" + HMaker + "','" + HMakeDate +"','"+ HEquipMaintainRuleInterID+"','"+ HEquipDotCheckRuleInterID+
			"')", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.Commit();
			@@ -271,14 +262,14 @@
			string HModel2 = list[0].HModel2; // √ varchar(100) //设备型号
			int HMaterID = list[0].HMaterID; // √ int //对应物料
			int HUnitID = list[0].HUnitID; // √ int //单位
			DateTime HOutComDate = list[0].HOutComDate; // √ datetime //设备出厂日期
			string HOutComDate = list[0].HOutComDate; // √ datetime //设备出厂日期
			string HOutComNo = list[0].HOutComNo; // √ varchar(100) //设备出厂编号
			int HDeptID = list[0].HDeptID; // √ int //使用部门（gy_Department）
			int HUseEmpID = list[0].HUseEmpID; //√ int //使用负责人（gy_Employee）
			int HRepairEmpID = list[0].HRepairEmpID; //√ int //维护负责人（gy_Employee）
			string HAddress = list[0].HAddress; // √ varchar(500) //安装地点
			DateTime HSetupDate = list[0].HSetupDate; //√ datetime //安装日期
			DateTime HStartupDate = list[0].HStartupDate; //√ datetime //运行开始日期
			string HSetupDate = list[0].HSetupDate; //√ datetime //安装日期
			string HStartupDate = list[0].HStartupDate; //√ datetime //运行开始日期
			string HStatus = list[0].HStatus; // √ varchar(20) //当前状态（空闲、占用、加工、关机、异常停机）
			int HEquipFileTypeID = list[0].HEquipFileTypeID; //√ int //设备类别（Gy_EquipFileType)
			string HProNum = list[0].HProNum; // √ varchar(100) //工程编码
			@@ -289,6 +280,8 @@
			int HMakeSupID = list[0].HMakeSupID; // int //制造商 (Gy_Supplier)
			string HUpDater = msg4;
			string HUpDateDate = DateTime.Now.Date.ToString();
			int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
			int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;

			if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
			{
			@@ -316,30 +309,32 @@
			//主表
			oCN.RunProc("Update Gy_EquipFileBillMain set " +
			" HEquipFileNumber='" + HEquipFileNumber + "'" +
			" HEquipFileNo='" + HEquipFileNo + "'" +
			" HName='" + HName + "'" +
			" HModel='" + HModel + "'" +
			" HModel2='" + HModel2 + "'" +
			" HMaterID=" + HMaterID +
			" HUnitID=" + HUnitID +
			" HOutComDate='" + HOutComDate + "'" +
			" HOutComNo='" + HOutComNo + "'" +
			" HDeptID=" + HDeptID +
			" HUseEmpID=" + HUseEmpID +
			" HRepairEmpID=" + HRepairEmpID +
			" HAddress='" + HAddress + "'" +
			" HSetupDate='" + HSetupDate + "'" +
			" HStartupDate='" + HStartupDate + "'" +
			" HStatus='" + HStatus + "'" +
			" HEquipFileTypeID=" + HEquipFileTypeID +
			",HEquipFileNo='" + HEquipFileNo + "'" +
			",HName='" + HName + "'" +
			",HModel='" + HModel + "'" +
			",HModel2='" + HModel2 + "'" +
			",HMaterID=" + HMaterID +
			",HUnitID=" + HUnitID +
			",HOutComDate='" + HOutComDate + "'" +
			",HOutComNo='" + HOutComNo + "'" +
			",HDeptID=" + HDeptID +
			",HUseEmpID=" + HUseEmpID +
			",HRepairEmpID=" + HRepairEmpID +
			",HAddress='" + HAddress + "'" +
			",HSetupDate='" + HSetupDate + "'" +
			",HStartupDate='" + HStartupDate + "'" +
			",HStatus='" + HStatus + "'" +
			",HEquipFileTypeID=" + HEquipFileTypeID +
			",HProNum='" + HProNum + "'" +
			",HBarCode='" + HBarCode + "'" +
			",HWorkArea='" + HWorkArea + "'" +
			",HLogo=" + HLogo +
			",HLogo='" + HLogo + "'" +
			",HSellSupID=" + HSellSupID +
			",HMakeSupID= " + HMakeSupID +
			",HUpDater= " + HUpDater +
			",HUpDateDate= " + HUpDateDate +
			",HUpDater= '" + HUpDater + "'" +
			",HUpDateDate= '" + HUpDateDate + "'" +
			",HEquipDotCheckRuleInterID='"+ HEquipDotCheckRuleInterID+"'"+
			",HEquipMaintainRuleInterID='"+ HEquipMaintainRuleInterID+"'"+
			" Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);