From 332b3bd991a4c973e23793f473b9617f008def04 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 13 十月 2024 08:56:35 +0800
Subject: [PATCH] Revert "修改问题"
---
HTML/views/ASNSetting/RequestLocation.html | 8 --
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 67 +++++++++++-----------
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 69 +++++++++++-----------
3 files changed, 67 insertions(+), 77 deletions(-)
diff --git a/HTML/views/ASNSetting/RequestLocation.html b/HTML/views/ASNSetting/RequestLocation.html
index 4400a37..5533e0a 100644
--- a/HTML/views/ASNSetting/RequestLocation.html
+++ b/HTML/views/ASNSetting/RequestLocation.html
@@ -33,14 +33,6 @@
<option value=""></option>
<option value="R01">1宸烽亾</option>
<option value="R02">2宸烽亾</option>
- <option value="R03">3宸烽亾</option>
- <option value="R04">4宸烽亾</option>
- <option value="R05">5宸烽亾</option>
- <option value="R06">6宸烽亾</option>
- <option value="R07">7宸烽亾</option>
- <option value="R08">8宸烽亾</option>
- <option value="R09">9宸烽亾</option>
- <option value="R10">10宸烽亾</option>
</select>
</div>
</div>
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index c09515a..34dfe6f 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -373,49 +373,48 @@
rowDetailCount = Db.Ado.ExecuteCommand(sqlDetailStr);
}
Db.Ado.CommitTran();
- //if (rowCount > 0 && rowDetailCount > 0) 鍒ゆ柇闇�瑕佹坊鍔犱笂鍗曟嵁绫诲瀷
- //{
- // new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", model.ASNNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕model.ASNNo}鐨勫崟鎹俊鎭�", Convert.ToInt32(model.CreateUser));
+ if (rowCount > 0 && rowDetailCount > 0)
+ {
+ new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", model.ASNNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕model.ASNNo}鐨勫崟鎹俊鎭�", Convert.ToInt32(model.CreateUser));
- // if (addOder.Count > 0)
- // {
- // // 姝ｅ紡杩愯绋嬪簭鏀惧紑
- // var jsonData = JsonConvert.SerializeObject(addOder);
- // string response = "";
+ if (addOder.Count > 0)
+ {
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ var jsonData = JsonConvert.SerializeObject(addOder);
+ string response = "";
- // try
- // {
- // var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- // //缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭�
- // response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+ try
+ {
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ //缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭�
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
- // //////瑙ｆ瀽杩斿洖鏁版嵁
- // var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- // if (wcsModel.StatusCode == 0)
- // {
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ if (wcsModel.StatusCode == 0)
+ {
- // }
- // if (wcsModel.StatusCode == -1)
- // {
+ }
+ if (wcsModel.StatusCode == -1)
+ {
- // }
- // }
- // catch (Exception ex)
- // {
- // throw new Exception(ex.Message);
- // }
- // }
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
return strMessage;
- //}
- //else
- //{
- // Db.Ado.RollbackTran();
- // return "-2:娣诲姞澶辫触鏁版嵁鍥炴粴!";
- //}
+ }
+ else
+ {
+ Db.Ado.RollbackTran();
+ return "-2:娣诲姞澶辫触鏁版嵁鍥炴粴!";
+ }
}
catch (Exception ex)
{
- Db.Ado.RollbackTran();
throw new Exception(ex.Message);
}
}
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 386e71a..5fe710b 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -868,8 +868,7 @@
{
throw new Exception("璇烽�夋嫨鍑哄簱鍗曞彿锛�");
}
- //var palletNoList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo).Select(m => m.PalletNo).Distinct().ToList();
- var palletNoList = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SONo == soNo).Select(m => m.PalletNo).Distinct().ToList();
+ var palletNoList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo).Select(m => m.PalletNo).Distinct().ToList();
return palletNoList;
}
catch (Exception ex)
@@ -1238,41 +1237,41 @@
- //var IsTrue = false;
- //while (IsTrue == true)
- //{
- // // 姝ｅ紡杩愯绋嬪簭鏀惧紑
- // string str = "";
- // var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
- // var jsonData = JsonConvert.SerializeObject(agvTaskList);
- // string response = "";
+ var IsTrue = false;
+ while (IsTrue == true)
+ {
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ string str = "";
+ var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
+ var jsonData = JsonConvert.SerializeObject(agvTaskList);
+ string response = "";
- // try
- // {
- // var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- // response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍙栬揣鍛戒护", "AGV");
- // var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+ try
+ {
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍙栬揣鍛戒护", "AGV");
+ var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
- // //////瑙ｆ瀽杩斿洖鏁版嵁
- // var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
- // if (agvModel.Code == "0")
- // {
- // //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
- // new TaskServer().EditTaskIssueOk(list2, time1, time2);
- // str += "涓嬪彂鎴愬姛";
- // IsTrue = true;
- // }
- // if (agvModel.Code == "1")
- // {
- // new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
- // throw new Exception(agvModel.Message);
- // }
- // }
- // catch (Exception ex)
- // {
- // throw new Exception(ex.Message);
- // }
- //}
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+ if (agvModel.Code == "0")
+ {
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list2, time1, time2);
+ str += "涓嬪彂鎴愬姛";
+ IsTrue = true;
+ }
+ if (agvModel.Code == "1")
+ {
+ new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
+ throw new Exception(agvModel.Message);
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
#endregion
--
Gitblit v1.8.0