From 096ccbee5905d5119e57a929fc19f49f9d5b6618 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 22 十一月 2025 08:35:44 +0800
Subject: [PATCH] 修改自动分配排除线边库
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 441 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 397 insertions(+), 44 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 581136c..47e0c36 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1,6 +1,9 @@
锘縰sing System;
using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
using System.Linq;
+using System.Reflection.Metadata;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
@@ -9,6 +12,7 @@
using Model.ModelDto;
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.PdaDto;
+using Model.ModelDto.SysDto;
using Newtonsoft.Json;
using SqlSugar;
using Utility;
@@ -409,24 +413,164 @@
#endregion
- #region 搴撳瓨鏌ヨ
+
/// <summary>
/// pda搴撳瓨鏌ヨ
/// </summary>
/// <param name="locatNo">鍌ㄤ綅缂栧彿</param>
/// <param name="palletNo">鎵樼洏鍙�</param>
+ /// <param name="boxNo">绠辩爜</param>
/// <returns></returns>
- public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo)
+ public List<StockDetailWithQtyDto> GetStockQueryList(string locatNo, string palletNo, string boxNo)
{
- return await Db.Queryable<DataStockDetail>()
- .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) || s.PalletNo.Contains(palletNo))
- .OrderBy(s => new { s.LotNo, s.LocatNo, s.PalletNo })
- .ToListAsync();
+ string dataSql = "", whereStr = "";
+ if (string.IsNullOrWhiteSpace(boxNo))
+ {
+ whereStr = string.IsNullOrWhiteSpace(locatNo) ? "1=1" : $@"LocatNo='{locatNo}'";
+
+ dataSql = $@"select SkuName,SkuNo,LotNo,LocatNo,PalletNo,sum(isnull(Qty,0)) as Qty,sum(isnull(LockQty,0)) as LockQty,sum(isnull(LockQty,0)) as FrozenQty
+ from DataStockDetail
+ where IsDel='0' and PalletNo='{palletNo}' and {whereStr}
+ group by SkuName,SkuNo,LotNo,LocatNo,PalletNo
+ order by SkuNo,LotNo";
+ }
+ else
+ {
+ whereStr = string.IsNullOrWhiteSpace(palletNo) ? "1=1" : $@"a.PalletNo='{palletNo}'";
+
+ dataSql = $@"select a.SkuName,a.SkuNo,a.LotNo,b.LocatNo,a.PalletNo,sum(isnull(a.Qty,0)) as Qty,0 as LockQty,0 as FrozenQty
+ from DataBoxInfo a
+ left join DataStockDetail b on b.Id=a.StockDetailId
+ where a.IsDel='0' and a.BoxNo='{boxNo}' and {whereStr}
+ group by a.SkuName,a.SkuNo,a.LotNo,b.LocatNo,a.PalletNo
+ order by a.SkuNo,a.LotNo";
+ }
+ DataTable dataDt = Db.Ado.GetDataTable(dataSql);
+
+ var result = dataDt.Rows.Cast<DataRow>().Select(e => new StockDetailWithQtyDto
+ {
+ LocatNo = e["LocatNo"] + "",
+ PalletNo = e["PalletNo"] + "",
+ SkuNo = e["SkuNo"] + "",
+ SkuName = e["SkuName"] + "",
+ LotNo = e["LotNo"] + "",
+ Qty = Convert.ToDecimal(e["Qty"]),
+ LockQty = Convert.ToDecimal(e["LockQty"]),
+ FrozenQty = Convert.ToDecimal(e["FrozenQty"])
+ });
+
+ return result.ToList();
}
+ #region 娉ㄩ噴浠ｇ爜
+ /*
+ public async Task<List<StockDetailWithQtyDto>> GetStockQueryList(string locatNo, string palletNo, string boxNo)
+ {
+ return await Db.Queryable<DataStockDetail>("a")
+ .InnerJoin<DataBoxInfo>((a, b) => a.LotNo == b.LotNo)
+ .Where((a, b) => a.IsDel == "0")
+ .WhereIF(!string.IsNullOrWhiteSpace(locatNo), (a, b) => a.LocatNo.Contains(locatNo))
+ .WhereIF(!string.IsNullOrWhiteSpace(palletNo), (a, b) => a.PalletNo.Contains(palletNo))
+ .WhereIF(!string.IsNullOrWhiteSpace(boxNo), (a, b) => b.BoxNo.Contains(boxNo))
+ .GroupBy((a, b) => new
+ {
+ a.LotNo,
+ a.LotText,
+ a.SupplierLot,
+ a.OwnerNo,
+ a.OwnerName,
+ a.SupplierNo,
+ a.SupplierName,
+ a.SkuNo,
+ a.SkuName,
+ a.Standard,
+ a.LockQty,
+ a.FrozenQty,
+ a.InspectQty,
+ a.ASNNo,
+ a.ASNDetailNo,
+ a.SONo,
+ a.WareHouseNo,
+ a.RoadwayNo,
+ a.AreaNo,
+ a.LocatNo,
+ a.PalletNo,
+ a.PalletNo2,
+ a.PalletNo3,
+ a.PalletTags,
+ a.CompleteTime,
+ a.ProductionTime,
+ a.ExpirationTime,
+ a.Status,
+ a.InspectMark,
+ a.BitPalletMark,
+ a.InspectStatus,
+ a.InspectTime,
+ a.PackagNo,
+ a.IsBale,
+ a.IsBelt,
+ a.UDF5,
+ a.IsDel,
+ a.CreateTime,
+ a.CreateUser,
+ a.UpdateTime,
+ a.UpdateUser,
+ a.Demo
+ })
+ .OrderBy((a, b) => new { a.LotNo, a.LocatNo, a.PalletNo })
+ .Select((a, b) => new StockDetailWithQtyDto
+ {
+ LotNo = a.LotNo,
+ LotText = a.LotText,
+ SupplierLot = a.SupplierLot,
+ OwnerNo = a.OwnerNo,
+ OwnerName = a.OwnerName,
+ SupplierNo = a.SupplierNo,
+ SupplierName = a.SupplierName,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ Standard = a.Standard,
+ Qty = SqlFunc.AggregateSum(b.Qty), // DataBoxInfo鐨凲ty瀛楁
+ LockQty = a.LockQty,
+ FrozenQty = a.FrozenQty,
+ InspectQty = a.InspectQty,
+ ASNNo = a.ASNNo,
+ ASNDetailNo = a.ASNDetailNo,
+ SONo = a.SONo,
+ WareHouseNo = a.WareHouseNo,
+ RoadwayNo = a.RoadwayNo,
+ AreaNo = a.AreaNo,
+ LocatNo = a.LocatNo,
+ PalletNo = a.PalletNo,
+ PalletNo2 = a.PalletNo2,
+ PalletNo3 = a.PalletNo3,
+ PalletTags = a.PalletTags,
+ CompleteTime = a.CompleteTime,
+ ProductionTime = a.ProductionTime,
+ ExpirationTime = a.ExpirationTime,
+ Status = a.Status,
+ InspectMark = a.InspectMark,
+ BitPalletMark = a.BitPalletMark,
+ InspectStatus = a.InspectStatus,
+ InspectTime = a.InspectTime,
+ PackagNo = a.PackagNo,
+ IsBale = a.IsBale,
+ IsBelt = a.IsBelt,
+ UDF5 = a.UDF5,
+ IsDel = a.IsDel,
+ CreateTime = a.CreateTime,
+ CreateUser = a.CreateUser,
+ UpdateTime = a.UpdateTime,
+ UpdateUser = a.UpdateUser,
+ Demo = a.Demo
+ })
+ .ToListAsync();
+ }
+ */
#endregion
+
#region 鎵樼洏鍙樻洿锛堟墭鐩樿В缁戠粦瀹氾級
@@ -733,15 +877,38 @@
if (models.WareHouseNo == "W02")
{
- storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04" && (w.AreaNo == "B01" || w.AreaNo == "B02")).OrderBy(o => o.AreaNo).ToListAsync();
+ storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04" && (w.AreaNo == "B01" || w.AreaNo == "B02" || w.AreaNo == "B05")).OrderBy(o => o.AreaNo).ToListAsync();
}
else
{
storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04").OrderBy(o => o.AreaNo).ToListAsync();
}
-
+
}
return storageArea;
+ }
+ /// <summary>
+ /// 鏍规嵁鍖哄煙鍙疯幏鍙栧偍浣嶅湴鍧�闆嗗悎
+ /// </summary>
+ /// <param name="areaNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public List<string> GetLocatByArea(string areaNo)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(areaNo))
+ {
+ throw new Exception("璇烽�夋嫨鍖哄煙");
+ }
+ var _list = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.AreaNo == areaNo && w.WareHouseNo == "W04").Select(s => s.LocatNo).ToList();
+
+ return _list;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
}
/// <summary>
/// 鑾峰彇宸插垎閰嶇殑鍑哄簱鍗曟嵁
@@ -785,7 +952,7 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="ruku"></param>
- public async Task AgvTransport(string palletNo, string areaNo, string ruku, string url, int userId)
+ /*public async Task AgvTransport(string palletNo, string areaNo, string ruku, string url, int userId)
{
try
{
@@ -951,6 +1118,192 @@
{
throw new Exception(e.Message);
}
+ }*/
+
+ public async Task AgvTransport(string palletNo, string areaNo, string locatNoEnd, string ruku, string url, int userId)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw Oops.Bah("璇锋壂鎻忔墭鐩樻潯鐮侊紒");
+ }
+ if (string.IsNullOrEmpty(areaNo) && string.IsNullOrEmpty(ruku))
+ {
+ throw Oops.Bah("璇烽�夋嫨鐩爣鍖哄煙鎴栧叆搴撳彛锛�");
+ }
+ if (!string.IsNullOrEmpty(areaNo) && !string.IsNullOrEmpty(ruku))
+ {
+ 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("鎵樼洏涓婄墿鏂欏簱瀛樻槑缁嗕俊鎭笉瀛樺湪,璇锋鏌�!");
+ }
+ if (!string.IsNullOrEmpty(areaNo))
+ {
+ var storageArea = await Db.Queryable<SysStorageArea>().FirstAsync(w => w.IsDel == "0" && w.AreaNo == areaNo);
+ if (storageArea == null)
+ {
+ throw Oops.Bah("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
+ }
+ if (!string.IsNullOrEmpty(locatNoEnd))
+ {
+ EndLocat = locatNoEnd;//鎸囧畾鍌ㄤ綅鍦板潃
+ }
+ else
+ {
+ EndLocat = await GetLocat(areaNo);//绯荤粺鍒嗛厤鍌ㄤ綅鍦板潃
+ }
+ }
+ else
+ {
+ EndLocat = ruku;
+ }
+ var stock = await Db.Queryable<DataStock>().FirstAsync(w => w.IsDel == "0" && w.SkuNo == stockDetail.SkuNo && w.LotNo == stockDetail.LotNo);
+ if (stock == null)
+ {
+ throw Oops.Bah("鎵樼洏涓婄墿鏂欏簱瀛樹俊鎭笉瀛樺湪,璇锋鏌�!");
+ }
+ if (string.IsNullOrEmpty(stockDetail.LocatNo))
+ {
+ throw Oops.Bah("鎵樼洏鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ if (stockDetail.WareHouseNo != "W04" && stockDetail.WareHouseNo != "W02")
+ {
+ throw Oops.Bah("璇ユ墭鐩樻湭鍦ㄥ钩搴撴垨璐ф灦搴撳唴,璇锋鏌�!");
+ }
+
+ //璧峰鍌ㄤ綅淇℃伅
+ var storageLocat = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == stockDetail.LocatNo);
+ if (storageLocat == null)
+ {
+ throw Oops.Bah("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ //鐩爣鍌ㄤ綅淇℃伅
+ var storageLocatEnd = new SysStorageLocat();
+ if (!string.IsNullOrEmpty(areaNo))
+ {
+ storageLocatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.WareHouseNo == "W04" && w.AreaNo == areaNo);
+ }
+ else
+ {
+ storageLocatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.WareHouseNo == "W04");
+ }
+ if (storageLocatEnd == null)
+ {
+ throw Oops.Bah("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ if ((storageLocatEnd.AreaNo == "B01" || storageLocatEnd.AreaNo == "B02" || storageLocatEnd.AreaNo == "B05") && storageLocatEnd.Status != "0")
+ {
+ throw Oops.Bah("鐩爣鍌ㄤ綅涓嶆槸绌洪棽鐘舵��,璇锋鏌�!");
+ }
+
+
+ //娣诲姞鍑哄簱浠诲姟
+ var taskNo = new Common().GetMaxNo("TK");
+ var moveTask = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+
+ StartLocat = stockDetail.LocatNo,//璧峰浣嶇疆
+ EndLocat = EndLocat,//鐩爣浣嶇疆
+ PalletNo = palletNo,//鎵樼洏鐮�
+ Msg = string.Format("杞繍浠诲姟锛歿0}=>>{1}", stockDetail.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();
+
+ //淇敼搴撳瓨鏄庣粏淇℃伅
+ //stockDetail.Status = "4";//绉诲簱閿佸畾
+ //stockDetail.LockQty = stockDetail.Qty;//閿佸畾搴撳瓨鏁伴噺
+ //await Db.Updateable(stockDetail).ExecuteCommandAsync();
+ ////淇敼搴撳瓨淇℃伅
+ //stock.LockQty += (decimal)stockDetail.Qty;
+ //await Db.Updateable(stock).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杞繍绌烘墭鐩�
@@ -1001,7 +1354,7 @@
{
throw Oops.Bah("璇ユ墭鐩樹俊鎭笉瀛樺湪!");
}
- if (palletInfo.Status!="0")
+ if (palletInfo.Status != "0")
{
throw Oops.Bah("璇ユ墭鐩樹笉鏄┖鎵樼洏!");
}
@@ -1011,7 +1364,7 @@
{
throw Oops.Bah("鑾峰彇鐩爣鍌ㄤ綅澶辫触!");
}
-
+
//璧峰鍌ㄤ綅淇℃伅
var storageLocat = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == locatNo);
if (storageLocat == null)
@@ -1286,7 +1639,7 @@
{
locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0")
.OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
- }
+ }
if (locatInfo2 != null)
{
@@ -1308,7 +1661,7 @@
#endregion
#region 闆剁瑙ｇ粦
- public void LingxingUnbind(string palletNo,string boxNo, int userId)
+ public void LingxingUnbind(string palletNo, string boxNo, int userId)
{
try
{
@@ -1406,19 +1759,19 @@
}
//寮�鍚簨鍔�
Db.BeginTran();
-
+
//搴撳瓨绠辨敮鏄庣粏淇℃伅
- var boxList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo).ToList();
+ var boxList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo && w.Status == "2").ToList();
if (boxList.Count != 1)
{
throw new Exception("璇ョ鐮佷俊鎭敊璇紝瀛樺湪澶氫釜姝ょ鐮佷俊鎭�");
}
var boxInfo = boxList.First();
- if (boxInfo.Qty<=devanQty)
+ if (boxInfo.Qty <= devanQty)
{
throw new Exception("鎷嗙鏁伴噺澶х瓑浜庡綋鍓嶇鍐呮暟閲�");
}
-
+
boxInfo.Qty -= devanQty;
boxInfo.BitBoxMark = "1";
//鏇存柊绠辩爜搴撳瓨琛�
@@ -1433,7 +1786,7 @@
//濡傛灉缁撴灉澶т簬0锛屽垯璇存槑绗竴涓瓧绗︿覆澶т簬绗簩涓瓧绗︿覆銆�
var maxBoxCode = maxBoxCode1;
var bol = String.CompareOrdinal(maxBoxCode1, maxBoxCode2);
- if (bol<0)
+ if (bol < 0)
{
maxBoxCode = maxBoxCode2;
}
@@ -1447,14 +1800,14 @@
BoxNo = boxNoNew,
Qty = devanQty,
FullQty = boxInfo.FullQty,
-
+
Status = "2",//0锛氭湭缁勬墭 1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷ｈ揣
LotNo = boxInfo.LotNo,
LotText = boxInfo.LotText,
SkuNo = boxInfo.SkuNo,
SkuName = boxInfo.SkuName,
Standard = boxInfo.Standard,
-
+
SupplierLot = boxInfo.SupplierLot,
InspectStatus = boxInfo.InspectStatus,
InspectMark = boxInfo.InspectMark,
@@ -1475,17 +1828,17 @@
#region 鑾峰彇鎷嗙鐨勪俊鎭墦鍗�
-
+
var data = new BoxListInfoDto()
{
SkuNo = boxInfo.SkuNo,
SkuName = boxInfo.SkuName,
LotNo = boxInfo.LotNo,
- BoxNoList = new List<string>() { boxNoNew } ,
+ BoxNoList = new List<string>() { boxNoNew },
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
return data;
@@ -1503,7 +1856,7 @@
{
try
{
- var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).GroupBy(m=>m.SONo).Select(m=>m.SONo).ToList();
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).GroupBy(m => m.SONo).Select(m => m.SONo).ToList();
if (stockDetail.Count == 0)
{
throw new Exception("娌℃湁鏌ヨ鍒版墭鐩樺簱瀛樹俊鎭�");
@@ -1563,7 +1916,7 @@
throw new Exception("搴撳瓨鎵樼洏娌℃湁淇℃伅");
}
var locate = stockDetail.First().LocatNo;
- var locatList = Db.Queryable<SysStorageLocat>().Where(m=>m.WareHouseNo == "W04" && (m.AreaNo == "B06" || m.AreaNo == "B07" || m.AreaNo == "B09") && m.IsDel == "0").ToList();
+ var locatList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == "W04" && (m.AreaNo == "B06" || m.AreaNo == "B07" || m.AreaNo == "B09" || m.AreaNo == "B24") && m.IsDel == "0").ToList();
var locat = locatList.FirstOrDefault(m => m.LocatNo == locate);
//鍒ゆ柇鎵樼洏鍌ㄤ綅鏄惁鍦ㄨ溅闂�
if (locat == null)
@@ -1573,14 +1926,14 @@
locat.Status = "0";
Db.Updateable(locat).ExecuteCommand();
//鍒ゆ柇鎵樼洏淇℃伅
-
+
foreach (var item in stockDetail)
{
if (item.UDF5 != "1" || string.IsNullOrWhiteSpace(item.SONo))
{
continue;
}
-
+
//item.WareHouseNo = "";
//item.RoadwayNo = "";
//item.AreaNo = "";
@@ -1627,20 +1980,20 @@
/// </summary>
/// <param name="boxNo"></param>
/// <param name="pallNo"></param>
- public void GetBoxInfo(string boxNo,string pallNo)
+ public void GetBoxInfo(string boxNo, string pallNo)
{
try
{
- var boxInfo = Db.Queryable<DataBoxInfo>().Where(m=>m.IsDel == "0" && m.BoxNo == boxNo).ToList();
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo).ToList();
if (!string.IsNullOrWhiteSpace(pallNo))
{
- boxInfo = boxInfo.Where(m=>m.PalletNo == pallNo).ToList();
+ boxInfo = boxInfo.Where(m => m.PalletNo == pallNo).ToList();
}
- if (boxInfo.Count!=1)
+ if (boxInfo.Count != 1)
{
throw new Exception("鏍囩淇℃伅閿欒锛岃鑱旂郴绠＄悊鍛�");
}
-
+
}
catch (Exception e)
{
@@ -1648,7 +2001,7 @@
}
}
- public void UpPalletByBox(string boxNo,string pallet,string palletNew,int userId)
+ public void UpPalletByBox(string boxNo, string pallet, string palletNew, int userId)
{
try
{
@@ -1657,13 +2010,13 @@
{
throw new Exception("鍙傛暟閿欒锛屾墭鐩樸�佹柊鎵樼洏銆佺鐮佸潎涓嶈兘涓虹┖");
}
- var boxInfoList = Db.Queryable<DataBoxInfo>().Where(m=>m.IsDel == "0" && m.BoxNo == boxNo).ToList();
+ 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 );
+ var detail1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == pallet && m.Id == boxInfo.StockDetailId);
if (detail1 == null)
{
throw new Exception("鏈煡璇㈠埌鎵樼洏鍜岀鐮佺殑搴撳瓨鏄庣粏");
@@ -1674,7 +2027,7 @@
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)
+ if (detailNewBl != null)
{
throw new Exception("鏂版墭鐩樹笂宸叉湁鍏朵粬鐗╂枡绠变俊鎭�");
}
@@ -1695,7 +2048,7 @@
detailNew.Qty = boxInfo.Qty;
detailNew.LockQty = 0;
detailNew.FrozenQty = 0;
- detailNew.InspectQty = 0;
+ detailNew.InspectQty = 0;
detailNew.ASNNo = "";
detailNew.PalletNo = palletNew;
@@ -1776,11 +2129,11 @@
try
{
var data = new List<SelectSkuLotNo>();
- var detailList = Db.Queryable<DataStockDetail>().Where(m=>m.IsDel == "0" && m.PalletNo == palletNo).ToList();
+ 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)
+ if (data.Count(m => m.DetailId == item.Id.ToString()) == 0)
{
data.Add(new SelectSkuLotNo()
{
@@ -1810,7 +2163,7 @@
/// <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)
+ public void UpPalletByQty(string palletNo, string palletNoNew, string detailId, decimal qty, int userId)
{
try
{
@@ -1819,11 +2172,11 @@
{
throw new Exception("鍙傛暟閿欒锛屾墭鐩樸�佹柊鎵樼洏銆佺墿鏂欐壒娆″潎涓嶈兘涓虹┖");
}
- if (qty<=0)
+ if (qty <= 0)
{
throw new Exception("鍙傛暟鏁伴噺涓嶈兘涓哄皬绛�0");
}
- var detailId2 = int.Parse(detailId);
+ var detailId2 = int.Parse(detailId);
var detail1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && m.Id == detailId2);
if (detail1 == null)
{
@@ -1834,7 +2187,7 @@
{
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;
@@ -1903,7 +2256,7 @@
Db.Updateable(detail1).ExecuteCommand();
}
-
+
//娣诲姞鎿嶄綔鏃ュ織
new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鎿嶄綔鏃ュ織", palletNo, "缂栬緫", $"鐗╂枡鎷嗘墭:{detail1.SkuName}鐗╂枡鎹㈡墭锛屽師鎵樼洏{palletNo}锛屾柊鎵樼洏{palletNoNew}", userId);
--
Gitblit v1.8.0