From 5218777a77c5f2080a62386dab4cbaef4184838a Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期三, 15 三月 2023 12:54:08 +0800
Subject: [PATCH] 增加系统参数
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 160 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 142 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 832c040..556e351 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -50,7 +50,7 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ DBUtility.ClsPub.CurUserName = msg4;
DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
List<Model.ClsSc_ProcessExchangeBillMain> lsmain = new List<Model.ClsSc_ProcessExchangeBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -61,8 +61,8 @@
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3772";
oItem.HBillSubType = "3772";
- oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -373,6 +373,125 @@
//}
#endregion
+ #region[鎵归噺鏂板鍗曟嵁-淇濆瓨鎸夐挳]
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessExchangeBill/AddBill_pl")]
+ [HttpPost]
+ public object AddBill_pl([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();//涓昏〃
+ string msg3 = sArray[1].ToString();//鍗曟嵁鍙峰強鏁伴噺
+ string msg4 = sArray[2].ToString();//宸ヨ壓璺嚎
+ string msg5 = sArray[3].ToString();//绫诲瀷
+ string msg6 = sArray[4].ToString();//鐢ㄦ埛
+
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, msg6))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍗曟嵁鍙� 鍙婃暟閲�
+ DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
+ List<Model.ClsSc_ProcessExchangeBillMain> ListHbillNo = new List<Model.ClsSc_ProcessExchangeBillMain>();
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ ListHbillNo = JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillMain>>(msg3);
+
+ //涓昏〃淇℃伅
+ Model.ClsSc_ProcessExchangeBillMain Main = new Model.ClsSc_ProcessExchangeBillMain();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ Main = JsonConvert.DeserializeObject<Model.ClsSc_ProcessExchangeBillMain>(msg2);
+
+ DBUtility.ClsPub.CurUserName = msg6;
+ Main.HMaker = msg6; //鍒跺崟浜�
+ Main.HBillType = "3772";
+ Main.HBillSubType = "3772";
+ Main.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ Main.HMaterID = Main.HMaterID2;
+ if (DBUtility.ClsPub.isStrNull(Main.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg4 = msg4.Substring(1, msg4.Length - 2);
+ msg4 = msg4.Replace("\\", "");
+ msg4 = msg4.Replace("\n", ""); //\n
+ List<Model.ClsSc_ProcessExchangeBillSub> ls = new List<Model.ClsSc_ProcessExchangeBillSub>();
+ ls = oListModels.getObjectByJson_Sc_ProcessExchangeBillSub(msg4);
+
+ //寰幆鏂板鍗曟嵁
+ for (int i = 0; i < ListHbillNo.Count; i++)
+ {
+ Main.HBillNo = ListHbillNo[i].HBillNo;
+ Main.HQty = ListHbillNo[i].HQty;
+ oBill.omodel = Main;
+
+ int j = 0;
+ foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in ls)
+ {
+ j++;
+ oItemSub.HEntryID = j;
+ oItemSub.HQty = Main.HQty;
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oBill.DetailColl.Add(oItemSub);
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult=false;
+ if (msg5 == "2")
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ oBill.DetailColl.Clear();
+ if (!bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region 宸ュ簭娴佽浆鍗″垪琛ㄦ樉绀哄櫒鍏锋竻鍗曚俊鎭�
[Route("Sc_ProcessExchangeBillList/QJQD")]
[HttpGet]
@@ -547,7 +666,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format(@"select 娴佹按鍙� HProcNo,HProcID,宸ュ簭浠ｇ爜 HProcNumber,宸ュ簭鍚嶇О HProcName,鍔犲伐璇存槑 HWorkRemark,HCenterID,宸ヤ綔涓績浠ｇ爜 HCenterNumber,
- 宸ヤ綔涓績 HCenterName,HSupID,渚涘簲鍟嗕唬鐮� HSupNumber,渚涘簲鍟� HSupName,isEntrust,璁″垝鏁伴噺 HQty,鍔犲伐鍗曚环 HOutPrice, 琛ㄤ綋澶囨敞 HRemark,
+ 宸ヤ綔涓績 HCenterName,HSupID,渚涘簲鍟嗕唬鐮� HSupNumber,渚涘簲鍟� HSupName,isEntrust HSupFlag,璁″垝鏁伴噺 HQty,鍔犲伐鍗曚环 HOutPrice, 琛ㄤ綋澶囨敞 HRemark,
杩涚珯鍏宠仈鏁伴噺 HRelationQty_In,鍑虹珯鍏宠仈鏁伴噺 HRelationQty_Out,濮斿宸ュ崟鏁伴噺 HRelationQty_WWOrder,涓嶅悎鏍兼暟閲� HRelationQty_Bad,瓒呴姣斾緥 HOverRate,
鑹巼 HPassRate,绱鑹巼 HSumPassRate,鍥剧焊缂栧彿 HPicNum,鏈伐搴忕‘璁よ褰� HProcCheckNote,宸ヨ壓鍙傛暟 HTechnologyParameter,HDeptID,
鍔犲伐杞﹂棿浠ｇ爜 HDeptNumber,鍔犲伐杞﹂棿 HDeptName
@@ -814,6 +933,7 @@
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
string msg5 = sArray[3].ToString();
+ string linterid = sArray[4].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
@@ -834,16 +954,11 @@
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Sc_ProcessExchangeBillMain(msg2);
+ string sReturn = "";
+ DBUtility.ClsPub.HOrgID = lsmain[0].HPRDORGID;
+ oBill.ShowBill(long.Parse(linterid), ref sReturn);
foreach (Model.ClsSc_ProcessExchangeBillMain oItem in lsmain)
{
- oItem.HMaker = msg5; //鍒跺崟浜�
- oItem.HBillType = "3772";
- oBill.HBillSubType = "Split";
- oItem.HNo = DBUtility.ClsPub.isLong(oItem.HBillNo.Split('-')[1]);
- oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
- oItem.HMaterID2 = oItem.HMaterID;
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -852,7 +967,16 @@
objJsonResult.data = 1;
return objJsonResult;
}
- oBill.omodel = oItem;
+
+ oBill.omodel.HMaker = msg5; //鍒跺崟浜�
+ oBill.omodel.HNo = DBUtility.ClsPub.isLong(oItem.HBillNo.Split('-')[1]);
+ oBill.omodel.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oBill.omodel.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oBill.omodel.HDate = oItem.HDate;// 鏃ユ湡
+ oBill.omodel.HPlanBeginDate = oItem.HPlanBeginDate;// 璁″垝寮�宸ユ棩鏈�
+ oBill.omodel.HPlanEndDate = oItem.HPlanEndDate;// 璁″垝瀹屽伐鏃ユ湡
+ oBill.omodel.HQty = oItem.HQty;// 鏁伴噺
+ oBill.omodel.HBillNo = oItem.HBillNo;// 鍗曟嵁鍙�
}
//琛ㄤ綋鏁版嵁
@@ -867,19 +991,19 @@
foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in ls)
{
- i++;
if (oItemSub.HSplitQty > oItemSub.HLeftQty)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绗�"+i+ "琛岋紝鎷嗗垎鏁伴噺涓嶈兘澶т簬鍙媶鍒嗘暟閲忥紒";
+ objJsonResult.Message = "绗�" + (i + 1) + "琛岋紝鎷嗗垎鏁伴噺涓嶈兘澶т簬鍙媶鍒嗘暟閲忥紒";
objJsonResult.data = null;
return objJsonResult;
}
- oItemSub.HEntryID = i;
- oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- oBill.DetailColl.Add(oItemSub);
-
+ oBill.DetailColl[i].HQty = oItemSub.HQty;
+ oBill.DetailColl[i].HBackProc = oItemSub.HBackProc;
+ oBill.DetailColl[i].HPrevSourceInterID = oItemSub.HPrevSourceInterID;
+ oBill.DetailColl[i].HPrevSourceEntryID = oItemSub.HPrevSourceEntryID;
+ i++;
}
//淇濆瓨
--
Gitblit v1.9.1