From 53cd6a6c6233731cd28309dfbbb68e30fd0bdb0d Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期二, 08 四月 2025 13:00:50 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 246 ++++++++++++++++++++++++++++-------------------- 1 files changed, 142 insertions(+), 104 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs index c1d5dbb..d744e43 100644 --- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs +++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs @@ -15,6 +15,7 @@ { private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); DataSet ds; #region 宸ュ簭鍗曞搧涓嶈壇閲囬泦 鐢ㄦ埛鏌ヨ鍏宠仈瀛楁 @@ -29,7 +30,7 @@ { objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-038]Sucess锛�"; objJsonResult.data = new DataTable(); return objJsonResult; } @@ -38,7 +39,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -46,7 +47,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; } @@ -307,8 +308,22 @@ oCN.RunProc("update Gy_BarCodeBill set HStatus='"+ HResult + "' where HBarCode='"+ oSub.HBarCode + "'"); //淇敼鍑虹珯鍗曠殑 涓嶈壇 鎶ュ簾鏁伴噺 - if (HResult == "涓嶈壇") { - oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid); + if (HResult == "涓嶈壇") + { + LogService.Write("绫诲瀷:" + oSub.HBadTypeID); + //宸ュ簾 + if (oSub.HBadTypeID == 3) + { + oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Work+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid); + }//鏂欏簾 + else if (oSub.HBadTypeID == 4) + { + oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Mater+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid); + }//杩斿伐 + else if (oSub.HBadTypeID == 6) + { + oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HBackWorkQty+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid); + } } else if (HResult == "鎶ュ簾") { @@ -335,7 +350,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -346,16 +361,27 @@ HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString(); } - //鍒ゆ柇褰撳墠娴佽浆鍗℃槸鍚︽槸寮�宸� - ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp"); - if (ds.Tables[0].Rows.Count == 0) + + + //瀹㈡埛鍒跺畾 + string sErr = ""; + if (oSystemParameter.ShowBill(ref sErr)) { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鍗″彿:" + HBarCode + ",娴佽浆鍗℃湭寮�宸�!"; - objJsonResult.data = null; - return objJsonResult; + if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�") + { + //鍒ゆ柇褰撳墠娴佽浆鍗℃槸鍚︽槸寮�宸� + ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp"); + if (ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "[3791-2-018]鍗″彿:" + HBarCode + ",娴佽浆鍗℃湭寮�宸�!"; + objJsonResult.data = null; + return objJsonResult; + } + } } + ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBillBomList '" + HBarCode + "'," + HProcID, "h_p_Gy_BarCodeBillBomList"); if (ds.Tables[0].Rows.Count == 0) @@ -366,7 +392,7 @@ { objJsonResult.code = "2"; objJsonResult.count = 2; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = dataSet.Tables[0]; return objJsonResult; } @@ -374,7 +400,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "閰嶄欢娓呭崟鏌ユ棤鏁版嵁锛�,鍙兘鏄綋鍓嶇敤鎴峰伐搴忎笉姝g‘鎴栬�呮祦杞崱杈撳叆閿欒!"; + objJsonResult.Message = "[3791-2-019]閰嶄欢娓呭崟鏌ユ棤鏁版嵁锛�,鍙兘鏄綋鍓嶇敤鎴峰伐搴忎笉姝g‘鎴栬�呮祦杞崱杈撳叆閿欒!"; objJsonResult.data = null; return objJsonResult; } @@ -383,7 +409,7 @@ { objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds.Tables[0]; } @@ -394,7 +420,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -423,7 +449,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犱繚瀛樻潈闄�!"; + objJsonResult.Message = "[0000-2-038]鏃犱繚瀛樻潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -436,7 +462,7 @@ if (tempList.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犻厤浠舵暟鎹�!"; + objJsonResult.Message = "[3791-2-026]鏃犻厤浠舵暟鎹�!"; objJsonResult.data = null; return objJsonResult; } @@ -467,7 +493,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "淇濆瓨鎴愬姛!"; + objJsonResult.Message = "[0000-1-050]淇濆瓨鎴愬姛!"; objJsonResult.data = null; return objJsonResult; @@ -477,7 +503,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-051]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -503,7 +529,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犱繚瀛樻潈闄�!"; + objJsonResult.Message = "[0000-2-038]鏃犱繚瀛樻潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -523,7 +549,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏌ユ棤鏁版嵁!"; + objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!"; objJsonResult.data = null; return objJsonResult; } @@ -531,7 +557,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�"; + objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�"; objJsonResult.data = null; return objJsonResult; } @@ -543,7 +569,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜:" + omodel.HBarCode_P + ",宸插瓨鍦�!"; + objJsonResult.Message = "[0000-2-039]鏉$爜:" + omodel.HBarCode_P + ",宸插瓨鍦�!"; objJsonResult.data = null; return objJsonResult; } @@ -562,7 +588,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "閰嶄欢浠g爜:" + HMaterNamePJ + ",鏁伴噺涓�0!"; + objJsonResult.Message = "[3791-2-020]閰嶄欢浠g爜:" + HMaterNamePJ + ",鏁伴噺涓�0!"; objJsonResult.data = null; return objJsonResult; } @@ -735,7 +761,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!"; + objJsonResult.Message = "[3791-2-028]鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!"; objJsonResult.data = null; return objJsonResult; } @@ -744,7 +770,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "淇濆瓨鎴愬姛!"; + objJsonResult.Message = "[0000-1-050]淇濆瓨鎴愬姛!"; objJsonResult.data = null; return objJsonResult; @@ -754,7 +780,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-051]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -811,7 +837,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.Message = "[3791-2-016]鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; objJsonResult.data = null; return objJsonResult; } @@ -843,7 +869,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.Message = "[3791-2-016]鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; objJsonResult.data = null; return objJsonResult; } @@ -858,7 +884,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜鏍煎紡涓嶆纭�!"; + objJsonResult.Message = "[0000-2-036]鏉$爜鏍煎紡涓嶆纭�!"; objJsonResult.data = null; return objJsonResult; } @@ -887,7 +913,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.Message = "[3791-2-016]鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; objJsonResult.data = null; return objJsonResult; } @@ -907,7 +933,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.Message = "[3791-2-016]鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; objJsonResult.data = null; return objJsonResult; } @@ -917,7 +943,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "褰撳墠鏉$爜鐨勭姸鎬佷负:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "锛�"; + objJsonResult.Message = "[0000-2-037]褰撳墠鏉$爜鐨勭姸鎬佷负:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "锛�"; objJsonResult.data = null; return objJsonResult; } @@ -925,7 +951,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -934,7 +960,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -957,7 +983,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉$爜锛�"; + objJsonResult.Message = "[0000-2-019]鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉$爜锛�"; return objJsonResult; } @@ -1028,7 +1054,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = null; return objJsonResult; } @@ -1037,7 +1063,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1056,7 +1082,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1066,7 +1092,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "SN鐮佹煡鏃犳暟鎹紒"; + objJsonResult.Message = "[3791-2-023]SN鐮佹煡鏃犳暟鎹紒"; objJsonResult.data = null; return objJsonResult; } @@ -1075,7 +1101,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "褰撳墠鏉$爜鐨勭姸鎬佷负:"+ ds.Tables[0].Rows[0]["HStatus"].ToString() + "锛�"; + objJsonResult.Message = "[0000-2-037]褰撳墠鏉$爜鐨勭姸鎬佷负:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1086,7 +1112,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "閰嶄欢鏉$爜鍒ゆ柇澶辫触锛�"; + objJsonResult.Message = "[3791-2-024]閰嶄欢鏉$爜鍒ゆ柇澶辫触锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1094,14 +1120,14 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]); + objJsonResult.Message = "[0000-1-010]" + DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]); objJsonResult.data = null; return objJsonResult; } objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -1110,7 +1136,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1129,7 +1155,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1143,7 +1169,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜鏌ユ棤鏁版嵁锛�"; + objJsonResult.Message = "[0000-1-045]鏉$爜鏌ユ棤鏁版嵁锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1159,7 +1185,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "褰撳墠鏉$爜涓庡綋鍓嶅伐搴忎笉鍖归厤!"; + objJsonResult.Message = "[3791-2-017]褰撳墠鏉$爜涓庡綋鍓嶅伐搴忎笉鍖归厤!"; objJsonResult.data = null; return objJsonResult; } @@ -1167,14 +1193,14 @@ if (ds.Tables[0].Rows[0]["HStatus"].ToString() != "姝e父") { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "褰撳墠鏉$爜鐘舵�佷负"+ ds.Tables[0].Rows[0]["HStatus"].ToString() + "!"; + objJsonResult.Message = "[0000-2-037]褰撳墠鏉$爜鐘舵�佷负" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!"; objJsonResult.data = null; return objJsonResult; } objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -1183,7 +1209,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1202,7 +1228,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1211,7 +1237,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds; return objJsonResult; } @@ -1220,7 +1246,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1239,7 +1265,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1248,7 +1274,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -1257,7 +1283,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1276,7 +1302,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!"; + objJsonResult.Message = "[0000-1-058]鏃犲垹闄ゆ潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1287,7 +1313,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏌ユ棤鏁版嵁锛�"; + objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁锛�"; objJsonResult.data = null; } string HProcExchInterID = ds.Tables[0].Rows[0]["HProcExchInterID"].ToString(); @@ -1320,7 +1346,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1329,7 +1355,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1348,7 +1374,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!"; + objJsonResult.Message = "[0000-1-058]鏃犲垹闄ゆ潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1361,7 +1387,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏌ユ棤鏁版嵁锛�"; + objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁锛�"; objJsonResult.data = null; } @@ -1390,7 +1416,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1399,7 +1425,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1418,7 +1444,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1432,7 +1458,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜鏌ユ棤鏁版嵁锛�"; + objJsonResult.Message = "[0000-2-020]鏉$爜鏌ユ棤鏁版嵁锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1449,7 +1475,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "褰撳墠鏉$爜涓庡綋鍓嶅伐搴忎笉鍖归厤!"; + objJsonResult.Message = "[3791-2-017]褰撳墠鏉$爜涓庡綋鍓嶅伐搴忎笉鍖归厤!"; objJsonResult.data = null; return objJsonResult; } @@ -1458,7 +1484,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "褰撳墠鏉$爜鐘舵�佷负" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!"; + objJsonResult.Message = "[0000-2-037]褰撳墠鏉$爜鐘舵�佷负" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!"; objJsonResult.data = null; return objJsonResult; } @@ -1466,7 +1492,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -1475,7 +1501,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1542,7 +1568,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1562,7 +1588,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; @@ -1571,7 +1597,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1598,7 +1624,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犱繚瀛樻潈闄�!"; + objJsonResult.Message = "[0000-2-038]鏃犱繚瀛樻潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1674,15 +1700,27 @@ if (dataSet.Tables[0].Rows.Count > 0) { string HOutInterID = dataSet.Tables[0].Rows[0][0].ToString(); - - oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1 where HInterID='" + HOutInterID + "'"); + //鏂帿灏旂殑鎯呭喌 鍒� 宸ュ簾鏂欏簾 杩斿伐 + //宸ュ簾 + if (subLsit[0].HBadTypeID == 3) + { + oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HWasterQty_Work-=1 where HInterID='" + HOutInterID + "'"); + }//鏂欏簾 + else if (subLsit[0].HBadTypeID == 4) + { + oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HWasterQty_Mater-=1 where HInterID='" + HOutInterID + "'"); + }//杩斿伐 + else if (subLsit[0].HBadTypeID == 6) + { + oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HBackWorkQty-=1 where HInterID='" + HOutInterID + "'"); + } } else { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "淇濆瓨澶辫触,褰撳墠娴佽浆鍗″綋鍓嶅伐搴忕殑鍑虹珯鍗曟病鏈変笉鑹暟閲�!"; + objJsonResult.Message = "[3748-2-005]淇濆瓨澶辫触,褰撳墠娴佽浆鍗″綋鍓嶅伐搴忕殑鍑虹珯鍗曟病鏈変笉鑹暟閲�!"; objJsonResult.data = null; return objJsonResult; } @@ -1692,7 +1730,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "淇濆瓨澶辫触,鏃犵粨鏋滐紒"; + objJsonResult.Message = "[0000-1-051]淇濆瓨澶辫触,鏃犵粨鏋滐紒"; objJsonResult.data = null; return objJsonResult; } @@ -1702,7 +1740,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-050]Sucess锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1711,7 +1749,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-051]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1730,7 +1768,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!"; + objJsonResult.Message = "[0000-1-058]鏃犲垹闄ゆ潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1740,7 +1778,7 @@ if (ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏌ユ棤鏁版嵁锛�"; + objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁锛�"; objJsonResult.data = null; } @@ -1779,7 +1817,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1851,7 +1889,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1861,7 +1899,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -1869,7 +1907,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; } @@ -1939,7 +1977,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; @@ -1949,7 +1987,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1979,7 +2017,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; @@ -1989,7 +2027,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -2019,7 +2057,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; @@ -2029,7 +2067,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -2059,7 +2097,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; @@ -2068,7 +2106,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; } @@ -2098,7 +2136,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; @@ -2108,7 +2146,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -2138,7 +2176,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; @@ -2148,7 +2186,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -2178,7 +2216,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; @@ -2188,7 +2226,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } -- Gitblit v1.9.1