From dabd6d20c31442d461fc30c49aa04abd4549be6b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 10 三月 2023 13:30:53 +0800
Subject: [PATCH] wip页面优化
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 9eb7c33..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";
@@ -466,7 +466,6 @@
oBill.DetailColl.Clear();
if (!bResult)
{
- oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
@@ -667,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
@@ -934,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();
@@ -954,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";
@@ -972,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;// 鍗曟嵁鍙�
}
//琛ㄤ綋鏁版嵁
@@ -987,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