MES-WEB-API.git

			@@ -172,6 +172,16 @@
			string HCloseMan = mainList[0].HCloseMan;
			string HCloseDate = mainList[0].HCloseDate;

			//进行会计期间结账的判断和控制
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillList where hmainid=" + HInterID + " and 单据号='" + HBillNo + "'", "h_v_Kf_POStockInBillList");

			if ((OperationType == 1 \|\| OperationType == 2 \|\| OperationType == 4) && ds.Tables[0].Rows.Count == 0)//新增
			@@ -202,7 +212,7 @@
			,HAddress,HSupID,HCurID,HWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID,HExplanation,HRemark
			,HInnerBillNo,HSTOCKORGID,HOWNERID,HMaker,HMakeDate,HProjectID,HInvoiceBillNo)
			values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1201 + "','" +
			HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + HAddress +
			1201 + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + HAddress +
			"'," + HSupID + "," + HCurID + "," + HWHID + "," + HEmpID + "," + HManagerID + "," +
			HSecManagerID + ","+ HKeeperID +"," + HDeptID + ",'" + HExplanation + "','" + HRemark
			+ "','" + HInnerBillNo + "'," + HSTOCKORGID + "," + HOWNERID + ",'" + HMaker + "',getdate(),"+ HProjectID + ",'"+ HInvoiceBillNo + "')";
			@@ -211,6 +221,27 @@
			}
			else if (OperationType == 3 \|\| ds.Tables[0].Rows.Count != 0)
			{ //修改

			DataSet dss;
			dss = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillList where hmainid=" + HInterID + " and 单据号='" + HBillNo + "'", "h_v_Kf_POStockInBillList");
			//判断是否可编辑
			if (dss.Tables[0].Rows[0]["审核人"].ToString() != "" && dss.Tables[0].Rows[0]["审核人"] != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据已经被审核，不允许修改！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (dss.Tables[0].Rows[0]["状态"].ToString() != "创建")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据处于不可编辑状态，不允许修改！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			String sql = $@"update Kf_ICStockBillMain set " +
			"HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
			",HSupID=" + HSupID + ",HCurID=" + HCurID + ",HSecManagerID=" + HSecManagerID + ", HSTOCKORGID=" + HSTOCKORGID + ",HKeeperID=" + HKeeperID + ",HWHID = " + HWHID
			@@ -218,6 +249,13 @@
			+ ",HAddress='" + HAddress + "',HInnerBillNo='" + HInnerBillNo + "',HProjectID="+ HProjectID + ",HInvoiceBillNo='"+ HInvoiceBillNo + "' where HInterID=" + HInterID;

			oCN.RunProc(sql);

			//采购入库单编辑撤销回填采购订单关联数量
			oCN.RunProc("exec h_p_Cg_UpDateRelation_POOrderToPOStockIn_Del " + HInterID);

			//采购入库单编辑撤销回填收料通知单关联数量
			oCN.RunProc("exec h_p_Cg_UpDateRelation_POInStockToPOStockIn_Del " + HInterID);

			//删除子表
			oCN.RunProc("delete from Kf_ICStockBillSub where HInterID='" + HInterID + "'");
			}
			@@ -229,7 +267,7 @@

			//采购入库单新增回填收料通知单关联数量
			oCN.RunProc("exec h_p_Cg_UpDateRelation_POInStockToPOStockIn_Add " + HInterID);



			if (objJsonResult.code == "0")
			{
			@@ -419,8 +457,26 @@
			}
			//==================================================================================

			//进行会计期间结账的判断和控制
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			DateTime HDate = DateTime.Now;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}

			string sReturn = "";
			oCN.BeginTran();

			//采购入库单删除撤销回填采购订单关联数量
			oCN.RunProc("exec h_p_Cg_UpDateRelation_POOrderToPOStockIn_Del " + HInterID);

			//采购入库单删除撤销回填收料通知单关联数量
			oCN.RunProc("exec h_p_Cg_UpDateRelation_POInStockToPOStockIn_Del " + HInterID);

			oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
			oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
			oCN.Commit();
			@@ -622,6 +678,16 @@
			return objJsonResult;
			}

			//进行会计期间结账的判断和控制
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			DateTime HDate = DateTime.Now;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}

			//进行需要进行的审核/反审核操作
			if (IsAudit == 0) //审核提交
			@@ -647,8 +713,8 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//==================================================================================

			//==================================================================================

			//审核提交
			if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_POStockInBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			@@ -687,8 +753,8 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================

			//=========================================================

			//反审核提交AbandonCheck
			if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_POStockInBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			@@ -1175,7 +1241,7 @@
			#endregion


			#region 采购入库单根据主内码与子内码获取采购入库单数据
			#region 采购入库单根据主内码与子内码获取采购入库单数据
			[Route("Kf_POStockInBill/loadKf_POStockInBill_Push")]
			[HttpGet]
			public object loadKf_POStockInBill_Push(long HInterID, long HSubID)