From 1e26a7575d9969e728b0aa01466f490409cb173c Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期五, 18 十月 2024 18:41:30 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 522 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 409 insertions(+), 113 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 8c8c157..4b30086 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -2,9 +2,13 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
+using Model.InterFaceModel;
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.PdaDto;
+using Model.ModelVm;
+using Newtonsoft.Json;
using SqlSugar;
+using Utility.Tools;
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
@@ -139,7 +143,7 @@
{
PalletNo = palletNo,
SkuNo = sku,
- Qty = (int?)stockDetail.Qty,
+ Qty = stockDetail.Qty,
CheckResult = 4,
};
@@ -171,7 +175,7 @@
}
}
- public void CrSetCheck(string crNo, string crDetail, string palletNo, string boxNo, string boxNo3, string result, int? qty, string isContinue, int userId)
+ public void CrSetCheck(string crNo, string crDetail, string palletNo, string boxNo, string boxNo3, string result, decimal? qty, string isContinue, int userId)
{
try
{
@@ -773,32 +777,40 @@
{
try
{
- var models = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
- if (models == null)
- {
- throw new Exception("鎵樼洏搴撳瓨淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
- }
- if (string.IsNullOrEmpty(models.LocatNo))
- {
- throw new Exception("鎵樼洏鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
- }
- if (models.WareHouseNo != "W02")
- {
- throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
- }
- var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == models.LocatNo);
- if (storageLocat == null)
- {
- throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
- }
var storageArea = new List<SysStorageArea>();
- if (storageLocat.AreaNo.Contains("B0"))
+ if (string.IsNullOrEmpty(palletNo))
{
- storageArea = Db.Queryable<SysStorageArea>().Where(w => w.AreaNo.Contains("B0")).ToList();
+ storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
}
else
{
- storageArea = Db.Queryable<SysStorageArea>().Where(w => w.AreaNo.Contains("B1")).ToList();
+ var models = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
+ if (models == null)
+ {
+ throw new Exception("鎵樼洏搴撳瓨淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ if (string.IsNullOrEmpty(models.LocatNo))
+ {
+ throw new Exception("鎵樼洏鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ if (models.WareHouseNo != "W02")
+ {
+ throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
+ }
+ var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == models.LocatNo);
+ if (storageLocat == null)
+ {
+ throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+
+ if (storageLocat.AreaNo.Contains("B0"))
+ {
+ storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo.Contains("B0") && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
+ }
+ else
+ {
+ storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo.Contains("B1") && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
+ }
}
return storageArea;
}
@@ -815,7 +827,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)
@@ -867,12 +879,12 @@
}
/// <summary>
- /// agv杞繍鍛煎彨灏忚溅-寮�鍙戞湭瀹屾垚寰呯‘璁�
+ /// agv杞繍鍛煎彨灏忚溅
/// </summary>
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="ruku"></param>
- public void AgvTransport(string palletNo, string areaNo, string ruku, int userId)
+ public void AgvTransport(string palletNo, string areaNo, string ruku, int userId, string url)
{
if (string.IsNullOrEmpty(palletNo))
{
@@ -885,11 +897,16 @@
if (!string.IsNullOrEmpty(areaNo) && !string.IsNullOrEmpty(ruku))
{
throw new Exception("鐩爣鍖哄煙鍜屽叆搴撳彛涓嶈兘鍚屾椂閫夋嫨锛�");
- }
+ }
try
{
string EndLocat = string.Empty;//鐩爣浣嶇疆
+ var log = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
+ if (log != null)
+ {
+ throw new Exception("璇ユ墭鐩樺凡鏈夊皬杞︾瓑寰呮墽琛屾垨姝ｅ湪鎵ц鐨勪换鍔�!");
+ }
var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
if (stockDetail == null)
{
@@ -902,7 +919,7 @@
{
throw new Exception("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
}
- EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo);
+ EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo, palletNo);
}
else
{
@@ -921,11 +938,23 @@
{
throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
}
+ //璧峰鍌ㄤ綅淇℃伅
var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == stockDetail.LocatNo);
if (storageLocat == null)
{
throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
}
+ //鐩爣鍌ㄤ綅淇℃伅
+ var storageLocatEnd = new SysStorageLocat();
+ if (!string.IsNullOrEmpty(areaNo))
+ {
+ storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
+ if (storageLocatEnd == null)
+ {
+ throw new Exception("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ }
+
//寮�鍚簨鍔�
Db.BeginTran();
@@ -941,6 +970,7 @@
StartLocat = stockDetail.LocatNo,//璧峰浣嶇疆
EndLocat = EndLocat,//鐩爣浣嶇疆
PalletNo = palletNo,//鎵樼洏鐮�
+ Msg = string.Format("杞繍浠诲姟锛歿0}=>>{1}", stockDetail.LocatNo, EndLocat),
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
@@ -954,24 +984,78 @@
//淇敼搴撳瓨鏄庣粏淇℃伅
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锛氱Щ鍑轰腑
Db.Updateable(storageLocat).ExecuteCommand();
+ //淇敼鐩爣鍌ㄤ綅鍦板潃鐘舵��
+ if (storageLocatEnd != null)
+ {
+ storageLocatEnd.Status = "4";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ Db.Updateable(storageLocatEnd).ExecuteCommand();
+ }
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
- //鎻愪氦浜嬪姟
- Db.CommitTran();
#region 鍛煎彨灏忚溅浠ｇ爜
+
+ List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
+
+ AgvSchedulingTask agvTask = new AgvSchedulingTask();
+ agvTask.ReqCode = taskNo;
+ agvTask.TaskTyp = "F01";
+ agvTask.WbCode = "";
+ agvTask.PositionCodePath = null;
+ agvTask.PodCode = "-1";
+
+ agvTaskList.Add(agvTask);
+
+ 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")
+
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ 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
+
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
}
catch (Exception ex)
{
@@ -980,21 +1064,17 @@
}
}
/// <summary>
- /// agv杞繍鍛煎彨灏忚溅鍙栬揣-寮�鍙戞湭瀹屾垚寰呯‘璁�
+ /// agv杞繍鍛煎彨灏忚溅鍙栬揣
/// </summary>
/// <param name="soNo"></param>
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="userId"></param>
- public void AgvTransport2(string soNo,string palletNo, string areaNo, int userId)
+ public List<string> AgvTransport2(string soNo, string palletNo, string areaNo, int userId, string url)
{
if (string.IsNullOrEmpty(soNo))
{
throw new Exception("璇烽�夋嫨鍑哄簱鍗曟嵁锛�");
- }
- if (string.IsNullOrEmpty(palletNo))
- {
- throw new Exception("璇锋壂鎻忔墭鐩樻潯鐮侊紒");
}
if (string.IsNullOrEmpty(areaNo))
{
@@ -1002,92 +1082,203 @@
}
try
{
+ //寮�鍚簨鍔�
+ 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)
{
throw new Exception("鍑哄簱鍗曟嵁淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
}
- var allot = Db.Queryable<BllExportAllot>().First(w => w.IsDel == "0" && w.SONo == soNo && w.PalletNo == palletNo);
- if (allot == null)
- {
- throw new Exception("璇ユ墭鐩樺嚭搴撳垎閰嶄俊鎭笉瀛樺湪,璇锋鏌�!");
- }
- var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
- if (stockDetail == null)
- {
- throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樹俊鎭笉瀛樺湪,璇锋鏌�!");
- }
- var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == stockDetail.SkuNo && w.LotNo == stockDetail.LotNo);
- if (stock == null)
- {
- throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樹俊鎭笉瀛樺湪,璇锋鏌�!");
- }
- if (string.IsNullOrEmpty(stockDetail.LocatNo))
- {
- throw new Exception("鎵樼洏鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
- }
- if (stockDetail.WareHouseNo != "W02")
- {
- throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
- }
- var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == stockDetail.LocatNo);
- if (storageLocat == null)
- {
- throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
- }
+ //鐩爣鍖哄煙淇℃伅
var storageArea = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.AreaNo == areaNo);
if (storageArea == null)
{
throw new Exception("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
}
- string EndLocat = string.Empty;//鐩爣浣嶇疆
- EndLocat= GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo);
- //寮�鍚簨鍔�
- Db.BeginTran();
-
- //娣诲姞鍑哄簱浠诲姟
- var taskNo = new Common().GetMaxNo("TK");
- var exTask = new LogTask
+ List<DataStockDetail> stockDetailList = new List<DataStockDetail>();//闇�瑕佺殑鎵樼洏鏄庣粏
+ if (!string.IsNullOrEmpty(palletNo))//鍗曟墭鐩樺彨璐�
{
- TaskNo = taskNo,
- Sender = "WMS",
- Receiver = "AGV",
- IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo).ToList();
+ }
+ 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();
+ stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SONo == soNo).ToList();
+ }
+ if (stockDetailList.Count <= 0)
+ {
+ throw new Exception("鎵樼洏鏄庣粏涓嶅瓨鍦�,璇锋鏌�!");
+ }
- StartLocat = stockDetail.LocatNo,//璧峰浣嶇疆
- EndLocat = EndLocat,//鐩爣浣嶇疆
- PalletNo = palletNo,//鎵樼洏鐮�
- IsSend = 1,//鏄惁鍙啀娆′笅鍙�
- IsCancel = 1,//鏄惁鍙彇娑�
- IsFinish = 1,//鏄惁鍙畬鎴�
- Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
- OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+ var log = Db.Queryable<LogTask>().Where(w => w.IsDel == "0" && (w.Status == "0" || w.Status == "1"));//浠诲姟琛�
+ var storageLocat = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0");//鍌ㄤ綅琛�
+ var stock = Db.Queryable<DataStock>().Where(w => w.IsDel == "0");//搴撳瓨鎬昏〃
+ string EndLocat = string.Empty;//鐩爣浣嶇疆
+ string hasLocatNoList = string.Empty;//宸插垎閰嶇殑鍌ㄤ綅
- CreateTime = DateTime.Now
- };
- Db.Insertable(exTask).ExecuteCommand();
+ foreach (var item in stockDetailList)
+ {
+
+ if (string.IsNullOrEmpty(item.LocatNo))
+ {
+ throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}鐨勫偍浣嶄俊鎭笉瀛樺湪,璇锋鏌�!");
+ }
+ 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);
+ if (storageLocat == null)
+ {
+ throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}鎵�鍦ㄧ殑鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ //鑾峰彇鐩爣鍌ㄤ綅
+ EndLocat = GetLocat(areaNo, item.SkuNo, item.LotNo, palletNo);
+ if (string.IsNullOrEmpty(EndLocat))
+ {
+ throw new Exception("鍒嗛厤鐩爣鍌ㄤ綅澶辫触,璇锋鏌�!");
+ }
+ if (string.IsNullOrEmpty(hasLocatNoList))
+ {
+ hasLocatNoList = EndLocat;
+ }
+ else
+ {
+ hasLocatNoList = hasLocatNoList + "," + EndLocat;
+ }
+ //鐩爣鍌ㄤ綅淇℃伅
+ var storageLocatEnd = storageLocat.First(w => w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
+ if (storageLocatEnd == null)
+ {
+ throw new Exception("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
- //淇敼搴撳瓨鏄庣粏淇℃伅
- stockDetail.Status = "4";//绉诲簱閿佸畾
- stockDetail.LockQty = stockDetail.Qty;//閿佸畾搴撳瓨鏁伴噺
- Db.Updateable(stockDetail).ExecuteCommand();
- //淇敼搴撳瓨淇℃伅
- stock.LockQty += (decimal)stockDetail.Qty;
- Db.Updateable(stock).ExecuteCommand();
+ //娣诲姞鍑哄簱浠诲姟
+ var taskNo = new Common().GetMaxNo("TK");
+ var exTask = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "AGV",
+ IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ Msg = string.Format("杞繍浠诲姟锛歿0}=>>{1}", item.LocatNo, EndLocat),
+ StartLocat = item.LocatNo,//璧峰浣嶇疆
+ EndLocat = EndLocat,//鐩爣浣嶇疆
+ PalletNo = item.PalletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- //淇敼鍌ㄤ綅鍦板潃鐘舵��
- storageLocat.Status = "5";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
- Db.Updateable(storageLocat).ExecuteCommand();
+ CreateTime = DateTime.Now
+ };
+ Db.Insertable(exTask).ExecuteCommand();
- //娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
- //鎻愪氦浜嬪姟
- Db.CommitTran();
+ AgvSchedulingTask agvTask = new AgvSchedulingTask();
+ agvTask.ReqCode = taskNo;
+ agvTask.TaskTyp = "F01";
+ agvTask.WbCode = "";
+ agvTask.PositionCodePath = null;
+ agvTask.PodCode = "-1";
+
+ agvTaskList.Add(agvTask);
+
+ //淇敼搴撳瓨鏄庣粏淇℃伅
+ item.Status = "4";//绉诲簱閿佸畾
+ //item.LockQty = item.Qty;//閿佸畾搴撳瓨鏁伴噺
+ Db.Updateable(item).ExecuteCommand();
+
+ //淇敼璧峰鍌ㄤ綅鍦板潃鐘舵��
+ storageLocatBegin.Status = "5";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ Db.Updateable(storageLocatBegin).ExecuteCommand();
+ //淇敼鐩爣鍌ㄤ綅鍦板潃鐘舵��
+ 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();
+ }
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵瑰嚭搴撳崟锛歿soNo}涓嬫墍鏈夋墭鐩樺彂璧疯浆杩�", userId);
+ }
+ else
+ {
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
+ }
#region 鍛煎彨灏忚溅浠ｇ爜
+
+
+ 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")
+
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ 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
+
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
+ return strList;
}
catch (Exception ex)
{
@@ -1102,21 +1293,21 @@
/// <param name="skuNo"></param>
/// <param name="lotNo"></param>
/// <returns></returns>
- private string GetLocat(string areaNo,string skuNo,string lotNo)
+ private string GetLocat(string areaNo, string skuNo, string lotNo, string palletNo, string hasLocatNoList = "")
{
try
{
string endLocat = string.Empty;//鐩爣鍌ㄤ綅
- //褰撶劧鍖哄煙鎵�鏈夊偍浣嶄俊鎭�
+ //褰撶劧鍖哄煙鎵�鏈夊偍浣嶄俊鎭�
var storageLocatList = Db.Queryable<SysStorageLocat>().Where(w => w.WareHouseNo == "W02" && w.AreaNo == areaNo).ToList();
//鍚屽尯鍩熷悓鎵规鐗╂枡鐨勫偍浣嶄俊鎭�
- List<string> locatList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SkuNo == skuNo && w.LotNo == lotNo && w.WareHouseNo == "W02" && w.AreaNo == areaNo)
- .OrderByDescending(o=>o.LocatNo).Select(s=>s.LocatNo).Distinct().ToList();
+ List<string> locatList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SkuNo == skuNo && w.LotNo == lotNo && w.WareHouseNo == "W02" && w.AreaNo == areaNo && w.PalletNo != palletNo)
+ .OrderByDescending(o => o.LocatNo).Select(s => s.LocatNo).Distinct().ToList();
foreach (var item in locatList)
{
var locatInfo = storageLocatList.Where(w => w.LocatNo == item).First();
- var locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.LocatNo != locatInfo.LocatNo && w.Row == locatInfo.Row)
+ var locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.LocatNo != locatInfo.LocatNo && w.Row == locatInfo.Row && !hasLocatNoList.Contains(w.LocatNo))
.OrderByDescending(o => o.Column).First();
if (locatInfo2 != null)
{
@@ -1125,8 +1316,8 @@
}
if (string.IsNullOrEmpty(endLocat))
{
- var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0")
- .OrderByDescending(m => new { m.Layer, m.Column, m.Row }).First();
+ var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0" && !hasLocatNoList.Contains(w.LocatNo))
+ .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
if (locatInfo3 != null)
{
@@ -1142,5 +1333,110 @@
}
#endregion
+ #region 绠辩爜鏌ヨ
+ /// <summary>
+ /// 绠辩爜鏌ヨ
+ /// </summary>
+ /// <param name="boxNo">绠辩爜</param>
+ /// <returns></returns>
+ public DataBoxDto GetBoxQueryList(string boxNo)
+ {
+ // 瀹炰緥鍖栬繑鍥炵被
+ DataBoxDto boxModel = new DataBoxDto();
+ List<DataBoxInfoDto> list = new List<DataBoxInfoDto>();
+
+ // 鏍规嵁绠辩爜鑾峰彇绠变俊鎭�
+ var boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+
+ if (boxData.Count() == 0)
+ {
+ // 鏍规嵁鐩掔爜鑾峰彇绠变俊鎭�
+ boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo2 == boxNo);
+ if (boxData.Count() == 0)
+ {
+ boxModel = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo3 == boxNo).Select(it => new DataBoxDto() { Qty = it.Qty }, true).First();
+ return boxModel;
+ }
+
+ list = boxData.Select(it => new DataBoxInfoDto()
+ {
+ BoxNo2 = it.BoxNo3,
+ Qty2 = it.Qty
+ }).ToList();
+
+ boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo2 == boxNo);
+ boxModel = boxData.GroupBy(m => new
+ {
+ m.BoxNo,
+ m.SkuName,
+ m.SkuNo,
+ m.LotNo,
+ m.SupplierLot,
+ m.InspectStatus
+ }).Select(it => new DataBoxDto()
+ {
+ BoxNo = it.BoxNo,
+ SkuName = it.SkuName,
+ SkuNo = it.SkuNo,
+ LotNo = it.LotNo,
+ SupplierLot = it.SupplierLot,
+ InspectStatus = it.InspectStatus == "0" ? "寰呮" : it.InspectStatus == "1" ? "鍚堟牸":"涓嶅悎鏍�",
+ Qty = SqlFunc.AggregateSum(it.Qty)
+ }).First();
+
+ boxModel.InfoList = list;
+ return boxModel;
+ }
+ else //绠辩爜鍐呮暟鎹�
+ {
+ // 澶勭悊澶氱骇鐮�
+ var num = boxData.Count(m => !string.IsNullOrWhiteSpace(m.BoxNo2));
+ if (num > 0)
+ {
+ list = boxData.GroupBy(m => new
+ {
+ m.BoxNo2
+ }).Select(it => new DataBoxInfoDto()
+ {
+ BoxNo2 = it.BoxNo2,
+ Qty2 = SqlFunc.AggregateSum(it.Qty)
+ }).ToList();
+ }
+ else
+ {
+ list = boxData.Select(it => new DataBoxInfoDto()
+ {
+ BoxNo2 = SqlFunc.IsNull(it.BoxNo3,""),
+ Qty2 = it.Qty
+ }).ToList();
+ }
+
+ // 绠辩爜淇℃伅璧嬪��
+ boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+ boxModel = boxData.GroupBy(m => new
+ {
+ m.BoxNo,
+ m.SkuName,
+ m.SkuNo,
+ m.LotNo,
+ m.SupplierLot,
+ m.InspectStatus
+ }).Select(it => new DataBoxDto()
+ {
+ BoxNo = it.BoxNo,
+ SkuName = it.SkuName,
+ SkuNo = it.SkuNo,
+ LotNo = it.LotNo,
+ SupplierLot = it.SupplierLot,
+ InspectStatus = it.InspectStatus == "0" ? "寰呮" : it.InspectStatus == "1" ? "鍚堟牸" : "涓嶅悎鏍�",
+ Qty = SqlFunc.AggregateSum(it.Qty)
+ }).First();
+ boxModel.InfoList = list;
+
+ return boxModel;
+ }
+ }
+ #endregion
+
}
}
--
Gitblit v1.8.0