From 48654bac6d758d6426a0e659a7d7bd08634acfc8 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期四, 12 六月 2025 17:15:49 +0800 Subject: [PATCH] 修复细节错误,优化报错信息 --- api/DebugController.cs | 161 +++-------------------------------------------------- 1 files changed, 10 insertions(+), 151 deletions(-) diff --git a/api/DebugController.cs b/api/DebugController.cs index d377395..b723b09 100644 --- a/api/DebugController.cs +++ b/api/DebugController.cs @@ -166,64 +166,6 @@ //typeof(TN_Container_Item), }; - //var areaNameList = new List<string>(); - //foreach (var area in Settings.Areas) { - // areaNameList.AddRange(area.Codes); - //} - - //var locationList = new List<TN_Location>(); - //foreach (var area in areaNameList) { - // int i = 0; - // int j = 0; - // int k = 0; - - // if (area == "KXHJQ" || area == "MTHJQ" || area == "MXHJQ") { - // for (i = 1; i <= 4; i++) { - // for (j = 1; j <= 5; j++) { - // for (k = 1; k <= 3; k++) { - // locationList.Add(new TN_Location() { - // N_ROW = i, - // N_COL = j, - // N_LAYER = k, - // S_AREA_CODE = area, - // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}" + - // $"-{k.ToString().PadLeft(2, '0')}" - // }); - // } - // } - // } - // continue; - // } - - // if (area == "BZQ") { - // for (i = 1; i <= 2; i++) { - // for (j = 1; j <= 2; j++) { - // locationList.Add(new TN_Location() { - // N_ROW = i, - // N_COL = j, - // S_AREA_CODE = area, - // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}" - // }); - // } - // } - // continue; - // } - - // i = 1; - // for (j = 1; j <= 5; j++) { - // locationList.Add(new TN_Location() { - // N_ROW = i, - // N_COL = j, - // S_AREA_CODE = area, - // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}" - // }); - // } - - - //} - - - //using (var tran = db.Ado.UseTran()) { // //db.CodeFirst.InitTables(entityTypes); // if (db.Insertable<TN_Location>(locationList).ExecuteCommand() <= 0) { @@ -245,89 +187,6 @@ } /// <summary> - /// DEBUG锛氭彃鍏ヨ揣浣嶃�瀹瑰櫒銆佽揣鍝佷俊鎭�- /// </summary> - /// <returns></returns> - [HttpPost] - [Route("InsertLocCntrCg")] - public string InsertLocCntrCg(LocCntrCg locCntrCg) { - var db = new SqlHelper<object>().GetInstance(); - - try { - - using (var tran = db.UseTran()) { - LogHelper.Info("LogCntrCg锛� + JsonConvert.SerializeObject(locCntrCg)); - if (string.IsNullOrEmpty(locCntrCg.LocCode)) return ""; - - var loc = db.Queryable<TN_Location>().First(a => a.S_CODE == locCntrCg.LocCode); - if (loc == null) { - var newLoc = new TN_Location { - S_CODE = locCntrCg.LocCode, - S_AREA_CODE = locCntrCg.LocArea ?? "" - }; - - if (db.Insertable<TN_Location>(newLoc).ExecuteCommand() <= 0) { - tran.RollbackTran(); - LogHelper.Info($"鎻掑叆浣嶇疆{locCntrCg.LocCode}澶辫触"); - return "鎻掑叆澶辫触"; - } - - loc = newLoc; - } - - if (string.IsNullOrEmpty(locCntrCg.CntrCode)) { - LogHelper.Info("瀹瑰櫒鍙蜂负绌猴紝涓嶅啀璇诲彇鍚庨潰鐨勬暟鎹�); - return ""; - } - - var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == locCntrCg.LocCode - && a.S_CNTR_CODE == locCntrCg.CntrCode); - - if (locCntrRel == null) { - var newLocCntrRel = new TN_Loc_Container { - S_LOC_CODE = locCntrCg.LocCode, - S_CNTR_CODE = locCntrCg.CntrCode, - S_CNTR_TYPE = locCntrCg.CntrType ?? "" - }; - - loc.N_CURRENT_NUM = 1; - - if (db.Insertable<TN_Loc_Container>(newLocCntrRel).ExecuteCommand() <= 0 - && db.Updateable<TN_Location>(loc).UpdateColumns(c => c.N_CURRENT_NUM).ExecuteCommand() <= 0) { - tran.RollbackTran(); - LogHelper.Info($"鎻掑叆浣嶇疆鎵樼洏鍏崇郴{locCntrCg.LocCode}-{locCntrCg.CntrCode}澶辫触"); - return "鎻掑叆澶辫触"; - } - } - - if (string.IsNullOrEmpty(locCntrCg.ItemCode)) { - LogHelper.Info("鐗╂枡鍙蜂负绌猴紝涓嶅啀璇诲彇鍚庨潰鐨勬暟鎹�); - return ""; - } - - var cgDetail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCntrCg.CntrCode - && a.S_ITEM_CODE == locCntrCg.ItemCode); - if (cgDetail == null) { - var locList = new List<TN_CG_Detail>(); - locList.Add(new TN_CG_Detail { S_CNTR_CODE = locCntrCg.CntrCode, S_ITEM_CODE = locCntrCg.ItemCode, S_BATCH_NO = locCntrCg.BatchNo ?? "" }); - if (db.Insertable<TN_CG_Detail>(locList).ExecuteCommand() <= 0) { - tran.RollbackTran(); - LogHelper.Info($"鎻掑叆鎵樼洏鐗╂枡鍏崇郴{locCntrCg.CntrCode}-{locCntrCg}澶辫触"); - return "鎻掑叆澶辫触"; - } - } - tran.CommitTran(); - } - - return "鎻掑叆鏁版嵁鎴愬姛"; - - } - catch (Exception ex) { - return $"Error reading CSV file: {ex.Message}"; - } - } - - /// <summary> /// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋� /// </summary> /// <param name="model"></param> @@ -338,11 +197,11 @@ var db = new SqlHelper<object>().GetInstance(); var info = ""; - var taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱; - var startAreaName = AreaName.B鍖呰鍖� + const string taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱; + const string startAreaName = AreaName.B鍖呰鍖� + const string endAreaName = AreaName.M婊℃墭璐ф灦鍖� try { - var itemCode = model.ItemCode; var batchNo = model.BatchNo; var cntrCode = model.CntrCode; @@ -384,14 +243,14 @@ } var startLoc = db.Queryable<TN_Location>() - .Where(l => l.S_CODE == startLocCode) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿 - .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣 - .Where(l => l.N_CURRENT_NUM == 0) - .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰 + .Where(l => l.S_CODE == startLocCode) + .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) + .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") + .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓� .First(); if (startLoc == null) { - info = $"璧风偣浣嶇疆 '{startLocCode}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�; + info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{startLocCode}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0"; LogHelper.Info(info); return info; } @@ -404,14 +263,14 @@ }; var endLoc = db.Queryable<TN_Location>() - .Where(a => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(a.S_AREA_CODE)) + .Where(a => Settings.AreaMap[endAreaName].Contains(a.S_AREA_CODE)) .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣 .Where(a => a.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅 .OrderBy(l => l.N_LAYER) .First(); if (endLoc == null) { - info = "绌烘墭鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�; + info = $"鍦ㄧ粓鐐硅揣鍖�{endAreaName}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0"; LogHelper.Info(info); return info; } -- Gitblit v1.9.1