From 5898d7f62ec4b29f313a018c7526ce100e9d30a6 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期三, 09 四月 2025 15:02:05 +0800 Subject: [PATCH] 加日志 --- WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 332 +++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 222 insertions(+), 110 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs index faf4efb..f92698d 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; } @@ -183,14 +184,31 @@ if (ds.Tables[0].Rows.Count == 0)//鏂板 { - //涓昏〃 - oCN.RunProc(@"Insert Into Sc_QualityReportBillMain -(HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate -,HYear,HPeriod,HRemark,HMaker,HMakeDate -,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo) + if (HResult== "寰憰鍝�") + { + //涓昏〃 + oCN.RunProc(@"Insert Into Sc_QualityReportBillMain + (HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate + ,HYear,HPeriod,HRemark,HMaker,HMakeDate + ,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo) + values('3717','3717-1',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'" + + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" + + ",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') "); + //閲嶆柊缁橦Result璧嬪�� + HResult = ""; + } + else + { + //涓昏〃 + oCN.RunProc(@"Insert Into Sc_QualityReportBillMain + (HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate + ,HYear,HPeriod,HRemark,HMaker,HMakeDate + ,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo) values('3717','3717',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'" + - "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" + - ",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') "); + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" + + ",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') "); + } + } @@ -280,18 +298,33 @@ (HInterID,HENTRYID,HBillNo_bak,HEmpID,HBarCode,HBadReasonID,HAddr,HMaker,HMakeDate ,HMaterID,HUnitID,HRemark,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HReportType ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney -,HQty,HResult,HProcExchInterID,HProcExchEntryID,HProcExchBillNo) +,HQty,HResult,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HProcID) values({HInterID},1,'{oSub.HBillNo_bak}',{oSub.HEmpID},'{oSub.HBarCode}',{oSub.HBadReasonID},'','{oSub.HMaker}','{oSub.HMakeDate}' ,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HICMOInterID},{oSub.HICMOEntryID},'{oSub.HICMOBillNo}',{oSub.HReportType} ,0,0,'','',0,0 -,0,'{HResult}',{oSub.HProcExchInterID},{oSub.HProcExchEntryID},'{oSub.HProcExchBillNo}')"); +,1,'{HResult}',{oSub.HProcExchInterID},{oSub.HProcExchEntryID},'{oSub.HProcExchBillNo}',{oSub.HProcID})"); //淇敼鏉$爜琛ㄧ殑鐘舵�� oCN.RunProc("update Gy_BarCodeBill set HStatus='"+ HResult + "' where HBarCode='"+ oSub.HBarCode + "'"); + LogService.Write("绫诲瀷:" + oSub.HBadTypeID + ",鍒跺崟浜�:" + oSub.HMaker + ",鍒跺崟鏃ユ湡:" + oSub.HMakeDate); //淇敼鍑虹珯鍗曠殑 涓嶈壇 鎶ュ簾鏁伴噺 - 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 == "鎶ュ簾") { @@ -318,13 +351,38 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } - + string HProcID = "0"; ds = oCN.RunProcReturn("select * from gy_czygl WITH(NOLOCK) where czymc='" + user + "'", "gy_czygl"); - string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString(); + if (ds.Tables[0].Rows.Count > 0) + { + HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString(); + } + + + + //瀹㈡埛鍒跺畾 + string sErr = ""; + if (oSystemParameter.ShowBill(ref sErr)) + { + 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) @@ -335,7 +393,7 @@ { objJsonResult.code = "2"; objJsonResult.count = 2; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = dataSet.Tables[0]; return objJsonResult; } @@ -343,7 +401,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "閰嶄欢娓呭崟鏌ユ棤鏁版嵁锛�,鍙兘鏄綋鍓嶇敤鎴峰伐搴忎笉姝g‘鎴栬�呮祦杞崱杈撳叆閿欒!"; + objJsonResult.Message = "[3791-2-019]閰嶄欢娓呭崟鏌ユ棤鏁版嵁锛�,鍙兘鏄綋鍓嶇敤鎴峰伐搴忎笉姝g‘鎴栬�呮祦杞崱杈撳叆閿欒!"; objJsonResult.data = null; return objJsonResult; } @@ -352,7 +410,7 @@ { objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds.Tables[0]; } @@ -363,7 +421,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -392,7 +450,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犱繚瀛樻潈闄�!"; + objJsonResult.Message = "[0000-2-038]鏃犱繚瀛樻潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -405,7 +463,7 @@ if (tempList.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犻厤浠舵暟鎹�!"; + objJsonResult.Message = "[3791-2-026]鏃犻厤浠舵暟鎹�!"; objJsonResult.data = null; return objJsonResult; } @@ -436,7 +494,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "淇濆瓨鎴愬姛!"; + objJsonResult.Message = "[0000-1-050]淇濆瓨鎴愬姛!"; objJsonResult.data = null; return objJsonResult; @@ -446,7 +504,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; } @@ -472,7 +530,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犱繚瀛樻潈闄�!"; + objJsonResult.Message = "[0000-2-038]鏃犱繚瀛樻潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -492,7 +550,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏌ユ棤鏁版嵁!"; + objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!"; objJsonResult.data = null; return objJsonResult; } @@ -500,7 +558,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; } @@ -512,7 +570,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; } @@ -531,7 +589,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; } @@ -571,7 +629,7 @@ sMainStr = "[" + sMainStr + "]"; List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(sMainStr); - ds = oCN.RunProcReturn("select HCenterID from Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + list[0].HProcExchInterID + " and HEntryID=" + list[0].HProcExchEntryID, "Sc_ProcessExchangeBillSub"); + ds = oCN.RunProcReturn("select HCenterID from Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + list[0].HProcExchInterID + " and HEntryID=" + list[0].HProcExchEntryID, "Sc_ProcessExchangeBillSub"); if (ds.Tables[0].Rows.Count > 0) { list[0].HCenterID = long.Parse(ds.Tables[0].Rows[0]["HCenterID"].ToString()); @@ -645,7 +703,13 @@ double HmaterOutqty = 0;//鐧藉澂鍙戝竷 double HProcPriceRate = 0;//宸ヤ环绯绘暟 int HTemporaryAreaID = 0;//鏆傛斁鍖� + int HShiftsID = 0; + DataSet set = oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + HDeptID + "," + HCenterID, "h_p_Gy_GetWorkShiftInfo"); + if (set.Tables[0].Rows.Count > 0) + { + HShiftsID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString()); + } ds = oCN.RunProcReturn("select * from Sc_StationOutBillMain a WITH(NOLOCK) left join Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID where a.HInterID=" + HInterID + " and HBillNo='" + HBillNo + "' and CONVERT(varchar(10),HDate,20) ='" + DateTime.Now.ToString("yyyy-MM-dd") + "' ", "Sc_StationOutBillMain"); if (ds.Tables[0].Rows.Count == 0) @@ -662,9 +726,9 @@ ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" + ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" + ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" + - ",HmaterOutqty,HProcPriceRate,HTemporaryAreaID" + + ",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HShiftsID" + ") " + - " values('" + BillType + "','"+ HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" + + " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" + "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL + "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID + @@ -672,7 +736,7 @@ "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" + "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) + "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID + - "," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + ") "); + "," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + "," + HShiftsID + ") "); } @@ -698,7 +762,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!"; + objJsonResult.Message = "[3791-2-028]鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!"; objJsonResult.data = null; return objJsonResult; } @@ -707,7 +771,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "淇濆瓨鎴愬姛!"; + objJsonResult.Message = "[0000-1-050]淇濆瓨鎴愬姛!"; objJsonResult.data = null; return objJsonResult; @@ -717,7 +781,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; } @@ -732,6 +796,23 @@ try { ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "h_v_Gy_BarCodeBill"); + + //鍒ゆ柇鏉$爜鏄惁瀛樺湪鏉$爜妗f + if (ds.Tables[0].Rows.Count > 0) + { + string HSourceBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString(); + DataSet dataTable = oCN.RunProcReturn(@"select * from Sc_ProcessExchangeBillMain where HBillNo='" + HSourceBillNo + "'", "Sc_ProcessExchangeBillMain"); + //鍒ゆ柇鏉$爜鐨勬簮鍗� 娴佽浆鍗℃槸鍚﹁鍒犻櫎 + if (dataTable.Tables[0].Rows.Count == 0) + { + //濡傛灉婧愬崟宸茬粡鍒犻櫎 鍒欐潯鐮佷篃鍒犻櫎閲嶆柊鐢熸垚 + oCN.RunProc("delete from Gy_BarCodeBill where HBarCode='" + HBarCode + "'"); + + //閲嶆柊鏌ヨ鏉$爜妗f 杩涘叆鏂板鏂规硶 + ds = oCN.RunProcReturn(@"select * from Gy_BarCodeBill where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill"); + } + } + if (ds.Tables[0].Rows.Count == 0) { //鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿 @@ -757,7 +838,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.Message = "[3791-2-016]鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; objJsonResult.data = null; return objJsonResult; } @@ -789,7 +870,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.Message = "[3791-2-016]鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; objJsonResult.data = null; return objJsonResult; } @@ -804,7 +885,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜鏍煎紡涓嶆纭�!"; + objJsonResult.Message = "[0000-2-036]鏉$爜鏍煎紡涓嶆纭�!"; objJsonResult.data = null; return objJsonResult; } @@ -833,7 +914,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.Message = "[3791-2-016]鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; objJsonResult.data = null; return objJsonResult; } @@ -853,7 +934,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.Message = "[3791-2-016]鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; objJsonResult.data = null; return objJsonResult; } @@ -863,7 +944,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; } @@ -871,7 +952,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -880,7 +961,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -903,7 +984,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉$爜锛�"; + objJsonResult.Message = "[0000-2-019]鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉$爜锛�"; return objJsonResult; } @@ -974,7 +1055,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = null; return objJsonResult; } @@ -983,7 +1064,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; } @@ -993,7 +1074,7 @@ #region 宸ュ簭鍗曞搧杩囩珯 閰嶄欢鐮佹煡璇� [Route("Cj_SingleStation/HBardCodeAccessoryList")] [HttpGet] - public object HBardCodeAccessoryList(string HBarCode, string user) + public object HBardCodeAccessoryList(string HBarCode, string HProcExchBillNo, string user,string HBillType) { try { @@ -1002,7 +1083,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1012,7 +1093,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "SN鐮佹煡鏃犳暟鎹紒"; + objJsonResult.Message = "[3791-2-023]SN鐮佹煡鏃犳暟鎹紒"; objJsonResult.data = null; return objJsonResult; } @@ -1021,14 +1102,33 @@ { 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; + } + + DataSet dataSet = oCN.RunProcReturn(@"exec h_p_CJ_SNBarCodeBillMouldBathSelect '" + HBarCode + "','" + HProcExchBillNo + "','"+ HBillType + "'", "h_p_CJ_SNBarCodeBillMouldBathSelect"); + + if (dataSet.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "[3791-2-024]閰嶄欢鏉$爜鍒ゆ柇澶辫触锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBack"]) == "2") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + 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; } @@ -1037,7 +1137,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1056,7 +1156,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1070,7 +1170,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜鏌ユ棤鏁版嵁锛�"; + objJsonResult.Message = "[0000-1-045]鏉$爜鏌ユ棤鏁版嵁锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1086,7 +1186,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "褰撳墠鏉$爜涓庡綋鍓嶅伐搴忎笉鍖归厤!"; + objJsonResult.Message = "[3791-2-017]褰撳墠鏉$爜涓庡綋鍓嶅伐搴忎笉鍖归厤!"; objJsonResult.data = null; return objJsonResult; } @@ -1094,14 +1194,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; } @@ -1110,7 +1210,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 +1229,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1138,7 +1238,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds; return objJsonResult; } @@ -1147,7 +1247,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1166,7 +1266,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1175,7 +1275,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -1184,7 +1284,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1203,7 +1303,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!"; + objJsonResult.Message = "[0000-1-058]鏃犲垹闄ゆ潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1214,7 +1314,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(); @@ -1247,7 +1347,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1256,7 +1356,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; } @@ -1275,7 +1375,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!"; + objJsonResult.Message = "[0000-1-058]鏃犲垹闄ゆ潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1288,7 +1388,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏌ユ棤鏁版嵁锛�"; + objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁锛�"; objJsonResult.data = null; } @@ -1317,7 +1417,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1326,7 +1426,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; } @@ -1345,7 +1445,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1359,7 +1459,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜鏌ユ棤鏁版嵁锛�"; + objJsonResult.Message = "[0000-2-020]鏉$爜鏌ユ棤鏁版嵁锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1376,7 +1476,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "褰撳墠鏉$爜涓庡綋鍓嶅伐搴忎笉鍖归厤!"; + objJsonResult.Message = "[3791-2-017]褰撳墠鏉$爜涓庡綋鍓嶅伐搴忎笉鍖归厤!"; objJsonResult.data = null; return objJsonResult; } @@ -1385,7 +1485,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; } @@ -1393,7 +1493,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = ""; + objJsonResult.Message = "[0000-1-037]"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -1402,7 +1502,7 @@ objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1469,7 +1569,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1489,7 +1589,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; @@ -1498,7 +1598,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; } @@ -1525,7 +1625,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犱繚瀛樻潈闄�!"; + objJsonResult.Message = "[0000-2-038]鏃犱繚瀛樻潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1601,15 +1701,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; } @@ -1619,7 +1731,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "淇濆瓨澶辫触,鏃犵粨鏋滐紒"; + objJsonResult.Message = "[0000-1-051]淇濆瓨澶辫触,鏃犵粨鏋滐紒"; objJsonResult.data = null; return objJsonResult; } @@ -1629,7 +1741,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-050]Sucess锛�"; objJsonResult.data = null; return objJsonResult; } @@ -1638,7 +1750,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; } @@ -1657,7 +1769,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!"; + objJsonResult.Message = "[0000-1-058]鏃犲垹闄ゆ潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1667,7 +1779,7 @@ if (ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏌ユ棤鏁版嵁锛�"; + objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁锛�"; objJsonResult.data = null; } @@ -1706,7 +1818,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; } @@ -1778,7 +1890,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; } @@ -1788,7 +1900,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; + objJsonResult.Message = "[0000-1-037]Sucess锛�"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } @@ -1796,7 +1908,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; } @@ -1866,7 +1978,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; @@ -1876,7 +1988,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; } @@ -1906,7 +2018,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; @@ -1916,7 +2028,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; } @@ -1946,7 +2058,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; @@ -1956,7 +2068,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; } @@ -1986,7 +2098,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; @@ -1995,7 +2107,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; } @@ -2025,7 +2137,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; @@ -2035,7 +2147,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; } @@ -2065,7 +2177,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; @@ -2075,7 +2187,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; } @@ -2105,7 +2217,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; @@ -2115,7 +2227,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