MES-WEB-API.git

			@@ -341,8 +341,13 @@
			string HLogo = list[0].HLogo; //√ varchar(50) //品牌
			int HSellSupID = list[0].HSellSupID; // √ int //供应商(Gy_Supplier)
			int HMakeSupID = list[0].HMakeSupID; // int //制造商 (Gy_Supplier)
			string HMainSourceFlag = list[0].HMainSourceFlag; //varchar(10) //是否主生产设备(否，是)

			string HMacAddress = list[0].HMacAddress; // varchar(50) //数采物理地址
			string HIPAddress = list[0].HIPAddress; // varchar(50) //数采IP地址
			string HLinkNETMode = list[0].HLinkNETMode; // varchar(50) //联网方式
			string HCollectMode = list[0].HCollectMode; // varchar(50) //采集方式
			string HCollectClass = list[0].HCollectClass; // varchar(50) //采集类型
			string HMainSourceFlag = list[0].HMainSourceFlag; //varchar(10) //是否主生产设备(否，是)
			int HMainSourceID = list[0].HMainSourceID; //int //所属主生产设备（Gy_EquipFileBillMain）
			string HMaker = msg5;
			string HMakeDate = DateTime.Now.Date.ToString();
			@@ -395,11 +400,13 @@
			oCN.RunProc("Insert into Gy_EquipFileBillMain " +
			" (HInterID,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,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID,HSourceID,HMainSourceFlag,HMacAddress,HMainSourceID) " +
			"HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID," +
			"HSourceID,HMainSourceFlag,HMacAddress,HMainSourceID,HIPAddress,HLinkNETMode,HCollectMode,HCollectClass) " +
			" Values("+ HInterID+",'" + 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 + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'," + HSourceID + ",'" + HMainSourceFlag + "','" + HMacAddress + "','" + HMainSourceID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			"','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "','" + HMakeDate + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'" +
			"," + HSourceID + ",'" + HMainSourceFlag + "','" + HMacAddress + "','" + HMainSourceID + "','" + HIPAddress + "','" + HLinkNETMode + "','" + HCollectMode + "','" + HCollectClass + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			objJsonResult = AddBillSub(msg3, msg4, HInterID, hbillno, 1);

			@@ -497,6 +504,10 @@
			int HMakeSupID = list[0].HMakeSupID; // int //制造商 (Gy_Supplier)
			string HMainSourceFlag = list[0].HMainSourceFlag; //varchar(10) //是否主生产设备(否，是)
			string HMacAddress = list[0].HMacAddress; // varchar(50) //数采物理地址
			string HIPAddress = list[0].HIPAddress; // varchar(50) //数采IP地址
			string HLinkNETMode = list[0].HLinkNETMode; // varchar(50) //联网方式
			string HCollectMode = list[0].HCollectMode; // varchar(50) //采集方式
			string HCollectClass = list[0].HCollectClass; // varchar(50) //采集类型
			int HMainSourceID = list[0].HMainSourceID; //int //所属主生产设备（Gy_EquipFileBillMain）
			string HUpDater = msg5;
			string HUpDateDate = DateTime.Now.Date.ToString();
			@@ -561,6 +572,10 @@
			",HMainSourceFlag= '" + HMainSourceFlag + "'" +
			",HMacAddress= '" + HMacAddress + "'" +
			",HMainSourceID = '" + HMainSourceID + "'" +
			",HIPAddress='" + HIPAddress + "'" +
			",HLinkNETMode='" + HLinkNETMode + "'" +
			",HCollectMode='" + HCollectMode + "'" +
			",HCollectClass='" + HCollectClass + "'" +
			" Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);