From 86e443e42c4bee972c5b795def4917e02f98ce40 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 11 七月 2025 16:45:08 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 436 insertions(+), 8 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index e1297a5..0c2ac49 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -420,7 +420,7 @@
public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo)
{
return await Db.Queryable<DataStockDetail>()
- .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) && s.PalletNo.Contains(palletNo))
+ .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) || s.PalletNo.Contains(palletNo))
.OrderBy(s => new { s.LotNo, s.LocatNo, s.PalletNo })
.ToListAsync();
@@ -947,6 +947,166 @@
}
}
/// <summary>
+ /// 鍛煎彨agv杞繍绌烘墭鐩�
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="areaNo"></param>
+ /// <param name="locatNo"></param>
+ /// <param name="url"></param>
+ /// <param name="userId"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public async Task AgvNullPallet(string palletNo, string areaNo, string locatNo, string url, int userId)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw Oops.Bah("璇锋壂鎻忔墭鐩樻潯鐮侊紒");
+ }
+ if (string.IsNullOrEmpty(locatNo))
+ {
+ throw Oops.Bah("璇锋壂鎻忚捣濮嬪湴鐮侊紒");
+ }
+ if (string.IsNullOrEmpty(areaNo))
+ {
+ throw Oops.Bah("璇烽�夋嫨鐩爣鍖哄煙锛�");
+ }
+ string EndLocat = string.Empty;//鐩爣浣嶇疆
+
+ var log = await Db.Queryable<LogTask>().FirstAsync(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
+ if (log != null)
+ {
+ throw Oops.Bah("璇ユ墭鐩樺凡鏈夌瓑寰呮墽琛屾垨姝ｅ湪鎵ц鐨勪换鍔�!");
+ }
+ var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(w => w.IsDel == "0" && w.PalletNo == palletNo);
+ if (stockDetail != null)
+ {
+ throw Oops.Bah("鎵樼洏涓婄墿鏂欏瓨鍦ㄥ簱瀛樻槑缁嗕俊鎭�,璇锋鏌�!");
+ }
+
+ var storageArea = await Db.Queryable<SysStorageArea>().FirstAsync(w => w.IsDel == "0" && w.AreaNo == areaNo);
+ if (storageArea == null)
+ {
+ throw Oops.Bah("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
+ }
+ var palletInfo = await Db.Queryable<SysPallets>().FirstAsync(w => w.IsDel == "0" && w.PalletNo == palletNo);
+ if (palletInfo == null)
+ {
+ throw Oops.Bah("璇ユ墭鐩樹俊鎭笉瀛樺湪!");
+ }
+ if (palletInfo.Status!="0")
+ {
+ throw Oops.Bah("璇ユ墭鐩樹笉鏄┖鎵樼洏!");
+ }
+ //鏍规嵁鐩爣鍖哄煙鑾峰彇鐩爣鍌ㄤ綅鍦板潃
+ EndLocat = await GetLocat(areaNo);
+
+ //璧峰鍌ㄤ綅淇℃伅
+ var storageLocat = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == locatNo);
+ if (storageLocat == null)
+ {
+ throw Oops.Bah("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ //鐩爣鍌ㄤ綅淇℃伅
+ //var storageLocatEnd = new SysStorageLocat();
+
+ var storageLocatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0");
+ if (storageLocatEnd == null)
+ {
+ throw Oops.Bah("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+
+ //娣诲姞鍑哄簱浠诲姟
+ var taskNo = new Common().GetMaxNo("TK");
+ var moveTask = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+
+ StartLocat = storageLocat.LocatNo,//璧峰浣嶇疆
+ EndLocat = EndLocat,//鐩爣浣嶇疆
+ PalletNo = palletNo,//鎵樼洏鐮�
+ Msg = string.Format("杞繍浠诲姟锛歿0}=>>{1}", storageLocat.LocatNo, EndLocat),
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+
+ CreateTime = DateTime.Now
+ };
+ await Db.Insertable(moveTask).ExecuteCommandAsync();
+
+ //淇敼璧峰鍌ㄤ綅鍦板潃鐘舵��
+ storageLocat.Status = "5";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ await Db.Updateable(storageLocat).ExecuteCommandAsync();
+
+ //淇敼鐩爣鍌ㄤ綅鍦板潃鐘舵��
+ //if (storageLocatEnd != null)
+ //{
+ // storageLocatEnd.Status = "4";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ // await Db.Updateable(storageLocatEnd).ExecuteCommandAsync();
+ //}
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV绌烘墭杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
+
+ var outDto = new List<OutCommandDto>
+ {
+ new OutCommandDto()
+ {
+ TaskNo = moveTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "2",// 浠诲姟绫诲瀷 0鍏� 1鍑� 2绉�
+ PalletNo = moveTask.PalletNo,//鎵樼洏鍙�
+
+ StartLocate = moveTask.StartLocat, // 璧峰浣嶇疆
+ EndLocate = EndLocat, // 鐩爣浣嶇疆
+
+ Order = 999,
+ Type = PLCTypeEnum.AGV
+
+ }
+ };
+
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ var list2 = outDto.Select(m => m.TaskNo).ToList();
+ var jsonData = JsonConvert.SerializeObject(outDto);
+ string response = "";
+
+ try
+ {
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+ var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+ //瑙ｆ瀽杩斿洖鏁版嵁
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
+ if (wcsModel.code == 200)
+ {
+ // 鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list2, time1, time2);
+ }
+ else
+ {
+ new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
+ throw new Exception(wcsModel.message);
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+ /// <summary>
/// agv杞繍鍛煎彨灏忚溅鍙栬揣
/// </summary>
/// <param name="soNo"></param>
@@ -1303,9 +1463,8 @@
SkuName = boxInfo.SkuName,
LotNo = boxInfo.LotNo,
BoxNoList = new List<string>() { boxNoNew } ,
- Date1 = boxInfo.ProductionTime.ToString(),
- Date2 = boxInfo.ExpirationTime.ToString(),
-
+ Date1 = boxInfo.ProductionTime == null ? "" : Convert.ToDateTime(boxInfo.ProductionTime).ToString("yyyy-MM-dd"),
+ Date2 = boxInfo.ExpirationTime == null ? "" : Convert.ToDateTime(boxInfo.ExpirationTime).ToString("yyyy-MM-dd"),
};
#endregion
@@ -1444,12 +1603,15 @@
#region 鐗╂枡鎷嗘墭 锛堟爣绛俱�佹暟閲忥級
+ /// <summary>
+ /// 鏌ヨ绠变俊鎭�
+ /// </summary>
+ /// <param name="boxNo"></param>
+ /// <param name="pallNo"></param>
public void GetBoxInfo(string boxNo,string pallNo)
{
try
{
-
-
var boxInfo = Db.Queryable<DataBoxInfo>().Where(m=>m.IsDel == "0" && m.BoxNo == boxNo).ToList();
if (!string.IsNullOrWhiteSpace(pallNo))
{
@@ -1459,8 +1621,274 @@
{
throw new Exception("鏍囩淇℃伅閿欒锛岃鑱旂郴绠＄悊鍛�");
}
-
-
+
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ public void UpPalletByBox(string boxNo,string pallet,string palletNew,int userId)
+ {
+ try
+ {
+ Db.BeginTran();
+ if (string.IsNullOrWhiteSpace(boxNo) || string.IsNullOrWhiteSpace(pallet) || string.IsNullOrWhiteSpace(palletNew))
+ {
+ throw new Exception("鍙傛暟閿欒锛屾墭鐩樸�佹柊鎵樼洏銆佺鐮佸潎涓嶈兘涓虹┖");
+ }
+ var boxInfoList = Db.Queryable<DataBoxInfo>().Where(m=>m.IsDel == "0" && m.BoxNo == boxNo).ToList();
+ if (boxInfoList.Count != 1)
+ {
+ throw new Exception("鏍囩淇℃伅鏁伴噺涓嶆槸1鏉�");
+ }
+ var boxInfo = boxInfoList.First();
+ var detail1 = Db.Queryable<DataStockDetail>().First(m=>m.IsDel == "0" && m.PalletNo == pallet && m.Id == boxInfo.StockDetailId );
+ if (detail1 == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鎵樼洏鍜岀鐮佺殑搴撳瓨鏄庣粏");
+ }
+ var palletInfoNew = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNew);
+ if (palletInfoNew == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鏂版墭鐩樹俊鎭�");
+ }
+ var detailNewBl = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNew && (m.SkuNo != boxInfo.SkuNo || m.LotNo != boxInfo.LotNo));
+ if (detailNewBl!=null)
+ {
+ throw new Exception("鏂版墭鐩樹笂宸叉湁鍏朵粬鐗╂枡绠变俊鎭�");
+ }
+ //娣诲姞/鏇存柊搴撳瓨鎵樼洏淇℃伅
+ var detailNew1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNew && m.SkuNo == boxInfo.SkuNo && m.LotNo == boxInfo.LotNo);
+ var newId = 0;
+ if (detailNew1 == null)//add
+ {
+ var detailNew = new DataStockDetail();
+ detailNew.SkuNo = detail1.SkuNo;
+ detailNew.SkuName = detail1.SkuName;
+ detailNew.LotNo = detail1.LotNo;
+ detailNew.LotText = detail1.LotText;
+ detailNew.SupplierLot = detail1.SupplierLot;
+ detailNew.SupplierNo = detail1.SupplierNo;
+ detailNew.SupplierName = detail1.SupplierName;
+ detailNew.Standard = detail1.Standard;
+ detailNew.Qty = boxInfo.Qty;
+ detailNew.LockQty = 0;
+ detailNew.FrozenQty = 0;
+ detailNew.InspectQty = 0;
+ detailNew.ASNNo = "";
+
+ detailNew.PalletNo = palletNew;
+ detailNew.ProductionTime = detail1.ProductionTime;
+ detailNew.ExpirationTime = detail1.ExpirationTime;
+ detailNew.PalletTags = "0";
+ detailNew.CompleteTime = DateTime.Now;
+ detailNew.Status = "0";
+ detailNew.InspectMark = detail1.InspectMark;
+ detailNew.BitPalletMark = "1";
+ detailNew.InspectStatus = detail1.InspectStatus;
+ detailNew.PackagNo = detail1.PackagNo;
+ detailNew.IsBale = detail1.IsBale;
+ detailNew.IsBelt = detail1.IsBelt;
+ detailNew.IsDel = "0";
+ detailNew.CreateTime = DateTime.Now;
+ detailNew.CreateUser = 0;
+
+
+ newId = Db.Insertable(detailNew).ExecuteReturnIdentity();
+ }
+ else //update
+ {
+ detailNew1.Qty += boxInfo.Qty;
+ detailNew1.PalletNo = palletNew;
+
+ Db.Updateable(detailNew1).ExecuteCommand();
+ newId = detailNew1.Id;
+ }
+ //鏇存柊鎵樼洏鐘舵��
+ palletInfoNew.Status = "1";
+ Db.Updateable(palletInfoNew).ExecuteCommand();
+
+ //鏇存敼鍘熸墭鐩樹俊鎭�
+ detail1.Qty -= boxInfo.Qty;
+ detail1.BitPalletMark = "1";
+ if (detail1.Qty <= 0)
+ {
+ //鏇存柊鍘熸墭鐩樼姸鎬�
+ var palletInfo = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == pallet);
+ palletInfo.Status = "0";
+ Db.Updateable(palletInfo).ExecuteCommand();
+
+ Db.Deleteable(detail1).ExecuteCommand();
+ }
+ else
+ {
+ Db.Updateable(detail1).ExecuteCommand();
+ }
+
+ //鏇存柊搴撳瓨绠变俊鎭�
+ boxInfo.StockDetailId = newId;
+ boxInfo.BindNo = 0;
+ boxInfo.PalletNo = palletNew;
+ Db.Updateable(boxInfo).ExecuteCommand();
+ //娣诲姞鎿嶄綔鏃ュ織
+ new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鎿嶄綔鏃ュ織", boxNo, "缂栬緫", $"鐗╂枡鎷嗘墭锛氱鐮侊細{boxNo}鎹㈡墭锛屽師鎵樼洏{pallet}锛屾柊鎵樼洏{palletNew}", userId);
+
+ Db.CommitTran();
+ }
+ catch (Exception e)
+ {
+ Db.RollbackTran();
+ throw new Exception(e.Message);
+ }
+ }
+
+ //鏁伴噺椤电-----------------------------------------------------------------------------------------------------------------------------------------
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鑾峰彇鎵樼洏涓婄殑鐗╂枡鎵规淇℃伅
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public List<SelectSkuLotNo> GetSelectSkuLotNo(string palletNo)
+ {
+ try
+ {
+ var data = new List<SelectSkuLotNo>();
+ var detailList = Db.Queryable<DataStockDetail>().Where(m=>m.IsDel == "0" && m.PalletNo == palletNo).ToList();
+
+ foreach (var item in detailList)
+ {
+ if (data.Count(m=>m.DetailId == item.Id.ToString()) == 0)
+ {
+ data.Add(new SelectSkuLotNo()
+ {
+ SkuNo = item.SkuNo,
+ SkuName = item.SkuName,
+ LotNo = item.LotNo,
+ DetailId = item.Id.ToString(),
+ });
+ }
+ }
+ return data;
+
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+
+ /// <summary>
+ /// 鎷嗘墭-鏁伴噺
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="palletNoNew"></param>
+ /// <param name="detailId"></param>
+ /// <param name="qty"></param>
+ /// <param name="userId"></param>
+ /// <exception cref="Exception"></exception>
+ public void UpPalletByQty(string palletNo,string palletNoNew,string detailId,decimal qty,int userId)
+ {
+ try
+ {
+ Db.BeginTran();
+ if (string.IsNullOrWhiteSpace(detailId) || string.IsNullOrWhiteSpace(palletNo) || string.IsNullOrWhiteSpace(palletNoNew))
+ {
+ throw new Exception("鍙傛暟閿欒锛屾墭鐩樸�佹柊鎵樼洏銆佺墿鏂欐壒娆″潎涓嶈兘涓虹┖");
+ }
+ if (qty<=0)
+ {
+ throw new Exception("鍙傛暟鏁伴噺涓嶈兘涓哄皬绛�0");
+ }
+ var detailId2 = int.Parse(detailId);
+ var detail1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && m.Id == detailId2);
+ if (detail1 == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鎵樼洏搴撳瓨鏄庣粏");
+ }
+ var palletInfoNew = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
+ if (palletInfoNew == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鏂版墭鐩樹俊鎭�");
+ }
+
+ //娣诲姞/鏇存柊搴撳瓨鎵樼洏淇℃伅
+ var detailNew1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == detail1.SkuNo && m.LotNo == detail1.LotNo);
+ var newId = 0;
+ if (detailNew1 == null)//add
+ {
+ var detailNew = new DataStockDetail();
+ detailNew.SkuNo = detail1.SkuNo;
+ detailNew.SkuName = detail1.SkuName;
+ detailNew.LotNo = detail1.LotNo;
+ detailNew.LotText = detail1.LotText;
+ detailNew.SupplierLot = detail1.SupplierLot;
+ detailNew.SupplierNo = detail1.SupplierNo;
+ detailNew.SupplierName = detail1.SupplierName;
+ detailNew.Standard = detail1.Standard;
+ detailNew.Qty = qty;
+ detailNew.LockQty = 0;
+ detailNew.FrozenQty = 0;
+ detailNew.InspectQty = 0;
+ detailNew.ASNNo = "";
+
+ detailNew.PalletNo = palletNoNew;
+ detailNew.ProductionTime = detail1.ProductionTime;
+ detailNew.ExpirationTime = detail1.ExpirationTime;
+ detailNew.PalletTags = "0";
+ detailNew.CompleteTime = DateTime.Now;
+ detailNew.Status = "0";
+ detailNew.InspectMark = detail1.InspectMark;
+ detailNew.BitPalletMark = "1";
+ detailNew.InspectStatus = detail1.InspectStatus;
+ detailNew.PackagNo = detail1.PackagNo;
+ detailNew.IsBale = detail1.IsBale;
+ detailNew.IsBelt = detail1.IsBelt;
+ detailNew.IsDel = "0";
+ detailNew.CreateTime = DateTime.Now;
+ detailNew.CreateUser = 0;
+
+
+ newId = Db.Insertable(detailNew).ExecuteReturnIdentity();
+ }
+ else //update
+ {
+ detailNew1.Qty += qty;
+ detailNew1.PalletNo = palletNoNew;
+
+ Db.Updateable(detailNew1).ExecuteCommand();
+ newId = detailNew1.Id;
+ }
+ //鏇存柊鎵樼洏鐘舵��
+ palletInfoNew.Status = "1";
+ Db.Updateable(palletInfoNew).ExecuteCommand();
+
+ //鏇存敼鍘熸墭鐩樹俊鎭�
+ detail1.Qty -= qty;
+ detail1.BitPalletMark = "1";
+ if (detail1.Qty <= 0)
+ {
+ //鏇存柊鍘熸墭鐩樼姸鎬�
+ var palletInfo = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+ palletInfo.Status = "0";
+ Db.Updateable(palletInfo).ExecuteCommand();
+
+ Db.Deleteable(detail1).ExecuteCommand();
+ }
+ else
+ {
+ Db.Updateable(detail1).ExecuteCommand();
+ }
+
+
+ //娣诲姞鎿嶄綔鏃ュ織
+ new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鎿嶄綔鏃ュ織", palletNo, "缂栬緫", $"鐗╂枡鎷嗘墭:{detail1.SkuName}鐗╂枡鎹㈡墭锛屽師鎵樼洏{palletNo}锛屾柊鎵樼洏{palletNoNew}", userId);
+
+ Db.CommitTran();
}
catch (Exception e)
{
--
Gitblit v1.8.0