From 5e2454c2a75cb70afc0d1933e5c29e02e21231e6 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期一, 19 八月 2024 17:01:31 +0800
Subject: [PATCH] 测试流程，修改问题
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 43ca4af..5fe710b 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -826,7 +826,7 @@
{
try
{
- var allotList = Db.Queryable<BllExportNotice>().Where(m => m.IsDel == "0" && m.Status == "2").Select(m => m.SONo).Distinct().ToList();
+ var allotList = Db.Queryable<BllExportNotice>().Where(m => m.IsDel == "0" && (m.Status == "3" || m.Status == "4")).Select(m => m.SONo).Distinct().ToList();
return allotList;
}
catch (Exception ex)
@@ -983,11 +983,11 @@
//淇敼搴撳瓨鏄庣粏淇℃伅
stockDetail.Status = "4";//绉诲簱閿佸畾
- stockDetail.LockQty = stockDetail.Qty;//閿佸畾搴撳瓨鏁伴噺
+ //stockDetail.LockQty = stockDetail.Qty;//閿佸畾搴撳瓨鏁伴噺
Db.Updateable(stockDetail).ExecuteCommand();
//淇敼搴撳瓨淇℃伅
- stock.LockQty += (decimal)stockDetail.Qty;
- Db.Updateable(stock).ExecuteCommand();
+ //stock.LockQty += (decimal)stockDetail.Qty;
+ //Db.Updateable(stock).ExecuteCommand();
//淇敼璧峰鍌ㄤ綅鍦板潃鐘舵��
storageLocat.Status = "5";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
@@ -1069,7 +1069,7 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="userId"></param>
- public void AgvTransport2(string soNo, string palletNo, string areaNo, int userId, string url)
+ public List<string> AgvTransport2(string soNo, string palletNo, string areaNo, int userId, string url)
{
if (string.IsNullOrEmpty(soNo))
{
@@ -1084,7 +1084,7 @@
//寮�鍚簨鍔�
Db.BeginTran();
List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
-
+ var strList = new List<string>();//閿欒淇℃伅闆嗗悎 //0 锛氶儴鍒嗘墭鐩樺凡鏈夊皬杞︾瓑寰呮墽琛屾垨姝ｅ湪鎵ц鐨勪换鍔�
//鍑哄簱鍗曚俊鎭�
var notice = Db.Queryable<BllExportNotice>().First(w => w.IsDel == "0" && w.SONo == soNo);
if (notice == null)
@@ -1104,8 +1104,9 @@
}
else//鏁翠釜鍑哄簱鍗曞彨璐�
{
- string sqlStr = $"select * from DataStockDetail where PalletNo in (select PalletNo from BllExportAllot where IsDel='0' and SONo='{soNo}')";
- stockDetailList = Db.Ado.SqlQuery<DataStockDetail>(sqlStr).ToList();
+ // string sqlStr = $"select * from DataStockDetail where PalletNo in (select PalletNo from BllExportAllot where IsDel='0' and SONo='{soNo}')";
+ // stockDetailList = Db.Ado.SqlQuery<DataStockDetail>(sqlStr).ToList();
+ stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SONo == soNo).ToList();
}
if (stockDetailList.Count <= 0)
{
@@ -1117,14 +1118,10 @@
var stock = Db.Queryable<DataStock>().Where(w => w.IsDel == "0");//搴撳瓨鎬昏〃
string EndLocat = string.Empty;//鐩爣浣嶇疆
string hasLocatNoList = string.Empty;//宸插垎閰嶇殑鍌ㄤ綅
+
foreach (var item in stockDetailList)
{
- //浠诲姟淇℃伅
- var logInfo = log.First(w => w.PalletNo == item.PalletNo);
- if (logInfo != null)
- {
- throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}宸叉湁灏忚溅绛夊緟鎵ц鎴栨鍦ㄦ墽琛岀殑浠诲姟!");
- }
+
if (string.IsNullOrEmpty(item.LocatNo))
{
throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}鐨勫偍浣嶄俊鎭笉瀛樺湪,璇锋鏌�!");
@@ -1132,6 +1129,17 @@
if (item.WareHouseNo != "W02")
{
throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}鏈湪骞冲簱鍐�,璇锋鏌�!");
+ }
+ //浠诲姟淇℃伅
+ var logInfo = log.First(w => w.PalletNo == item.PalletNo);
+ if (logInfo != null)
+ {
+ if (!strList.Contains("1"))
+ {
+ strList.Add("1");
+ }
+ continue;
+ //throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}宸叉湁灏忚溅绛夊緟鎵ц鎴栨鍦ㄦ墽琛岀殑浠诲姟!");
}
//璧峰鍌ㄤ綅淇℃伅
var storageLocatBegin = storageLocat.First(w => w.LocatNo == item.LocatNo);
@@ -1171,7 +1179,7 @@
Msg = string.Format("杞繍浠诲姟锛歿0}=>>{1}", item.LocatNo, EndLocat),
StartLocat = item.LocatNo,//璧峰浣嶇疆
EndLocat = EndLocat,//鐩爣浣嶇疆
- PalletNo = palletNo,//鎵樼洏鐮�
+ PalletNo = item.PalletNo,//鎵樼洏鐮�
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
@@ -1194,7 +1202,7 @@
//淇敼搴撳瓨鏄庣粏淇℃伅
item.Status = "4";//绉诲簱閿佸畾
- item.LockQty = item.Qty;//閿佸畾搴撳瓨鏁伴噺
+ //item.LockQty = item.Qty;//閿佸畾搴撳瓨鏁伴噺
Db.Updateable(item).ExecuteCommand();
//淇敼璧峰鍌ㄤ綅鍦板潃鐘舵��
@@ -1203,11 +1211,16 @@
//淇敼鐩爣鍌ㄤ綅鍦板潃鐘舵��
storageLocatEnd.Status = "4";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
Db.Updateable(storageLocatEnd).ExecuteCommand();
+
+ if (!strList.Contains("0"))
+ {
+ strList.Add("0");
+ }
- var stockInfo = stock.First(w => w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
- //淇敼搴撳瓨淇℃伅
- stockInfo.LockQty += (decimal)item.Qty;//閿佸畾鏁伴噺
- Db.Updateable(stockInfo).ExecuteCommand();
+ //var stockInfo = stock.First(w => w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
+ ////淇敼搴撳瓨淇℃伅
+ //stockInfo.LockQty += (decimal)item.Qty;//閿佸畾鏁伴噺
+ //Db.Updateable(stockInfo).ExecuteCommand();
}
if (string.IsNullOrEmpty(palletNo))
{
@@ -1264,6 +1277,7 @@
//鎻愪氦浜嬪姟
Db.CommitTran();
+ return strList;
}
catch (Exception ex)
{
--
Gitblit v1.8.0