~yxj/MES-WEB-API.git

			@@ -27,7 +27,7 @@
			{
			try
			{
			//if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
			//if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			@@ -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
			{
			@@ -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,HMaker,HMakeDate) " +
			"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+ "','" + HMaker + "','" + HMakeDate +
			"','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+ "','" + HMaker + "','" + HMakeDate +"','"+ HEquipMaintainRuleInterID+"','"+ HEquipDotCheckRuleInterID+
			"')", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.Commit();
			@@ -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))
			{
			@@ -340,6 +333,8 @@
			",HMakeSupID= " + HMakeSupID +
			",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);