From 20dc0ca259d13c6d712bde41c992d94365f5f090 Mon Sep 17 00:00:00 2001
From: 陈雯静 <1134865194@qq.com>
Date: 星期五, 15 三月 2024 16:24:12 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/XSGL/Xs_SellOutChangeBillController.cs | 234 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 151 insertions(+), 83 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/YF_PayMentOtherBillController.cs b/WebAPI/Controllers/XSGL/Xs_SellOutChangeBillController.cs
similarity index 77%
copy from WebAPI/Controllers/XSGL/YF_PayMentOtherBillController.cs
copy to WebAPI/Controllers/XSGL/Xs_SellOutChangeBillController.cs
index 21bd369..26001ac 100644
--- a/WebAPI/Controllers/XSGL/YF_PayMentOtherBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SellOutChangeBillController.cs
@@ -11,35 +11,33 @@
namespace WebAPI.Controllers
{
- //鍏朵粬搴斾粯鍗旵ontroller
- public class YF_PayMentOtherBillController : ApiController
+ //閿�鍞皟浠峰崟Controller
+ public class Xs_SellOutChangeBillController : ApiController
{
- //鍏朵粬搴斾粯鍗�
- //鑾峰彇绯荤粺鍙傛暟 YF_PayMentOtherBillMain YF_PayMentOtherBill
+ //鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
- public DAL.ClsYF_PayMentOtherBill BillOld = new DAL.ClsYF_PayMentOtherBill();
- public DAL.ClsYF_PayMentOtherBill BillNew0 = new DAL.ClsYF_PayMentOtherBill();
+ public DAL.ClsXs_SellOutChangeBill BillOld = new DAL.ClsXs_SellOutChangeBill();
+ public DAL.ClsXs_SellOutChangeBill BillNew0 = new DAL.ClsXs_SellOutChangeBill();
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
- #region 鍏朵粬搴斾粯鍗曞垪琛� 鏌ヨ
+ #region 閿�鍞皟浠峰崟鍒楄〃 鏌ヨ
/// <summary>
- /// 杩斿洖椤圭洰闃舵鍒楄〃
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("YF_PayMentOtherBill/YF_PayMentOtherBillMainList")]
+ [Route("Xs_SellOutChangeBill/list")]
[HttpGet]
- public object YF_PayMentOtherBillMainList(string sWhere, string user)
+ public object getXs_SellOutChangeBill(string sWhere, string user)
{
try
{
List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("YF_PayMentOtherBill_Qty", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Xs_SellOutChangeBill_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -50,13 +48,13 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_YF_PayMentOtherBillMainList order by 鍗曟嵁鍙� desc", "h_v_YF_PayMentOtherBillMainList");
+ ds = oCN.RunProcReturn("select * from h_v_Xs_SellOutChangeBillList_Query order by 鍗曟嵁鍙� desc", "h_v_Xs_SellOutChangeBillList_Query");
}
else
{
- string sql1 = "select * from h_v_YF_PayMentOtherBillMainList where 1 = 1 ";
+ string sql1 = "select * from h_v_Xs_SellOutChangeBillList_Query where 1 = 1 ";
string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
- ds = oCN.RunProcReturn(sql, "h_v_YF_PayMentOtherBillMainList");
+ ds = oCN.RunProcReturn(sql, "h_v_Xs_SellOutChangeBillList_Query");
}
//娣诲姞鍒楀悕
@@ -85,17 +83,18 @@
}
#endregion
- #region 鍏朵粬搴斾粯鍗曚繚瀛� 鏂板/缂栬緫
- [Route("YF_PayMentOtherBill/SaveYF_PayMentOtherBillMain")]
+ #region 閿�鍞皟浠峰崟淇濆瓨 鏂板/缂栬緫
+ [Route("Xs_SellOutChangeBill/SaveXs_SellOutChangeBill")]
[HttpPost]
- public object SaveYF_PayMentOtherBillMain([FromBody] JObject msg)
+ public object SaveXs_SellOutChangeBill([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
- string refSav = sArray[1].ToString(); //鎿嶄綔鏂瑰紡
- string msg4 = sArray[2].ToString(); //鐢ㄦ埛
+ string msg3 = sArray[1].ToString(); //瀛愯〃1鏁版嵁
+ string refSav = sArray[2].ToString(); //鎿嶄綔鏂瑰紡
+ string msg4 = sArray[3].ToString(); //鐢ㄦ埛
DBUtility.ClsPub.CurUserName = msg4;
@@ -105,7 +104,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("YF_PayMentOtherBill_Edit", 1, false, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Xs_SellOutChangeBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -114,12 +113,12 @@
return objJsonResult;
}
- DAL.ClsYF_PayMentOtherBill oBill = new DAL.ClsYF_PayMentOtherBill();
- List<Model.ClsYF_PayMentOtherBillMain> lsmain = new List<Model.ClsYF_PayMentOtherBillMain>();
+ DAL.ClsXs_SellOutChangeBill oBill = new DAL.ClsXs_SellOutChangeBill();
+ List<Model.ClsXs_SellOutChangeBillMain> lsmain = new List<Model.ClsXs_SellOutChangeBillMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_YF_PayMentOtherBillMain(msg2);
- foreach (Model.ClsYF_PayMentOtherBillMain oItem in lsmain)
+ lsmain = oListModels.getObjectByJson_Xs_SellOutChangeBillMain(msg2);
+ foreach (Model.ClsXs_SellOutChangeBillMain oItem in lsmain)
{
if (refSav == "Add")
{
@@ -170,12 +169,6 @@
}
}
UserName = oItem.HMaker; //鍒跺崟浜�
- oItem.HBillType = "2102";
- oItem.HBillSubType = "2102";
-
- oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
- oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
@@ -188,12 +181,44 @@
oBill.omodel = oItem;
}
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsXs_SellOutChangeBillSub> ls = new List<Model.ClsXs_SellOutChangeBillSub>();
+ ls = oListModels.getObjectByJson_Xs_SellOutChangeBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsXs_SellOutChangeBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ //oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ //oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+
+ //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+
+
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
if (refSav == "Add")
{
-
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
else if (refSav == "Update")
@@ -209,6 +234,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -232,14 +258,14 @@
}
#endregion
- #region 鍏朵粬搴斾粯鍗� 缂栬緫椤甸潰鍒濆鍖�
- [Route("YF_PayMentOtherBill/YF_PayMentOtherBillMainEditList")]
+ #region 閿�鍞皟浠峰崟 缂栬緫椤甸潰鍒濆鍖�
+ [Route("Xs_SellOutChangeBill/cx")]
[HttpGet]
- public object YF_PayMentOtherBillMainEditList(long HInterID)
+ public object cx(long HInterID)
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_YF_PayMentOtherBillMainList where hmainid=" + HInterID, "h_v_YF_PayMentOtherBillMainList");
+ ds = oCN.RunProcReturn("select * from h_v_Xs_SellOutChangeBillList where hmainid=" + HInterID, "h_v_Xs_SellOutChangeBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -268,21 +294,21 @@
}
#endregion
- #region 鍏朵粬搴斾粯鍗� 鍒犻櫎
+ #region 閿�鍞皟浠峰崟 鍒犻櫎
/// <summary>
///鍙傛暟锛歴tring HInterID銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("YF_PayMentOtherBill/DeleteYF_PayMentOtherBillMain")]
+ [Route("Xs_SellOutChangeBill/delete")]
[HttpGet]
- public object DeleteYF_PayMentOtherBillMain(string HInterID, string user)
+ public object deleteXs_SellOutChangeBill(string HInterID, string user)
{
try
{
string s = "";
//鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("YF_PayMentOtherBill_Drop", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Xs_SellOutChangeBill_Drop", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -319,8 +345,8 @@
}
//鍒犻櫎鍓嶆帶鍒�=========================================
- string sql1 = "exec h_p_YF_PayMentOtherBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
- ds = oCN.RunProcReturn(sql1, "h_p_YF_PayMentOtherBill_BeforeDelCtrl");
+ string sql1 = "exec h_p_Xs_SellOutChangeBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Xs_SellOutChangeBill_BeforeDelCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -340,16 +366,14 @@
}
//==================================================================================
-
-
oCN.BeginTran();
- oCN.RunProc("delete from YF_PayMentOtherBillMain where HInterID = " + HInterID);
- oCN.RunProc("delete from YF_PayMentOtherBillSub where HInterID= " + HInterID);
+ oCN.RunProc("delete from Xs_SellOutChangeBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from Xs_SellOutChangeBillSub where HInterID= " + HInterID);
//鍒犻櫎鍚庢帶鍒�==================================================================================
- string sql2 = "exec h_p_YF_PayMentOtherBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
- ds = oCN.RunProcReturn(sql2, "h_p_YF_PayMentOtherBill_AfterDelCtrl");
+ string sql2 = "exec h_p_Xs_SellOutChangeBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Xs_SellOutChangeBill_AfterDelCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
s = "鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
@@ -376,13 +400,12 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
catch (Exception e)
{
- oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.ToString();
@@ -392,18 +415,18 @@
}
#endregion
- #region 鍏朵粬搴斾粯鍗� 瀹℃牳/鍙嶅鏍�
+ #region 閿�鍞皟浠峰崟 瀹℃牳/鍙嶅鏍�
/// <summary>
/// </summary>
/// <param name="HInterID">鍗曟嵁ID</param>
/// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
/// <param name="CurUserName">瀹℃牳浜�</param>
/// <returns></returns>
- [Route("YF_PayMentOtherBill/AuditYF_PayMentOtherBillMain")]
+ [Route("Xs_SellOutChangeBill/AuditXs_SellOutChangeBill")]
[HttpGet]
- public object AuditYF_PayMentOtherBillMain(int HInterID, int IsAudit, string CurUserName)
+ public object AuditXs_SellOutChangeBill(int HInterID, int IsAudit, string CurUserName)
{
- string ModRightNameCheck = "YF_PayMentOtherBill_Check";
+ string ModRightNameCheck = "Xs_SellOutChangeBill_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
@@ -429,7 +452,7 @@
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
- DAL.ClsYF_PayMentOtherBill oBill = new DAL.ClsYF_PayMentOtherBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+ DAL.ClsXs_SellOutChangeBill oBill = new DAL.ClsXs_SellOutChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
//閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
@@ -486,23 +509,54 @@
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
if (IsAudit == 0) //瀹℃牳鎻愪氦
{
- oCN.BeginTran();
+ //妫�楠屽瓙琛ㄦ暟鎹�
+ string errorMessage = "";
+ foreach (Model.ClsXs_SellOutChangeBillSub oSub in oBill.DetailColl)
+ {
+ ////鍒ゆ柇鏂版暟閲忔槸鍚﹀皬浜庡崟鎹叧鑱旀暟閲�
+ //if (oSub.HQty_New < oSub.HRelationQty)
+ //{
+ // errorMessage += "鐗╂枡鏂版暟閲忓皬浜庡崟鎹鍏宠仈鏁伴噺!";
+ //}
+ }
+ if (errorMessage != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + errorMessage;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- //璁板綍杩斿洖淇℃伅
- string msg = "";
-
-
+ //妫�鏌ユ簮鍗曟槸鍚﹀瓨鍦�
+ string sql = "select * from Kf_ICStockBillMain where HInterID = " + oBill.omodel.HMainSourceInterID;
+ ds = oCN.RunProcReturn(sql, "Kf_ICStockBillMain");
+ if(ds==null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟鏁版嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() != "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟鏈浜庡鏍哥姸鎬�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//瀹℃牳鍓嶆帶鍒�=========================================
- string sql1 = "exec h_p_YF_PayMentOtherBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
- ds = oCN.RunProcReturn(sql1, "h_p_YF_PayMentOtherBill_BeforeCheckCtrl");
+ string sql1 = "exec h_p_Xs_SellOutChangeBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Xs_SellOutChangeBill_BeforeCheckCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
objJsonResult.data = null;
- oCN.RollBack();
return objJsonResult;
}
@@ -512,19 +566,35 @@
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
objJsonResult.data = null;
- oCN.RollBack();
return objJsonResult;
}
- //==================================================================================
+ //==================================================================================
+
+ oCN.BeginTran();
+ ////鍙嶅啓婧愬崟鏁版嵁
+ sql = "exec h_p_Xs_SellOutChangeBill_ReWriteBySellOutChangeBill " + oBill.omodel.HInterID;
+ oCN.RunProc(sql);
+
+ //淇$敤鎺у埗
+ ds = oCN.RunProcReturn("exec h_p_Kf_CheckSellOutBill_CrediControl " + oBill.omodel.HMainSourceInterID, "h_p_Kf_CheckSellOutBill_CrediControl");
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//瀹℃牳鎻愪氦
- if (oBill.CheckBill(oBill.omodel.HInterID,oBill.omodel.HBillNo, "h_p_YF_PayMentOtherBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SellOutChangeBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳鎴愬姛锛�" + msg;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
@@ -541,10 +611,9 @@
}
if (IsAudit == 1) //鍙嶅鏍告彁浜�
{
-
//鍙嶅鏍稿墠鎺у埗=========================================
- string sql1 = "exec h_p_YF_PayMentOtherBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
- ds = oCN.RunProcReturn(sql1, "h_p_YF_PayMentOtherBill_BeforeUnCheckCtrl");
+ string sql1 = "exec h_p_Xs_SellOutChangeBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Xs_SellOutChangeBill_BeforeUnCheckCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -562,10 +631,11 @@
objJsonResult.data = null;
return objJsonResult;
}
- //===========================================================
+ //===========================================================
+
//鍙嶅鏍告彁浜bandonCheck
- if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_YF_PayMentOtherBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SellOutChangeBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -597,18 +667,18 @@
}
#endregion
- #region 鍏朵粬搴斾粯鍗� 鍏抽棴/鍙嶅叧闂�
+ #region 閿�鍞皟浠峰崟 鍏抽棴/鍙嶅叧闂�
/// <summary>
/// </summary>
/// <param name="HInterID">鍗曟嵁ID</param>
/// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param>
/// <param name="CurUserName">鍏抽棴浜�</param>
/// <returns></returns>
- [Route("YF_PayMentOtherBill/CloseYF_PayMentOtherBill")]
+ [Route("Xs_SellOutChangeBill/CloseXs_SellOutChangeBill")]
[HttpGet]
- public object CloseYF_PayMentOtherBill(int HInterID, int IsAudit, string CurUserName)
+ public object CloseSc_ICMOChangeBill(int HInterID, int IsAudit, string CurUserName)
{
- string ModRightNameCheck = "YF_PayMentOtherBill_Close";
+ string ModRightNameCheck = "Xs_SellOutChangeBill_Close";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
@@ -634,7 +704,7 @@
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
- DAL.ClsYF_PayMentOtherBill oBill = new DAL.ClsYF_PayMentOtherBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+ DAL.ClsXs_SellOutChangeBill oBill = new DAL.ClsXs_SellOutChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
//閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
@@ -742,18 +812,18 @@
}
#endregion
- #region 鍏朵粬搴斾粯鍗� 浣滃簾/鍙嶄綔搴�
+ #region 閿�鍞皟浠峰崟 浣滃簾/鍙嶄綔搴�
/// <summary>
/// </summary>
/// <param name="HInterID">鍗曟嵁ID</param>
/// <param name="IsAudit">浣滃簾(0),鍙嶄綔搴�(1)</param>
/// <param name="CurUserName">浣滃簾浜�</param>
/// <returns></returns>
- [Route("YF_PayMentOtherBill/DeleteYF_PayMentOtherBill")]
+ [Route("Xs_SellOutChangeBill/DeleteXs_SellOutChangeBill")]
[HttpGet]
- public object DeleteYF_PayMentOtherBill(int HInterID, int IsAudit, string CurUserName)
+ public object DeleteSc_ICMOChangeBill(int HInterID, int IsAudit, string CurUserName)
{
- string ModRightNameCheck = "YF_PayMentOtherBill_Delete";
+ string ModRightNameCheck = "Xs_SellOutChangeBill_Delete";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
@@ -779,7 +849,7 @@
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
- DAL.ClsYF_PayMentOtherBill oBill = new DAL.ClsYF_PayMentOtherBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+ DAL.ClsXs_SellOutChangeBill oBill = new DAL.ClsXs_SellOutChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
//閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
@@ -878,7 +948,5 @@
}
}
#endregion
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.1