~yxj/MES-WEB-API.git

			@@ -7,8 +7,8 @@
			{
			public class ClsSc_MouldScrapInBill:DBUtility.ClsXt_BaseBill
			{
			public Model.ClsSc_MouldStockBillMain omodel = new Model.ClsSc_MouldStockBillMain();
			public List<Model.ClsSc_MouldStockBillSub> DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
			public Models.ClsSc_MouldStockBillMain omodel = new Models.ClsSc_MouldStockBillMain();
			public List<Models.ClsSc_MouldStockBillSub> DetailColl = new List<Models.ClsSc_MouldStockBillSub>();

			public ClsSc_MouldScrapInBill()
			{
			@@ -49,6 +49,7 @@
			",HUpDateDate=getdate()" +
			//========================================
			",HSupID=" + omodel.HSupID.ToString() +
			",HSupTypeID=" + omodel.HSupTypeID.ToString() +
			",HWHID=" + omodel.HWHID.ToString() +
			",HSCWHID=" + omodel.HSCWHID.ToString() +
			",HEmpID=" + omodel.HEmpID.ToString() +
			@@ -67,7 +68,7 @@
			DeleteBillSub(lngBillKey);
			//插入子表
			omodel.HInterID = lngBillKey;
			foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
			foreach (Models.ClsSc_MouldStockBillSub oSub in DetailColl)
			{
			oCn.RunProc("Insert into Sc_MouldStockBillSub " +
			" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
			@@ -75,7 +76,7 @@
			",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
			",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
			",HDesignLife,HLeaveLife,HUseLife" +
			",HSCSPID,HSPGroupID,HBatchNo" +
			",HSCSPID,HSPGroupID,HBatchNo,HStockOrgID" +
			//",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
			//",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
			//",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
			@@ -87,7 +88,7 @@
			"," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
			"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
			"," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
			"," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
			"," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HStockOrgID.ToString() +
			//"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
			//"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
			//",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
			@@ -117,7 +118,7 @@
			// }
			//}
			DataSet Ds;
			foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
			foreach (Models.ClsSc_MouldStockBillSub oSub in DetailColl)
			{
			Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBill_CheckKF " + omodel.HInterID + "," + oSub.HMaterID + "," + oSub.HWHID + "," + oSub.HSPID + ", 1", "gy_czygl");
			if (Ds.Tables[0].Rows.Count == 0)
			@@ -156,17 +157,17 @@
			oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
			",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HSupTypeID,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
			", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
			", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
			", " + omodel.HSupTypeID.ToString() + ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
			", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +

			") ");
			//插入子表
			foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
			foreach (Models.ClsSc_MouldStockBillSub oSub in DetailColl)
			{

			oCn.RunProc("Insert into Sc_MouldStockBillSub " +
			@@ -175,7 +176,7 @@
			",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
			",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
			",HDesignLife,HLeaveLife,HUseLife" +
			",HSCSPID,HSPGroupID,HBatchNo" +
			",HSCSPID,HSPGroupID,HBatchNo,HStockOrgID" +
			//",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
			//",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
			//",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
			@@ -187,12 +188,12 @@
			"," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
			"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
			"," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
			"," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
			//"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
			//"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
			//",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
			//"," + 0 + "," + oSub.HNewLifeQty.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
			//"," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() +
			"," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HStockOrgID.ToString() +
			//"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
			//"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
			//",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
			//"," + 0 + "," + oSub.HNewLifeQty.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
			//"," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() +
			") ");
			//
			//if (oSub.HBackFlag == "报废入库")
			@@ -218,7 +219,7 @@
			//}
			//
			DataSet Ds;
			foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
			foreach (Models.ClsSc_MouldStockBillSub oSub in DetailColl)
			{
			Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBill_CheckKF " + omodel.HInterID + "," + oSub.HMaterID + "," + oSub.HWHID + "," + oSub.HSPID + ", 1", "gy_czygl");
			if (Ds.Tables[0].Rows.Count == 0)
			@@ -304,7 +305,7 @@
			DetailColl.Clear();//清空
			for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
			{
			Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
			Models.ClsSc_MouldStockBillSub oSub = new Models.ClsSc_MouldStockBillSub();
			// 固定赋值===============================================
			oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
			oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);