MES-WEB-API.git

			@@ -442,7 +442,7 @@
			{
			try
			{
			//LogService.Write("销售订单同步,保存方法执行完成异常：" + sMainSub.ToString());
			LogService.Write("销售订单同步：" + sMainSub.ToString());
			var model = sMainSub["model"].ToString();
			var entry = sMainSub["model"]["HENTRY"].ToString();

			@@ -456,6 +456,21 @@
			oCN.RunProc(sql);
			sql = $"delete Xs_SeOrderBillSub where HinterID = {mainList[0].HInterID}";
			oCN.RunProc(sql);

			LogService.Write("销售订单同步：" + @"Insert Into Xs_SeOrderBillMain
			(HInterID, HYear, HPeriod, HBillType, HBillSubType, HDate
			, HBillNo, HBillStatus
			, HAddress, HSSID, HSSDate, HCusID, HCurID, HExRate
			, HEmpID, HManagerID, HDeptID, HExplanation, HRemark, HInnerBillNo
			, HChecker, HCheckDate, HMaker, HMakeDate, HCloseMan, HCloseDate
			, HERPInterID, HERPBillType, HSALEORGID, HSALEGROUPID, HRECEIVEID, HSETTLEID
			, HCHARGEID, HHEADLOCID, HRECCONTACTID, HCORRESPONDORGID, HBUSINESSTYPE)
			values(" + mainList[0].HInterID + ", " + DateTime.Now.Year + ", " + DateTime.Now.Month + ", '" + 1401 + "', '" +
			mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "','" + mainList[0].HBillStatus + "','" + mainList[0].HAddress + "'," + mainList[0].HSSID +
			",'" + mainList[0].HSSDate + "'," + mainList[0].HCusID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + "," + mainList[0].HEmpID + "," + mainList[0].HManagerID + "," + mainList[0].HDeptID + ",'" + mainList[0].HExplanation + "','" + mainList[0].HRemark + "','" +
			mainList[0].HInnerBillNo + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HMaker + "','" + mainList[0].HMakeDate + "','"
			+ mainList[0].HCloseMan + "','" + mainList[0].HCloseDate + "'," + mainList[0].HERPInterID + ",'"
			+ mainList[0].HERPBillType + "'," + mainList[0].HSALEORGID + "," + mainList[0].HSALEGROUPID + "," + mainList[0].HRECEIVEID + "," + mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + "," + mainList[0].HHEADLOCID + "," + mainList[0].HRECCONTACTID + "," + mainList[0].HCORRESPONDORGID + ",'" + mainList[0].HBUSINESSTYPE + "'" + ")");
			//主表
			oCN.RunProc(@"Insert Into Xs_SeOrderBillMain
			(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate
			@@ -1215,6 +1230,17 @@
			oBill.DetailColl.Add(oItemSub);
			}
			}

			//进行会计期间结账的判断和控制
			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;
			}

			//保存
			//保存完毕后处理
			bool bResult;
			@@ -1365,10 +1391,36 @@
			}
			//==================================================================================

			//进行会计期间结账的判断和控制
			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;
			}

			oCN.BeginTran();

			oCN.RunProc("delete from Xs_SeOrderBillMain where HInterID = " + HInterID);
			oCN.RunProc("delete from Xs_SeOrderBillSub where HInterID='" + HInterID + "'");


			//写入日志
			string Operation = "删除";
			string ComputerName = System.Net.Dns.GetHostName(); //设备名称
			string WorkList = Operation + "单据，单据号：" + BillOld.omodel.HBillNo;
			string MvarReportTitle = BillOld.MvarReportTitle; //模块
			string SystemName = "LMES-" + MvarReportTitle + "模块";
			string IPAddress = "";
			//string IPAddress = Dns.GetHostEntry(Dns.GetHostName()).AddressList[0].ToString(); //IP地址
			//string IPAddress = System.Web.HttpContext.Current.Request.UserHostAddress;

			oCN.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			"(getdate(),'" + user + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','" + Operation + "')"
			);


			//删除后控制==================================================================================
			string sql2 = "exec h_p_Xs_SeOrderBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			@@ -1554,6 +1606,17 @@
			}
			//==================================================================================

			//进行会计期间结账的判断和控制
			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 (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			@@ -1593,6 +1656,17 @@
			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;
			}

			//反审核提交AbandonCheck
			if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			@@ -1732,9 +1806,40 @@
			//进行需要进行的关闭/反关闭操作
			if (IsAudit == 0) //关闭提交
			{
			oBill.oCn.BeginTran();
			//关闭提交
			if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			//关闭后控制=========================================
			string sql_afterClose = "exec h_p_Xs_SeOrderBill_AfterCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			DataSet ds_afterClose = oBill.oCn.RunProcReturn(sql_afterClose, "h_p_Xs_SeOrderBill_AfterCloseCtrl");
			if (ds_afterClose == null \|\| ds_afterClose.Tables[0].Rows.Count <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "关闭失败，原因：关闭后控制错误，请联系网络管理人员！";
			objJsonResult.data = null;
			oBill.oCn.RollBack();

			return objJsonResult;
			}
			else
			{
			if (ds_afterClose.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "关闭失败，原因：" + ds_afterClose.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			oBill.oCn.RollBack();

			return objJsonResult;
			}
			}
			//=========================================

			oBill.oCn.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "关闭成功";
			@@ -1743,6 +1848,8 @@
			}
			else
			{
			oBill.oCn.RollBack();

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "关闭失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			@@ -1918,7 +2025,7 @@
			if (IsAudit == 0) //行关闭提交
			{
			//行关闭提交
			if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, "h_p_Xs_SeOrderBill_AfterEntryCloseCtrl", ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;