MES-WEB-API.git

			@@ -105,8 +105,8 @@

			//反写产量汇报单，质量汇报单关联字段,生产订单关联数量
			Ds = oCn.RunProcReturn("exec h_p_Sc_ICMOReportBill_ReverseWriteQty " + omodel.HInterID + "," + oSub.HEntryID + ",'" + omodel.HBillNo + "'," +
			DetailColl[0].HICMOInterID + "," + DetailColl[0].HICMOEntryID + "," + DetailColl[0].HICMOBillNo + ",'" + DetailColl[0].HSourceID + "','" +
			"Edit" + "'," + HBackQty
			DetailColl[0].HICMOInterID + "," + DetailColl[0].HICMOEntryID + ",'" + DetailColl[0].HICMOBillNo + "','" + DetailColl[0].HSourceID + "','" +
			"Edit" + "'," + HBackQty + "," + DetailColl[0].HICMOTempID
			, "h_p_Sc_ICMOReportBill_ReverseWriteQty");
			if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "1")
			{
			@@ -261,8 +261,8 @@

			//反写产量汇报单，质量汇报单关联字段,生产订单关联数量
			ds = oCn.RunProcReturn("exec h_p_Sc_ICMOReportBill_ReverseWriteQty " + omodel.HInterID + "," + oSub.HEntryID + ",'" + omodel.HBillNo + "'," +
			DetailColl[0].HICMOInterID + "," + DetailColl[0].HICMOEntryID + "," + DetailColl[0].HICMOBillNo + ",'" + DetailColl[0].HSourceID + "','" +
			"Add" + "'," + 0
			DetailColl[0].HICMOInterID + "," + DetailColl[0].HICMOEntryID + ",'" + DetailColl[0].HICMOBillNo + "','" + DetailColl[0].HSourceID + "','" +
			"Add" + "'," + 0 + "," + DetailColl[0].HICMOTempID
			, "h_p_Sc_ICMOReportBill_ReverseWriteQty");
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "1")
			{
			@@ -439,6 +439,7 @@
			}
			else
			{
			oSystemParameter.ShowBill(ref sReturn);
			JObject model = new JObject();
			model.Add("FBillType", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillType"]) }); //单据类型
			model.Add("FDate", Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"])); //单据日期
			@@ -446,6 +447,8 @@
			model.Add("FBillNo", HBillNo);

			JArray Fentity = new JArray();
			string sErrMsg = "";
			string sJXCode = "";
			foreach (DataRow item in Ds.Tables[1].Rows)
			{
			JObject FentityModel = new JObject();
			@@ -493,8 +496,14 @@
			FentityModel.Add("FBASEFINISHQTY", item["FBASEFINISHQTY"].ToString());//基本单位完成数量
			FentityModel.Add("FFINISHQTY", item["FFINISHQTY"].ToString());//完成数量
			FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["FLot"].ToString() });//批号
			FentityModel.Add("FShiftGroupId", new JObject() { ["FNumber"] = item["FShiftGroupId"].ToString() });//班组
			FentityModel.Add("F_UUBK_CZG1", new JObject() { ["FSTAFFNUMBER"] = item["F_UUBK_CZG1"].ToString() });// 操作员
			//
			if (oSystemParameter.omodel.WMS_CampanyName == "九菱") //系统参数客户定制化名称空白为通用
			{
			FentityModel.Add("FShiftGroupId", new JObject() { ["FNumber"] = item["FShiftGroupId"].ToString() });//班组
			FentityModel.Add("F_UUBK_CZG1", new JObject() { ["FSTAFFNUMBER"] = item["F_UUBK_CZG1"].ToString() });// 操作员
			}


			FentityModel.Add("FBOMID", new JObject() { ["FNumber"] = item["FBOMID"].ToString() });// BOM版本

			//sJson_BatchNo +
			@@ -573,16 +582,29 @@
			//提交审核
			string result1 = string.Empty;
			string result2 = string.Empty;
			var fID = JObject.Parse(result)["Result"]["Id"].ToString();
			var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
			var json = new
			{
			Ids = fID,
			};
			if (oSystemParameter.omodel.Sc_ICMOReportBill_AutoCheck == "Y") //系统参数自动审核
			{
			result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//提交
			result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//审核
			result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//提交
			result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//审核

			if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			sReturn = "生产汇报单单号:" + HBillNo + ",提交失败" + result;
			sReturn = "生产汇报单单号:" + HBillNo + ",提交失败" + result1;
			oCn.RollBack();
			return false;
			}

			if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			sReturn = "生产汇报单单号:" + HBillNo + ",审核失败" + result2;
			oCn.RollBack();
			return false;
			}
			}
			}
			@@ -665,14 +687,14 @@
			}

			//删除单据
			public virtual bool DeleteBill(Int64 lngBillKey, ref string sReturn)
			public virtual bool DeleteBill(Int64 lngBillKey, string HBillNo, string procName, string user, ref string sReturn)
			{
			try
			{
			oCn.BeginTran();
			//查询生产汇报单表数量
			DataSet ds = oCn.RunProcReturn("select a.HBillNo,b.HICMOInterID,b.HICMOEntryID from Sc_ICMOReportBillMain a inner join Sc_ICMOReportBillSub b on a.HInterID = b.HInterID where a.HInterID = '" + lngBillKey + "'", "Sc_ICMOReportBillMain");
			string HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
			HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
			string HICMOInterID = ds.Tables[0].Rows[0]["HICMOInterID"].ToString();
			string HICMOEntryID = ds.Tables[0].Rows[0]["HICMOEntryID"].ToString();
			//
			@@ -699,6 +721,24 @@
			//删除主表
			DeleteBillMain(lngBillKey);

			//删除后控制==================================================================================
			string sql2 = "exec " + procName + " " + lngBillKey + ",'" + HBillNo + "','" + user + "'";
			ds = oCn.RunProcReturn(sql2, procName);
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{

			sReturn = "删除失败!原因:删除后判断失败，请与网络管理人员联系";
			oCn.RollBack();
			return false;
			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			sReturn = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
			oCn.RollBack();
			return false;
			}
			//==============================================================================================

			sReturn = "删除单据成功！";
			oCn.Commit();
			return true;