From 797e02f68d79c931233f25af1d39bc136ce6185d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 21 四月 2025 15:47:05 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 191 +++++++++++++++++++++++++++++++----------------
1 files changed, 127 insertions(+), 64 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 9f9ab49..a1a1b62 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -64,7 +64,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎸囧紩鍗℃棤淇濆瓨鏉冮檺锛�";
+ objJsonResult.Message = "[3772-2-029]鎸囧紩鍗℃棤淇濆瓨鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -74,7 +74,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娴佽浆鍗℃棤淇濆瓨鏉冮檺锛�";
+ objJsonResult.Message = "[3772-2-029]娴佽浆鍗℃棤淇濆瓨鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -98,7 +98,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.Message = "[3772-2-030]淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -132,20 +132,81 @@
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "鏂板宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //娴嬭瘯璇彞===========================================================================================================
+ string msg_str = "";
+ string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
+ "from Sc_ProcessExchangeBillMain as a " +
+ "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
+ "where a.HInterID = " + oBill.omodel.HInterID;
+ DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
+ if (ds_str.Tables[0].Rows.Count > 0)
+ {
+ msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
+ for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
+ {
+ msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
+ }
+ }
+ //==============================================================================================================
+
+
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "鏂板宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + msg_str + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
else
{
LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "淇敼宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','淇敼鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //娴嬭瘯璇彞===========================================================================================================
+ string msg_str = "";
+ string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
+ "from Sc_ProcessExchangeBillMain as a " +
+ "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
+ "where a.HInterID = " + oBill.omodel.HInterID;
+ DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
+ if (ds_str.Tables[0].Rows.Count > 0)
+ {
+ msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
+ for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
+ {
+ msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
+ }
+ }
+ //==============================================================================================================
+
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "淇敼宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + msg_str + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','淇敼鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
if (bResult)
{
+
+ //鑷姩瀹℃牳璁剧疆
+ if (msg5 == "xz")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Sc_ProcessExchangeBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-050]淇濆瓨鎴愬姛锛�";
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
@@ -154,7 +215,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-051]淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = 1;
return objJsonResult;
}
@@ -163,7 +224,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-051]淇濆瓨澶辫触锛�" + e.ToString();
objJsonResult.data = 1;
return objJsonResult;
}
@@ -682,7 +743,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = listCol;
return objJsonResult;
@@ -691,7 +752,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -828,20 +889,20 @@
string sql = string.Format(@"select 娴佹按鍙� HProcNo,HProcID,宸ュ簭浠ｇ爜 HProcNumber,宸ュ簭鍚嶇О HProcName,鍔犲伐璇存槑 HWorkRemark,HCenterID,宸ヤ綔涓績浠ｇ爜 HCenterNumber,
宸ヤ綔涓績 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,鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 HRelationQty_OutBad,SN杩囩珯鎺у埗 HSNCtrl
+ 鑹巼 HPassRate,绱鑹巼 HSumPassRate,鍥剧焊缂栧彿 HPicNum,鏈伐搴忕‘璁よ褰� HProcCheckNote,宸ヨ壓鍙傛暟 HTechnologyParameter,HDeptID,HSourceID,
+ 鍔犲伐杞﹂棿浠ｇ爜 HDeptNumber,鍔犲伐杞﹂棿 HDeptName,鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 HRelationQty_OutBad,SN杩囩珯鎺у埗 HSNCtrl,HRoutingInterID HRoutingBillMainID,HRoutingEntryID HRoutingBillEntryID
from h_v_Sc_ProcessExchangeBillQuerySub");
ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID + " order by cast(娴佹按鍙� as int) ", "h_v_Sc_ProcessExchangeBillQuerySub");
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-037]鑾峰彇淇℃伅鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
}
catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-045]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
}
return objJsonResult;
@@ -865,7 +926,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎸囧紩鍗℃棤鍒犻櫎鏉冮檺锛�";
+ objJsonResult.Message = "[0000-1-004]鎸囧紩鍗℃棤鍒犻櫎鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -876,7 +937,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娴佽浆鍗℃棤鍒犻櫎鏉冮檺锛�";
+ objJsonResult.Message = "[0000-1-004]娴佽浆鍗℃棤鍒犻櫎鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -904,7 +965,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.Message = "[0000-1-009]鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍗曟嵁ID涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -920,7 +981,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "娴佽浆鍗″凡缁忔湁涓嬫父杩涘嚭绔欏崟鍚庯紝涓嶅厑璁稿垹闄わ紒";
+ objJsonResult.Message = "[3772-1-010]鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "娴佽浆鍗″凡缁忔湁涓嬫父杩涘嚭绔欏崟鍚庯紝涓嶅厑璁稿垹闄わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -934,7 +995,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
+ objJsonResult.Message = "[0000-1-011]鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -946,7 +1007,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.Message = "[0000-1-012]鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -955,7 +1016,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.Message = "[0000-1-013]鍗曟嵁鍙�:" + oBill.omodel.HBillNo + "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -966,7 +1027,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.Message = "[0000-1-005]鍗曟嵁鏈壘鍒�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -988,7 +1049,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳祦杞崱鏁版嵁!";
+ objJsonResult.Message = "[0000-1-005]鏃犳祦杞崱鏁版嵁!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1003,7 +1064,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.Message = "[0000-1-006]鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
objJsonResult.data = null;
oCN.RollBack();
return objJsonResult;
@@ -1013,7 +1074,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.Message = "[3772-1-007]鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
objJsonResult.data = null;
oCN.RollBack();
return objJsonResult;
@@ -1027,7 +1088,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[3772-1-007]" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1048,7 +1109,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-008]" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1079,7 +1140,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.list = columnNameList;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-037]鑾峰彇淇℃伅鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -1087,7 +1148,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1139,14 +1200,14 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-037]鑾峰彇淇℃伅鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
}
catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-045]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
}
return objJsonResult;
@@ -1376,7 +1437,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎸囧紩鍗℃棤鏉冮檺瀹℃牳!";
+ objJsonResult.Message = "[3772-1-022]鎸囧紩鍗℃棤鏉冮檺瀹℃牳!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1387,7 +1448,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娴佽浆鍗℃棤鏉冮檺瀹℃牳!";
+ objJsonResult.Message = "[3772-1-022]娴佽浆鍗℃棤鏉冮檺瀹℃牳!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1398,7 +1459,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.Message = "[0000-1-009]HInterID涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1420,7 +1481,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶉渶瑕佸啀瀹℃牳!";
+ objJsonResult.Message = "[0000-1-023]鍗曟嵁宸插鏍�!涓嶉渶瑕佸啀瀹℃牳!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1434,7 +1495,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.Message = "[0000-1-024]瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
objJsonResult.data = null;
return objJsonResult;
@@ -1443,7 +1504,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.Message = "[0000-1-025]瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1454,7 +1515,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-025]瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1471,7 +1532,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸插弽瀹℃牳!涓嶉渶瑕佸啀鍙嶅鏍�!";
+ objJsonResult.Message = "[0000-1-026]鍗曟嵁宸插弽瀹℃牳!涓嶉渶瑕佸啀鍙嶅鏍�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1485,7 +1546,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.Message = "[0000-1-027]鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
objJsonResult.data = null;
return objJsonResult;
@@ -1494,7 +1555,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.Message = "[0000-1-028]鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1517,7 +1578,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-028]瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1527,7 +1588,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-029]鎵ц鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
@@ -1536,7 +1597,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-025]鎵ц澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1557,7 +1618,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎸囧紩鍗℃棤鏉冮檺鍏抽棴!";
+ objJsonResult.Message = "[3772-1-032]鎸囧紩鍗℃棤鏉冮檺鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1569,7 +1630,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娴佽浆鍗℃棤鏉冮檺鍏抽棴!";
+ objJsonResult.Message = "[3772-1-032]娴佽浆鍗℃棤鏉冮檺鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1580,7 +1641,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.Message = "[0000-1-009]HInterID涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1602,7 +1663,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶉渶瑕佸啀鍏抽棴!";
+ objJsonResult.Message = "[0000-1-033]鍗曟嵁宸插叧闂�!涓嶉渶瑕佸啀鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1612,7 +1673,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-034]鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1629,7 +1690,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸插弽鍏抽棴!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+ objJsonResult.Message = "[0000-1-035]鍗曟嵁宸插弽鍏抽棴!涓嶉渶瑕佸啀鍙嶅叧闂�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1639,7 +1700,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-036]鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1649,7 +1710,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-037]鎵ц鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
@@ -1658,7 +1719,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]鎵ц澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1685,7 +1746,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "浣滃簾澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.Message = "[0000-1-039]浣滃簾澶辫触锛佹棤鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1694,7 +1755,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.Message = "[0000-1-009]HInterID灏忎簬0锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1756,7 +1817,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "浣滃簾鎴愬姛";
+ objJsonResult.Message = "[0000-1-040]浣滃簾鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1764,7 +1825,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-041]浣滃簾澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1782,7 +1843,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
+ objJsonResult.Message = "[0000-1-042]鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
objJsonResult.data = null;
oBill.oCn.RollBack();
@@ -1792,7 +1853,7 @@
oBill.oCn.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶄綔搴熸垚鍔�";
+ objJsonResult.Message = "[0000-1-043]鍙嶄綔搴熸垚鍔�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1800,7 +1861,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-042]鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1811,7 +1872,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "浣滃簾澶辫触鎴栬�呭弽浣滃簾澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-044]浣滃簾澶辫触鎴栬�呭弽浣滃簾澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1960,7 +2021,7 @@
res.count = CountConstant.FAIL;
res.Message = "Exception锛�" + e.ToString();
res.data = null;
- return objJsonResult;
+ return res;
}
}
#endregion
@@ -2157,7 +2218,7 @@
HProQty = oItemSub.HProQty;
sql = "select * from h_v_Sc_ProcessExchangeBill_BatchSplit where hmainid = " + oItemSub.HICMOInterID + " and hentryid = "
- + oItemSub.HICMOEntryID;
+ + oItemSub.HICMOEntryID + " and HRoutingID = " + oItemSub.HRoutingInterID.ToString();
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBill_BatchSplit");
//涓昏〃璧嬪��
if (ds.Tables[0].Rows.Count > 0 && ds != null)
@@ -2296,7 +2357,7 @@
oItemSubs.HDeptID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HDeptID"]);
oItemSubs.HDeptNumber = ds.Tables[0].Rows[i]["HDeptNumber"].ToString();
oItemSubs.HGroupID = 0;
- oItemSubs.HGroupNumber = "";
+ oItemSubs.HGroupNumber = oItemSub.HGroupNumber;
oItemSubs.HWorkerID = 0;
oItemSubs.HWorkerNumber = "";
oItemSubs.HSourceID = 0;
@@ -2341,6 +2402,8 @@
oItemSubs.HSeOrderInterID = 0;
oItemSubs.HSeOrderEntryID = 0;
oItemSubs.HSNCtrl = false;
+ oItemSubs.HRoutingBillMainID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HRoutingID"]);
+ oItemSubs.HRoutingBillEntryID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HRoutingEntryID"]);
oBill.DetailColl.Add(oItemSubs);//娣诲姞鏄庣粏琛屽��
}
--
Gitblit v1.9.1