MES-WEB-API.git

			@@ -71,7 +71,7 @@

			//获取明细行修改前数量
			Int64 HBackQty = 0;
			Ds = oCn.RunProcReturn("select isnull(sum(isnull(HQty,0)),0) + isnull(sum(isnull(HWasterQty,0)),0) as HBackQty from Sc_ICMOReportBillSub where HInterID = " + lngBillKey, "Sc_ICMOReportBillSub");
			Ds = oCn.RunProcReturn("select isnull(sum(isnull(HQty,0)),0) + isnull(sum(isnull(HBadQty,0)),0) as HBackQty from Sc_ICMOReportBillSub where HInterID = " + lngBillKey, "Sc_ICMOReportBillSub");
			if (Ds != null && Ds.Tables[0].Rows.Count > 0)
			{
			HBackQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBackQty"]);
			@@ -92,7 +92,7 @@
			"HCloseMan,HCloseType,HRemark," +
			"HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
			",HICMOInterID,HICMOBillNo,HBarCode,HICMOEntryID" +
			",HICMOInterID,HICMOBillNo,HBarCode,HICMOEntryID,HBadQty" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber +"'"+
			"," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HTimes.ToString() + "," + oSub.HSourceID.ToString() +
			@@ -100,20 +100,19 @@
			",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
			"," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "'," + oSub.HICMOEntryID +
			") ");

			//反写产量汇报单，质量汇报单关联字段,生产订单关联数量
			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
			, "h_p_Sc_ICMOReportBill_ReverseWriteQty");
			if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "1")
			{
			sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			"," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "'," + oSub.HICMOEntryID + "," + oSub.HBadQty +
			") ");
			}
			//反写产量汇报单，质量汇报单关联字段,生产订单关联数量
			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].HICMOTempID
			, "h_p_Sc_ICMOReportBill_ReverseWriteQty");
			if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "1")
			{
			sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			if (omodel.HCheckType == "合格")
			{
			@@ -257,19 +256,18 @@
			// " HRelationBillNo ='" + omodel.HBillNo +
			// "', HRelationInterID='" + omodel.HInterID +
			// "' from Sc_ICMOBillQualityStatus_Tmp a where a.HICMOBillNo='" + DetailColl[0].HICMOBillNo + "' and a.HSourceID='" + DetailColl[0].HSourceID + "' and HICMOInterID='" + DetailColl[0].HICMOInterID + "' and a.HICMOEntryID='" + DetailColl[0].HICMOEntryID + "' and HRelationInterID='0'");
			//oCn.RunProc(sql2);

			//反写产量汇报单，质量汇报单关联字段,生产订单关联数量
			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].HICMOTempID
			, "h_p_Sc_ICMOReportBill_ReverseWriteQty");
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "1")
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//oCn.RunProc(sql2);
			}
			//反写产量汇报单，质量汇报单关联字段,生产订单关联数量
			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].HICMOTempID
			, "h_p_Sc_ICMOReportBill_ReverseWriteQty");
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "1")
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//
			//foreach (Model.ClsSc_ICMOReportBillSub oSub in DetailColl)
			@@ -462,7 +460,7 @@
			FentityModel.Add("FMTONO", item["FMTONO"].ToString());// 计划跟踪号
			FentityModel.Add("FCheckProduct", item["FCheckProduct"].ToString());// 产品检验
			FentityModel.Add("FISENTRUST", item["FISENTRUST"].ToString());// 组织委托加工
			FentityModel.Add("FSrcBillType", "FSRCBILLTYPE");// 源单类型
			FentityModel.Add("FSrcBillType", item["FSRCBILLTYPE"].ToString());// 源单类型
			FentityModel.Add("FMOBILLNO", item["FMOBILLNO"].ToString());// 生产订单
			FentityModel.Add("FSrcBillNo", item["FSrcBillNo"].ToString());// 源单编号
			FentityModel.Add("FMoEntrySeq", item["FMoEntrySeq"].ToString());//生产订单行号