From 7150774e3fe4ac65653235f46d29eef0bfca2fcb Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 17 十二月 2025 12:54:44 +0800
Subject: [PATCH] 修改调度货架模板
---
Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs | 369 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 328 insertions(+), 41 deletions(-)
diff --git a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
index 29fb576..6ec2f58 100644
--- a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
@@ -224,6 +224,7 @@
{
try
{
+ string type = "2";//妯℃澘绫诲瀷
#region 鍒ゆ柇
if (string.IsNullOrWhiteSpace(areaNo) || string.IsNullOrWhiteSpace(endLocate) || string.IsNullOrWhiteSpace(plnStatus) )
@@ -240,6 +241,7 @@
{
throw new Exception("婊℃《璇烽�夋嫨鐗╂枡涓庢壒娆�");
}
+
//鍒ゆ柇鐩爣鍙枡鍌ㄤ綅鐘舵��
var endLocateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == endLocate && m.AreaNo == areaNo);
if (endLocateInfo == null)
@@ -274,7 +276,12 @@
{
if (house.WareHouseNo == "M01")
{
- stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.Status == "0" && m.PalletStatus == "0" && m.Standard == standard && !string.IsNullOrWhiteSpace(m.LocatNo)).OrderBy(m => m.LocatNo).ToList();
+ stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.Status == "0" && m.PalletStatus == "0" && m.WareHouseNo == "M01" && m.Standard == standard && !string.IsNullOrWhiteSpace(m.LocatNo)).OrderBy(m => m.LocatNo).ToList();
+ if (stockDetail.Count() == 0)
+ {
+ stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.Status == "0" && m.PalletStatus == "0" && m.Standard == standard && !string.IsNullOrWhiteSpace(m.LocatNo)).OrderBy(m => m.LocatNo).ToList();
+ }
+
}
else
{
@@ -285,7 +292,9 @@
//婊℃《
else if (plnStatus == "2")
{
- stockDetail = stockDetail.Where(m => m.PalletStatus == "2" && m.SkuNo == skuNo && m.LotNo == lotNo).OrderBy(m => m.LocatNo).ToList();
+ stockDetail = stockDetail.Where(m => m.PalletStatus == "2" && m.SkuNo == skuNo && m.LotNo == lotNo && m.InspectStatus == "1").OrderBy(m => m.LocatNo).ToList();
+
+
}
else
{
@@ -305,25 +314,45 @@
//鐩爣浠撳簱鎵�鏈夊偍浣�
var locatList = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Flag=="0" && w.WareHouseNo == house.WareHouseNo).OrderBy(w=>w.Column).ToList();
//鐩爣浠撳簱鎵�鏈夋渶澶栦晶鐨勫偍浣�
- var locatListWai = locatList.Where(w => string.IsNullOrEmpty(w.AisleOne)).Select(s => s.LocatNo);
-
- //鍏堟壘涓嶉渶瑕佺Щ搴撶殑妗�
- var palletModel = stockDetail.Where(w => locatListWai.Contains(w.LocatNo) && w.Status == "0").OrderByDescending(w => w.UpdateTime).FirstOrDefault();
- if (palletModel == null)
+ var locatListWai = locatList.Where(w => string.IsNullOrEmpty(w.AisleOne) && w.Flag == "0").Select(s => s.LocatNo);
+ var locatListNei = locatList.Where(w => !string.IsNullOrEmpty(w.AisleOne) && w.Flag == "0").Select(s => s.LocatNo);
+ var palletModel = new DataStockDetail();
+ if (plnStatus == "0") //鍑�妗惰幏鍙栧簱浣�
{
- //鎵鹃渶瑕佺Щ搴撶殑妗�
- palletModel= stockDetail.Where(w => !locatListWai.Contains(w.LocatNo)).OrderByDescending(w => w.UpdateTime).FirstOrDefault();
+ //鍏堟壘涓嶉渶瑕佺Щ搴撶殑妗�
+ palletModel = stockDetail.Where(w => locatListWai.Contains(w.LocatNo) && w.Status == "0" && w.Standard == standard).OrderByDescending(w => w.UpdateTime).FirstOrDefault();
if (palletModel == null)
{
- throw new Exception("鏈壘鍒板搴旀《淇℃伅");
+ //鎵鹃渶瑕佺Щ搴撶殑妗�
+ palletModel = stockDetail.Where(w => locatListNei.Contains(w.LocatNo) && w.Standard == standard).OrderByDescending(w => w.UpdateTime).FirstOrDefault();
+ if (palletModel == null)
+ {
+ throw new Exception("鏈壘鍒板搴旀《淇℃伅");
+ }
+ resultYi = YikuTask(palletModel.PalletNo, taskNo, url, bindUrl);
}
- resultYi = YikuTask(palletModel.PalletNo, taskNo, url,bindUrl);
}
+ else //婊℃《鑾峰彇搴撲綅
+ {
+ //鍏堟壘涓嶉渶瑕佺Щ搴撶殑妗�
+ palletModel = stockDetail.Where(w => locatListWai.Contains(w.LocatNo) && w.Status == "0").OrderByDescending(w => w.UpdateTime).FirstOrDefault();
+ if (palletModel == null)
+ {
+ //鎵鹃渶瑕佺Щ搴撶殑妗�
+ palletModel = stockDetail.Where(w => locatListNei.Contains(w.LocatNo)).OrderByDescending(w => w.UpdateTime).FirstOrDefault();
+ if (palletModel == null)
+ {
+ throw new Exception("鏈壘鍒板搴旀《淇℃伅");
+ }
+ resultYi = YikuTask(palletModel.PalletNo, taskNo, url, bindUrl);
+ }
+ }
+
palletModel.Status = "2";
Db.Updateable(palletModel).ExecuteCommand();
#endregion
//璧峰鍌ㄤ綅鍦板潃淇℃伅
- var startLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.Status == "1" && w.LocatNo == palletModel.LocatNo);
+ var startLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletModel.LocatNo);
if (startLoction == null)
{
throw new Exception($"璧峰鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦紝妗跺彿锛歿palletModel.LocatNo}");
@@ -332,6 +361,12 @@
if (resultYi)
{
taskNo = taskNo + "-1";
+ }
+ //妫�楠屽綋鍓嶆墭鐩樻槸鍚︽湁浠诲姟鏈畬鎴�
+ var checkTask = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && (w.Status == "1" || w.Status == "0") && w.PalletNo == palletModel.PalletNo);
+ if (checkTask != null)
+ {
+ throw new Exception("褰撳墠鎵樼洏鏈夋鍦ㄦ墽琛岀殑浠诲姟锛�");
}
//娣诲姞浠诲姟
var logTaskEntry = new LogTask
@@ -354,6 +389,12 @@
CreateTime = DateTime.Now
};
Db.Insertable(logTaskEntry).ExecuteCommand();
+
+ var endtype = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == endLocate);
+ if (plnStatus == "2" && endtype.Layer == 3)
+ {
+ type = "1"; //涓嶈璐ф灦妯℃澘
+ }
//娌℃湁浜х敓绉诲簱浠诲姟灏辩洿鎺ョ粰灏忚溅涓嬪彂鍑哄簱浠诲姟锛岃嫢浜х敓绉诲簱浠诲姟绛夊皬杞︽妸绉诲簱鐨勬《鎶捣鏃跺啀涓嬪彂鍑哄簱浠诲姟
if (!resultYi)
@@ -365,7 +406,7 @@
Startport = palletModel.LocatNo,//璧峰浣嶇疆
Endport = endLocate,//鐩爣浣嶇疆
Pallno = palletModel.PalletNo,//妗跺彿
- Crtype = "1",//鍙《
+ Crtype = type,//鍙《
};
string agvMsg = string.Empty;
@@ -430,8 +471,8 @@
{
try
{
+
#region 鍒ゆ柇
-
if (string.IsNullOrWhiteSpace(areaNo) || string.IsNullOrWhiteSpace(StartLocate) || string.IsNullOrWhiteSpace(plnStatus))
{
throw new Exception("鍖哄煙/璧峰浣�/妗剁被鍨嬩笉鑳戒负绌�");
@@ -516,7 +557,7 @@
Status = "2",
InspectMark = "0",
BitPalletMark = "0",
- InspectStatus = "1",
+ InspectStatus = "0",
};
Db.Updateable(stockDetailNew).ExecuteCommand();
}
@@ -538,7 +579,12 @@
{
throw new Exception("娌℃湁鎵惧埌鍚堥�傜殑鐩爣鍌ㄤ綅");
}
-
+ //妫�楠屽綋鍓嶆墭鐩樻槸鍚︽湁浠诲姟鏈畬鎴�
+ var checkTask = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && (w.Status == "1" || w.Status == "0") && w.PalletNo == plnNo);
+ if (checkTask != null)
+ {
+ throw new Exception("褰撳墠鎵樼洏鏈夋鍦ㄦ墽琛岀殑浠诲姟锛�");
+ }
var taskNo = new Common().GetMaxNo("TK");
//娣诲姞浠诲姟
var logTaskEntry = new LogTask
@@ -569,7 +615,7 @@
Startport = StartLocate,//璧峰浣嶇疆
Endport = endLocatInfo.LocatNo,//鐩爣浣嶇疆
Pallno = plnNo,//妗跺彿
- Crtype = "1",//鍙《
+ Crtype = "2",//鍙溅妯℃澘
};
//璋冪敤AGV鎺ュ彛涓嬪彂浠诲姟
string agvMsg = string.Empty;
@@ -678,19 +724,37 @@
{
throw new Exception($"璧峰鍌ㄤ綅淇℃伅涓嶅瓨鍦�");
}
- startLocatInfo.Status = "0";//绌哄偍浣�
- //淇敼璧峰鍌ㄤ綅鐘舵��
- Db.Updateable(startLocatInfo).ExecuteCommand();
+ //startLocatInfo.Status = "0";//绌哄偍浣�
+ ////淇敼璧峰鍌ㄤ綅鐘舵��
+ //Db.Updateable(startLocatInfo).ExecuteCommand();
- //鐩爣鍌ㄤ綅淇℃伅
+ //浠诲姟琛ㄤ腑鐩爣鍌ㄤ綅淇℃伅
var endLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.EndLocat && w.IsDel == "0");
if (endLocatInfo == null)
{
throw new Exception($"鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�");
}
+ //AGV灏忚溅杩斿洖瀹為檯瀛樻斁鐩爣鍌ㄤ綅
+ var trueLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == locateNo && w.IsDel == "0");
+ if (trueLocatInfo == null)
+ {
+ throw new Exception($"灏忚溅鏀捐揣鍌ㄤ綅淇℃伅涓嶅瓨鍦�");
+ }
+ if (endLocatInfo.LocatNo != trueLocatInfo.LocatNo)
+ {
+ //涓嶄竴鑷存椂浠ュ皬杞︽斁璐у偍浣嶄负鍑�
+ endLocatInfo = trueLocatInfo;
+ //var tasklocat = Db.Queryable<LogTask>().First(w => w.EndLocat == trueLocatInfo.LocatNo && (w.Status == "0" || w.Status == "1") && w.IsDel == "0");
+ //if (tasklocat == null)
+ //{
+ // trueLocatInfo.Status = "0";
+ // Db.Updateable(trueLocatInfo).ExecuteCommand();
+ //}
+
+ }
+ //淇敼鐩爣鍌ㄤ綅鐘舵��
endLocatInfo.Status = "1";//鏈夌墿鍝�
endLocatInfo.UpdateTime = DateTime.Now;//鏇存柊鏃堕棿
- //淇敼鐩爣鍌ㄤ綅鐘舵��
Db.Updateable(endLocatInfo).ExecuteCommand();
//鐩爣鍌ㄤ綅鎵�灞炲尯鍩�
@@ -817,6 +881,7 @@
var startLoction = new SysStorageLocat();//璧峰鍌ㄤ綅淇℃伅
var endLoction = new SysStorageLocat();//鐩爣鍌ㄤ綅淇℃伅
var palletModel = new DataStockDetail();//鍒嗛厤妗朵俊鎭�
+ string locatno = "";
string type = "";//鍙枡绫诲瀷
//寮�鍚簨鍔�
@@ -847,22 +912,26 @@
{
//鏈夎剰妗剁殑璇濓紝灏嗘洿鏀规妗剁姸鎬�(浠ｈ〃姝ゆ《姝ｅ湪娓呮礂涓�)
var qxStock = Db.Queryable<DataStockDetail>().Where(w => w.LocatNo == endLoction.LocatNo).First();
+ if (qxStock == null)
+ {
+ throw new Exception("鍙枡浣嶇疆鐘舵�侀敊璇�");
+ }
qxStock.Status = "2";
- qxStock.UpdateTime = DateTime.Now;//娓呮礂鏃堕棿
+ //qxStock.UpdateTime = DateTime.Now;//娓呮礂鏃堕棿
Db.Updateable(qxStock).ExecuteCommand();
//鏇存敼璁惧鍌ㄤ綅鐘舵�佷负绌哄偍浣�
endLoction.Status = "0";
Db.Updateable(endLoction).ExecuteCommand();
}
//浼樺厛鏌ユ壘鑴忔《缂撳瓨杞﹂棿
- palletModel = stockDetail.Where(w => w.AreaNo == "C54").FirstOrDefault();
+ palletModel = stockDetail.Where(w => w.AreaNo == "C54").OrderByDescending(w => w.UpdateTime).FirstOrDefault();
if (palletModel == null)//鑴忔《缂撳瓨杞﹂棿娌℃湁鑴忔《锛屽啀浠庝笁妤间腑闂寸珯鑴忔《鍖烘煡鎵�
{
- palletModel = stockDetail.Where(w => w.WareHouseNo == "M16" && w.AreaNo == "C26").FirstOrDefault();
+ palletModel = stockDetail.Where(w => w.WareHouseNo == "M16" && w.AreaNo == "C26").OrderByDescending(w => w.UpdateTime).FirstOrDefault();
}
if (palletModel == null)//涓夋ゼ涓棿绔欒剰妗跺尯娌℃湁鑴忔《锛屽啀浠庡洓妤间腑闂寸珯鑴忔《鍖烘煡鎵�
{
- palletModel = stockDetail.Where(w => w.WareHouseNo == "M01" && w.AreaNo == "C03").FirstOrDefault();
+ palletModel = stockDetail.Where(w => w.WareHouseNo == "M01" && w.AreaNo == "C03").OrderByDescending(w => w.UpdateTime).FirstOrDefault();
}
if (palletModel == null)
{
@@ -875,7 +944,7 @@
throw new Exception($"璧峰鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦紝妗跺彿锛歿palletModel.LocatNo}");
}
//璧峰妗朵俊鎭�
- var startDataDetil = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.Status == "0" && w.PalletStatus == "3");
+ var startDataDetil = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.Status == "0" && w.PalletStatus == "3" && w.PalletNo == palletModel.PalletNo);
if (startDataDetil == null)
{
throw new Exception($"娓呮礂鏈烘墍鍙殑妗剁姸鎬侀敊璇紝妗跺彿锛歿palletModel.LocatNo}");
@@ -898,7 +967,7 @@
startLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
//鑾峰彇娓呮礂鏈轰笂绗竴娆″彨鐨勮剰妗�
string locate = deviceID == "1002"?"1001":"1003";
- palletModel = Db.Queryable<DataStockDetail>().Where(w => w.LocatNo == locate && (w.Status == "2" || w.Status == "0")).OrderBy(o => o.CreateTime).First();
+ palletModel = Db.Queryable<DataStockDetail>().Where(w => w.LocatNo == locate).OrderBy(o => o.UpdateTime).First();
if (palletModel == null)
{
throw new Exception("鏈壘鍒板簱瀛樹腑姝ｅ湪娓呮礂鐨勮剰妗�");
@@ -918,20 +987,55 @@
{
throw new Exception("娌℃湁绌轰綑鐨勫噣妗跺偍浣�");
}
- //浼樺厛鍒嗛厤鍥涙ゼ涓棿绔欏噣妗跺尯
- endLoction = jtLocate.Where(w => w.WareHouseNo == "M01" && w.AreaNo == "C01")
- .OrderBy(w => w.Row).OrderByDescending(w => w.Column).FirstOrDefault();
- if (endLoction == null)//鍥涙ゼ涓棿绔欏噣妗跺尯娌℃湁绌哄偍浣嶏紝鍐嶄粠涓夋ゼ涓棿绔欏噣妗跺尯鏌ユ壘
+ //棣栧厛鏌ユ壘鏄惁宸叉湁鍚岃鏍煎悓宸烽亾鐨勭┖浣�
+ var pallnoStorage = Db.Queryable<DataStockDetail>().Where(w => w.Standard == palletModel.Standard && w.PalletStatus == "0" && w.Status == "0").OrderBy(o => o.UpdateTime).ToList();
+ if (pallnoStorage.Count()>0)
{
- endLoction = jtLocate.Where(w => w.WareHouseNo == "M16" && w.AreaNo == "C24")
- .OrderBy(w => w.Row).OrderByDescending(w => w.Column).FirstOrDefault();
+ foreach (var item in pallnoStorage)
+ {
+ //鑾峰彇宸烽亾鍒楋紝鏌ユ壘鍒椾腑绌哄偍浣�
+ var pallnoRow = Db.Queryable<SysStorageLocat>().Where(w => w.LocatNo == item.LocatNo).First();
+ endLoction = jtLocate.Where(w => w.AreaNo == pallnoRow.AreaNo && w.Row == pallnoRow.Row && w.Status == "0" && w.Flag == "0" && w.Column<pallnoRow.Column).FirstOrDefault();
+ if (endLoction == null)
+ {
+ continue;
+ }
+ else
+ {
+ locatno = endLoction.LocatNo;
+ break;
+ }
+ }
}
- if (endLoction == null)//涓夋ゼ涓棿绔欏噣妗跺尯娌℃湁绌哄偍浣嶏紝鍐嶄粠涓夋ゼ娓呮礂闂寸紦瀛樺尯鏌ユ壘 PS锛氬皬杞︾幇鍦ㄨ繕涓嶆敮鎸佹竻娲楁満鐩存帴閫佸線4妤煎噣妗跺尯
+ if (palletModel.Standard != "400L" && string.IsNullOrEmpty(locatno))
+ {
+ //浼樺厛鍒嗛厤鍥涙ゼ涓棿绔欏噣妗跺尯
+ endLoction = jtLocate.Where(w => w.WareHouseNo == "M01" && w.AreaNo == "C01")
+ .OrderBy(w => w.Row).OrderByDescending(w => w.Column).FirstOrDefault();
+ if (endLoction != null)
+ {
+ locatno = endLoction.LocatNo;
+ }
+ }
+ if (string.IsNullOrEmpty(locatno))
+ {
+ endLoction = jtLocate.Where(w => w.WareHouseNo == "M16" && w.AreaNo == "C24")
+ .OrderBy(w => w.Row).OrderByDescending(w => w.Column).FirstOrDefault();
+ if (endLoction != null)
+ {
+ locatno = endLoction.LocatNo;
+ }
+ }
+ if (string.IsNullOrEmpty(locatno))//涓夋ゼ涓棿绔欏噣妗跺尯娌℃湁绌哄偍浣嶏紝鍐嶄粠涓夋ゼ娓呮礂闂寸紦瀛樺尯鏌ユ壘
{
endLoction = jtLocate.Where(w => w.WareHouseNo == "M44" && w.AreaNo == "C55")
.OrderBy(w => w.Row).OrderByDescending(w => w.Column).FirstOrDefault();
+ if (endLoction != null)
+ {
+ locatno = endLoction.LocatNo;
+ }
}
- if (endLoction == null)
+ if (string.IsNullOrEmpty(locatno))
{
throw new Exception("鏈煡璇㈠埌鍚堥�傚偍浣�");
}
@@ -952,7 +1056,12 @@
throw new Exception("鍙枡鐐逛綅寮傚父");
}
-
+ //妫�楠屽綋鍓嶆墭鐩樻槸鍚︽湁浠诲姟鏈畬鎴�
+ var checkTask = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && (w.Status == "1" || w.Status == "0") && w.PalletNo == palletModel.PalletNo);
+ if (checkTask != null)
+ {
+ throw new Exception("褰撳墠鎵樼洏鏈夋鍦ㄦ墽琛岀殑浠诲姟锛�");
+ }
var taskNo = new Common().GetMaxNo("TK");
//娣诲姞浠诲姟
var logTaskEntry = new LogTask
@@ -1009,6 +1118,25 @@
endLoction.Status = "2";//鍏ュ簱涓�
Db.Updateable(endLoction).ExecuteCommand();
+
+ //鍑�妗剁敵璇锋垚鍔熷悗鍒ゆ柇褰撳墠娓呮礂鏈轰笂鏄惁杩樻湁妗讹紝娌℃湁妗跺垯娓呯┖娓呮礂鏈哄叆鍙ｅ伐浣嶇姸鎬�
+ if (deviceStation == "output")
+ {
+ var rlocat = palletModel.LocatNo == "1002" ? "1001" : "1003";
+ //鍒ゆ柇鏈夋病鏈夋鍦ㄦ墽琛岀殑鍒版竻娲楁満鍏ュ彛鐨勪换鍔�
+ var tasklist = Db.Queryable<LogTask>().First(w => w.EndLocat == rlocat && (w.Status == "0" && w.Status == "1"));
+ if (tasklist == null)
+ {
+ var stocklist = Db.Queryable<DataStockDetail>().First(w => w.LocatNo == rlocat);
+ if (stocklist == null)
+ {
+ var rdecive = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == rlocat);
+ rdecive.Status = "0";
+ Db.Updateable(rdecive).ExecuteCommand();
+ }
+ }
+ }
+
}
else//澶辫触
{
@@ -1075,6 +1203,18 @@
{
throw new Exception("瑕佺Щ搴撶殑妗舵湁姝ｅ湪鎵ц鐨勪换鍔★紝璇风◢鍚庡啀璇�");
}
+ //鍒ゆ柇瑕佺Щ搴撶殑妗跺渚ф槸鍚︽湁妗�
+ var locatInfoYi = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletInfoYi.LocatNo);
+ if (locatInfo == null)
+ {
+ throw new Exception("鏈煡璇㈠埌瑕佺Щ搴撶殑妗舵墍鍦ㄧ殑鍌ㄤ綅淇℃伅");
+ }
+ var palletInfoYi2 = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == locatInfoYi.AisleOne);
+ if (palletInfoYi2 != null)
+ {
+ throw new Exception("鎵�瑕佸彨鏂欑殑妗舵棤娉曡繘琛岀Щ搴擄紝璇疯仈绯荤鐞嗗憳杩涜鎵嬪姩绉绘《");
+ }
+
#region#缁欒绉诲簱鐨勬《鍏堢Щ鍒颁腑杞偍浣�
//鎵惧埌涓浆鍌ㄤ綅鎵�鍦ㄥ尯鍩�
var transfeArea = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.WareHouseNo == WareHouseNo && w.AreaName.Contains("杞繍鍖�"));
@@ -1112,6 +1252,7 @@
Msg = $"灏嗘《{palletInfoYi.PalletNo}浠巤palletInfoYi.LocatNo}绉诲埌{transferLocat.LocatNo}", //鍏抽敭淇℃伅
LotNo = ""//鎵规鍙�
};
+ Db.Insertable(logTaskEntry).ExecuteCommand();
//缁勭粐涓嬪彂灏忚溅浠诲姟淇℃伅
var task = new TaskDetial
@@ -1467,10 +1608,16 @@
{
endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.Row == rowItem.Row && w.AreaNo == rowItem.AreaNo && (w.WareHouseNo == "M01"||w.WareHouseNo == "M16"))
.OrderByDescending(o => o.Column).First();
- if (endLocatInfo.LocatNo != null)
+ if (endLocatInfo != null)
{
break;
}
+ }
+ if (endLocatInfo == null)
+ {
+ endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
+ && (w.AreaNo == "C02" || w.AreaNo == "C25"))
+ .OrderBy(o => o.Layer).OrderByDescending(o => o.Column).OrderBy(o => o.Row).First();
}
//娌℃湁鎵惧埌鐩稿悓鐗╂枡鍚岀粍鐨勭┖鍌ㄤ綅
if (endLocatInfo.LocatNo == null)
@@ -1483,11 +1630,12 @@
}
else {//鍏朵粬鍖哄煙
+ areaNo = houseNo == "M01" ? "C02" : "C25";
//鏌ュ埌鍒版弧妗跺尯鍩熺紪鍙�
areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.Type == "1").Select(s => s.AreaNo).First();
//鍒嗛厤鍌ㄤ綅
//鍏堟煡鍒板悓鐗╂枡鐨勭粍
- string sql = $@"select Row,AreaNo from SysStorageLocat where WareHouseNo='{houseNo}' and AreaNo='{areaNo}' and Status = '0' and LocatNo in(
+ string sql = $@"select Row,AreaNo from SysStorageLocat where WareHouseNo='{houseNo}' and AreaNo='{areaNo}' and Status = '1' and LocatNo in(
select LocatNo from DataStockDetail where SkuNo='{skuNo}' and LotNo = '{lotNo}' and Standard='{standard}' and WareHouseNo='{houseNo}' and AreaNo='{areaNo}'
) group by Row,AreaNo";
@@ -1498,13 +1646,19 @@
&& w.WareHouseNo == houseNo && w.AreaNo == areaNo && w.Row == rowItem.Row && w.AreaNo == rowItem.AreaNo && (w.WareHouseNo == "M01" || w.WareHouseNo == "M16"))
.OrderByDescending(o => o.Column).First();
- if (endLocatInfo.LocatNo != null)
+ if (endLocatInfo != null)
{
break;
}
}
+ if (endLocatInfo == null)
+ {
+ endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
+ && w.WareHouseNo == houseNo && w.AreaNo == areaNo)
+ .OrderByDescending(o => o.Column).OrderBy(o => o.Row).First();
+ }
//娌℃湁鎵惧埌鐩稿悓鐗╂枡鍚岀粍鐨勭┖鍌ㄤ綅
- if (endLocatInfo.LocatNo == null)
+ if (endLocatInfo.LocatNo == null )
{
endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
@@ -1544,5 +1698,138 @@
throw new Exception(ex.Message);
}
}
+
+ /// <summary>
+ /// 鐐瑰鐐逛换鍔′笅鍙�
+ /// </summary>
+ /// <param name="beginLocate">璧峰浣�</param>
+ /// <param name="endLocate">缁堢偣浣�</param>
+ /// <exception cref="Exception"></exception>
+ public void PointToPointRequest(string id,string beginPoint, string endPoint, string url, string bindUrl)
+ {
+ try
+ {
+ //鏉冮檺鏍￠獙
+ var user = Db.Queryable<SysUserInfor>().First(m => m.IsDel == "0" && m.UserName == id);
+ if (user == null)
+ {
+ throw new Exception("娌℃湁鏌ヨ鍒扮敤鎴蜂俊鎭�");
+ }
+ if (user.RoleNo != "01")
+ {
+ throw new Exception("褰撳墠鐢ㄦ埛娌℃湁鏉冮檺浣跨敤姝ゅ姛鑳�");
+ }
+ //璧峰鍌ㄤ綅淇℃伅
+ var startLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == beginPoint);
+ if (startLoction == null)
+ {
+ throw new Exception("鏈壘鍒拌緭鍏ョ殑璧峰鍌ㄤ綅");
+ }
+ if (startLoction.Status != "1")
+ {
+ throw new Exception("璧峰鍌ㄤ綅锛�"+beginPoint+"鐨勫偍浣嶇姸鎬侀敊璇紝鍌ㄤ綅鐘舵�佸簲涓猴細鈥樻湁鐗╁搧鈥�");
+ }
+ //鐩爣鍌ㄤ綅淇℃伅
+ var endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == endPoint);
+ if (endLoction == null)
+ {
+ throw new Exception("鏈壘鍒拌緭鍏ョ殑鐩爣鍌ㄤ綅");
+ }
+ if (endLoction.Status != "0")
+ {
+ throw new Exception("鐩爣鍌ㄤ綅锛�" + endPoint + "鐨勫偍浣嶇姸鎬侀敊璇紝鍌ㄤ綅鐘舵�佸簲涓猴細'绌哄偍浣�'");
+ }
+ //鎵樼洏淇℃伅
+ var palletModel = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == beginPoint);
+ if (palletModel == null)
+ {
+ throw new Exception("鏈壘鍒板偍浣嶅搴旀墭鐩樹俊鎭紒");
+ }
+ //妫�楠屽綋鍓嶆墭鐩樻槸鍚︽湁浠诲姟鏈畬鎴�
+ var checkTask = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && (w.Status == "1" || w.Status == "0") && w.PalletNo == palletModel.PalletNo);
+ if (checkTask != null)
+ {
+ throw new Exception("褰撳墠鎵樼洏鏈夋鍦ㄦ墽琛岀殑浠诲姟锛�");
+ }
+
+ Db.BeginTran();
+ var taskNo = new Common().GetMaxNo("TK");
+ //娣诲姞浠诲姟
+ var logTaskEntry = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "RCS",
+ IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+
+ StartLocat = beginPoint,//璧峰浣嶇疆
+ EndLocat = endPoint,//鐩爣浣嶇疆
+ PalletNo = palletModel.PalletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+
+ CreateTime = DateTime.Now
+ };
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+
+ //缁勭粐涓嬪彂灏忚溅浠诲姟淇℃伅
+ var task = new TaskDetial
+ {
+ Taskno = taskNo,//浠诲姟鍙�
+ Startport = beginPoint,//璧峰浣嶇疆
+ Endport = endPoint,//鐩爣浣嶇疆
+ Pallno = palletModel.PalletNo,//妗跺彿
+ Crtype = "1",//鍙《
+ };
+
+ string agvMsg = string.Empty;
+ //缁欎笅杞︿笅鍙戜换鍔�
+ logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
+ //涓嬪彂杞藉叿涓庤揣浣嶇粦瀹�
+ var bind = RcsHelper.BindPalletAndSite(palletModel.PalletNo, beginPoint, bindUrl, out string agvBindMsg);
+ if (bind)
+ {
+ var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg);
+ if (agvResult)//鎴愬姛
+ {
+ //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
+ logTaskEntry.IsSuccess = 1;
+ logTaskEntry.IsSend = 0;
+ //logTaskEntry.IsCancel = 0;
+ logTaskEntry.BackDate = DateTime.Now;
+ logTaskEntry.Status = "1";//姝ｅ湪鎵ц
+ Db.Updateable(logTaskEntry).ExecuteCommand();
+
+ startLoction.Status = "3";//鍑哄簱涓�
+ Db.Updateable(startLoction).ExecuteCommand();
+
+ endLoction.Status = "2";//鍏ュ簱涓�
+ Db.Updateable(endLoction).ExecuteCommand();
+ }
+ else//澶辫触
+ {
+ throw new Exception("妗跺彿锛�" + task.Pallno + ",璋冨害灏忚溅澶辫触");
+ }
+ }
+ else
+ {
+ throw new Exception("妗跺彿锛�" + task.Pallno + ",缁戝畾璐т綅澶辫触");
+ }
+
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
+ }
+ catch (Exception e)
+ {
+ //鍥炴粴浜嬪姟
+ Db.RollbackTran();
+ throw new Exception(e.Message);
+ }
+ }
+
}
}
--
Gitblit v1.8.0