MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using Newtonsoft.Json.Linq;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using NPOI.SS.Formula.Functions;
			using Pub_Class;
			using System;
			@@ -39,6 +40,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>();//定义声明变量，把通过 new List<object>()创建的实例，赋值给变量
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			string sql = "select * from h_v_Kf_POStockInBillList order by hmainid desc";
			@@ -50,6 +52,12 @@
			string sql = sql1 + sWhere+ " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_Kf_POStockInBillList");
			}
			foreach (DataColumn col in ds.Tables[0].Columns)//遍历ds中第一个表（Tables[0]）的所有列（Columns）每次循环中，col变量会持有当前列的引用
			{
			Type dataType = col.DataType; //获取当前数据类型传入自定义变量datadataType
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //字符串拼接 // 将列名和数据类型信息拼接成一个JSON格式的字符串
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			@@ -57,6 +65,7 @@
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;//将columnNameList赋值给objJsonResult的list属性
			return objJsonResult;
			//}
			//else
			@@ -148,10 +157,12 @@
			long HSCWHID = mainList[0].HSCWHID;//调出仓库
			long HSecManagerID = mainList[0].HSecManagerID;//验收
			long HKeeperID = mainList[0].HKeeperID;//保管员
			long HProjectID = mainList[0].HProjectID;//项目




			string HInvoiceBillNo = mainList[0].HInvoiceBillNo;//发票编号
			string HExplanation = mainList[0].HExplanation;//摘要
			string HInnerBillNo = mainList[0].HInnerBillNo;//内部单据号

			@@ -169,6 +180,16 @@
			string HDeleteDate = mainList[0].HDeleteDate;
			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");

			@@ -198,24 +219,52 @@
			String sql =$@"Insert Into Kf_ICStockBillMain
			(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
			,HAddress,HSupID,HCurID,HWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID,HExplanation,HRemark
			,HInnerBillNo,HSTOCKORGID,HOWNERID,HMaker,HMakeDate)
			,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()" +")";
			+ "','" + HInnerBillNo + "'," + HSTOCKORGID + "," + HOWNERID + ",'" + HMaker + "',getdate(),"+ HProjectID + ",'"+ HInvoiceBillNo + "')";

			oCN.RunProc(sql);
			}
			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
			+ ",HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID + ",HOWNERID=" + HOWNERID
			+ ",HAddress='" + HAddress + "',HInnerBillNo='" + HInnerBillNo + "' where HInterID=" + HInterID;
			+ ",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 + "'");
			}
			@@ -227,7 +276,7 @@

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



			if (objJsonResult.code == "0")
			{
			@@ -329,13 +378,15 @@
			,HMoney,HOrderPrice,HWHID,HSPID,HRelationQty,HBatchNo
			,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
			,HPOOrderInterID,HPOOrderEntryID ,HPOOrderBillNo
			,HPropertyID,HSecUnitID,HSecUnitRate,HPlanMode,HRemark,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo)
			,HPropertyID,HSecUnitID,HSecUnitRate,HPlanMode,HRemark,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo
			,HTaxRate,HTaxPrice,HlineTotal)
			values({HInterID},{NewHEntryID},{oSub.HMaterID},{oSub.HUnitID}
			,{oSub.HQtyMust},{(oSub.HQty == null ? 0 : oSub.HQty)},{oSub.HPrice},{oSub.HMoney},{oSub.HOrderPrice},{oSub.HWHID},{oSub.HSPID},{oSub.HRelationQty}
			,'{oSub.HBatchNo}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}'
			,{oSub.HPOOrderInterID},{oSub.HPOOrderEntryID},'{oSub.HPOOrderBillNo}'
			,{(oSub.HPropertyID == null ? 0 : oSub.HPropertyID)},{(oSub.HSecUnitID == null ? 0 : oSub.HSecUnitID)},{(oSub.HSecUnitRate == null ? 0 : oSub.HSecUnitRate)}
			,{(oSub.HPlanMode == null ? 0 : oSub.HPlanMode)},'{oSub.HRemark}',{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{oSub.HSeOrderBillNo}')";
			,{(oSub.HPlanMode == null ? 0 : oSub.HPlanMode)},'{oSub.HRemark}',{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{oSub.HSeOrderBillNo}'
			,{(oSub.HTaxRate == null ? 0 : oSub.HTaxRate)},{(oSub.HTaxPrice == null ? 0 : oSub.HTaxPrice)},{(oSub.HlineTotal == null ? 0 : oSub.HlineTotal)})";

			//string sReturn = "";
			//ds = oCN.RunProcReturn("exec h_p_Cg_POInStockBillMain " + oSub.HQty + ", '" +oSub.HSourceInterID + "', '" + oSub.HSourceEntryID + "','" + user+" '", "h_p_Cg_POInStockBillMain");
			@@ -379,7 +430,9 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			#endregion

			#region 删除功能
			/// <summary>
			///删除功能
			/// </summary>
			@@ -413,8 +466,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();
			@@ -460,9 +531,9 @@
			return objJsonResult;
			}
			}
			#endregion



			#region 查找记录功能
			/// <summary>
			/// 根据基础资料ID 查找记录
			///参数：string sql。
			@@ -502,6 +573,7 @@
			return objJsonResult;
			}
			}
			#endregion

			#region 根据物料内码获取物料信息
			[Route("Kf_POStockInBill/getMaterialByMaterID")]
			@@ -615,6 +687,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) //审核提交
			@@ -640,8 +722,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)
			{
			@@ -680,8 +762,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)
			{
			@@ -1168,7 +1250,7 @@
			#endregion


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

			}
			}
			#endregion
			}