From a9513fe0529abf7d63a955b83a4e784ce531be4b Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 10 九月 2025 08:58:25 +0800
Subject: [PATCH] PDA AGV转运功能增加货架库到平库转运
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 542 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 471 insertions(+), 71 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 6c14235..9cfa5f7 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -124,7 +124,7 @@
if (pinStockDetail != null)
{
- if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�
+ if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�
{
var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id!= pinStockDetail.Id).ToList();
if (pinStockDetails.Count(m=>m.SONo != notice.SONo) > 0)
@@ -142,15 +142,19 @@
var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
if (newPalletInfo == null)
{
- var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
+ var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew &&(m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
- }
+ }
}
- //淇敼鏂版墭鐩樼姸鎬�
- newPalletInfo.Status = "1";
- await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
+ else
+ {
+ //淇敼鏂版墭鐩樼姸鎬�
+ newPalletInfo.Status = "1";
+ await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
+ }
+
}
var sd = new DataStockDetail();
@@ -212,10 +216,10 @@
throw Oops.Bah("璇ユ墭鐩樹笂娌℃湁鍙嫞璐х殑绠卞瓙");
}
var boxQty = await boxInfo.GroupBy(m => m.PalletNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
- if (boxQty[0] > needQty)
- {
- throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
- }
+ //if (boxQty[0] > needQty)
+ //{
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+ //}
var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
var comList = new List<BllCompleteDetail>();
@@ -269,7 +273,7 @@
await Db.Insertable(comList).ExecuteCommandAsync();
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += pickQty;
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
await Db.Updateable(allot).ExecuteCommandAsync();
@@ -333,10 +337,10 @@
throw Oops.Bah("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
}
var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
- if (boxQty[0] > needQty)
- {
- throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
- }
+ //if (boxQty[0] > needQty)
+ //{
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+ //}
foreach (var item in boxInfos)
{
@@ -392,7 +396,7 @@
await Db.Insertable(comList).ExecuteCommandAsync();
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += pickQty;
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
await Db.Updateable(allot).ExecuteCommandAsync();
@@ -401,6 +405,10 @@
stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
stockDetail.Qty -= pickQty;
stockDetail.LockQty -= pickQty;
+ if (stockDetail.LockQty < 0)
+ {
+ stockDetail.LockQty = 0;
+ }
stockDetail.UDF5 = "1";
if (stockDetail.Qty == stockDetail.LockQty)
{
@@ -458,9 +466,10 @@
if (isNew)
{
- sd.Qty = pickQty;
- sd.LockQty = pickQty;
- await Db.Updateable(sd).ExecuteCommandAsync();
+ var sdnew = Db.Queryable<DataStockDetail>().First(m => m.Id == sdId);
+ sdnew.Qty = pickQty;
+ sdnew.LockQty = pickQty;
+ await Db.Updateable(sdnew).ExecuteCommandAsync();
}
else
{
@@ -588,15 +597,18 @@
var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
if (newPalletInfo == null)
{
- var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
+ var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo && m.LotNo != stockDetail.LotNo)).ToList();
if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
}
}
- //淇敼鏂版墭鐩樼姸鎬�
- newPalletInfo.Status = "1";
- await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
+ else
+ {
+ //淇敼鏂版墭鐩樼姸鎬�
+ newPalletInfo.Status = "1";
+ await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
+ }
}
if (isNew)
@@ -723,7 +735,7 @@
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += int.Parse(PickQty);
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
await Db.Updateable(allot).ExecuteCommandAsync();
@@ -1467,6 +1479,333 @@
}
}
+ //杞﹂棿pda鎷ｈ揣 - 鏍囩
+ public async Task ChejianPick(string palletNo, string boxNo, int userId)
+ {
+ Db.BeginTran();
+ try
+ {
+ #region 鍒ゆ柇
+
+ if (string.IsNullOrWhiteSpace(palletNo))
+ {
+ throw Oops.Bah("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ if (string.IsNullOrEmpty(boxNo))
+ {
+ throw Oops.Bah("绠辩爜涓嶅彲涓虹┖");
+ }
+
+ //绠辩爜鏄庣粏
+ List<DataBoxInfo> boxInfos;
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+ if (await boxInfo.CountAsync() == 0)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
+ }
+ boxInfos = await boxInfo.ToListAsync();
+
+ //搴撳瓨鏄庣粏
+ var stockDetail = await Db.Queryable<DataStockDetail>()
+ .FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo
+ && m.SkuNo == boxInfos.First().SkuNo && m.LotNo == boxInfos.First().LotNo);
+ if (stockDetail == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨鏄庣粏淇℃伅锛�");
+ }
+ string lotNpstr = boxInfos.First().LotNo;
+ string skuNo = boxInfos.First().SkuNo;
+ string skuName = boxInfos.First().SkuName;
+
+ // 楠岃瘉鏄惁杞﹂棿绾胯竟浠撳簱
+ var areaList = new List<string>() { "B06", "B07", "B09" };
+ if (!areaList.Contains(stockDetail.AreaNo))
+ {
+ throw Oops.Bah("鎵樼洏涓嶆槸杞﹂棿鎵樼洏锛�");
+ }
+
+ //搴撳瓨鎬昏〃
+ var stock = await Db.Queryable<DataStock>()
+ .FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
+ if (stock == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨淇℃伅锛�");
+ }
+ #endregion
+
+ var pickQty = boxInfos.Sum(m => m.Qty);
+
+ // 鍒犻櫎绠变换鍔�
+ await Db.Deleteable(boxInfos).ExecuteCommandAsync();
+
+
+ //鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+ stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
+ stockDetail.Qty -= pickQty;
+ if (stockDetail.Qty == stockDetail.LockQty)
+ {
+ stockDetail.Status = "2";
+ }
+ else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
+ {
+ stockDetail.Status = "1";
+ }
+ else
+ {
+ stockDetail.Status = "0";
+ }
+
+ if (stockDetail.Qty <= 0)
+ {
+ await Db.Deleteable(stockDetail).ExecuteCommandAsync();
+ }
+ else
+ {
+ await Db.Updateable(stockDetail).ExecuteCommandAsync();
+ }
+ stock.Qty -= pickQty;
+ //stock.LockQty -= pickQty;
+ if (stock.Qty <= 0)
+ {
+ await Db.Deleteable(stock).ExecuteCommandAsync();
+ }
+ else
+ {
+ await Db.Updateable(stock).ExecuteCommandAsync();
+ }
+
+ var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == palletNo);
+ if (num2 <= 0)
+ {
+ //鏀瑰彉鎵樼洏鐘舵��
+ var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
+ if (pallet == null)
+ {
+ throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+ }
+ pallet.Status = "0";
+ await Db.Updateable(pallet).ExecuteCommandAsync();
+ }
+
+ #region 鎻掑叆杞﹂棿鍑哄叆搴撹褰曡〃
+ //鎻掑叆鍏ュ簱鏃ュ織
+ var _log = new LogWorkShop
+ {
+ Type = "1",//绫诲瀷锛�0锛氬叆搴� 1锛氬嚭搴�
+ PalletNo = palletNo,
+ BoxNo = boxNo,
+ LotNo = lotNpstr,
+ SkuNo = skuNo,
+ SkuName = skuName,
+ Qty = pickQty
+ };
+ // 鎻掑叆杞﹂棿鍑哄簱璁板綍
+ Db.Insertable(_log).ExecuteCommand();
+ #endregion
+
+
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "杞﹂棿鍑哄簱",
+ boxNo, "鍑哄簱", $"鍦≒DA涓婂绠卞彿涓猴細{boxNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
+ Db.CommitTran();
+ }
+ catch (AppFriendlyException e)
+ {
+ Db.RollbackTran();
+ }
+ catch (Exception e)
+ {
+ Db.RollbackTran();
+ throw new Exception(e.Message);
+ }
+ }
+
+ // 杞﹂棿Pda鎷ｈ揣-鏁伴噺
+ public async Task ChejianPickNum(PdaSoVm model, int userId)
+ {
+ Db.BeginTran();
+ try
+ {
+ #region 鍒ゆ柇
+
+ if (string.IsNullOrWhiteSpace(model.PalletNo))
+ {
+ throw Oops.Bah("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ if (string.IsNullOrWhiteSpace(model.SkuNo))
+ {
+ throw Oops.Bah("鐗╂枡缂栫爜涓嶈兘涓虹┖");
+ }
+
+ decimal skuNum = 0;
+ if (string.IsNullOrEmpty(model.PickQty))
+ {
+ throw Oops.Bah("鐗╂枡鏁伴噺涓嶅彲涓簄ull");
+ }
+ else
+ {
+ skuNum = decimal.Parse(model.PickQty);
+ if (skuNum <= 0)
+ {
+ throw Oops.Bah("鐗╂枡鏁伴噺搴斿ぇ浜�0锛�");
+ }
+ }
+
+ // 鍒ゆ柇鏄惁璐存爣鐗╂枡
+ var skuModel = await Db.Queryable<SysMaterials>().FirstAsync(m => m.IsDel == "0" && m.SkuNo == model.SkuNo);
+ if (skuModel == null)
+ {
+ throw Oops.Bah("鐗╂枡涓嶅瓨鍦紝璇锋鏌ョ墿鏂欑紪鐮佹槸鍚︽嫰鍗达紒");
+ }
+ else
+ {
+ if (skuModel.IsPasteCode != "0")
+ {
+ throw Oops.Bah("璇ョ墿鏂欎负璐存爣鐗╂枡锛岃鍒版爣绛鹃〉闈㈡嫞璐э紒");
+ }
+ }
+
+
+ //搴撳瓨鏄庣粏
+ var stockDetail = await Db.Queryable<DataStockDetail>()
+ .FirstAsync(m => m.IsDel == "0" && m.PalletNo == model.PalletNo
+ && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
+ if (stockDetail == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樹笂璐х墿鐨勫簱瀛樻槑缁嗕俊鎭紒");
+ }
+
+ // 楠岃瘉鏄惁杞﹂棿绾胯竟浠撳簱
+ var areaList = new List<string>() { "B06", "B07", "B09" };
+ if (!areaList.Contains(stockDetail.AreaNo))
+ {
+ throw Oops.Bah("鎵樼洏涓嶆槸杞﹂棿鎵樼洏锛�");
+ }
+
+ //搴撳瓨鎬昏〃
+ var stock = await Db.Queryable<DataStock>()
+ .FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
+ if (stock == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樹笂璐х墿鐨勫簱瀛樹俊鎭紒");
+ }
+ #endregion
+
+ var pickQty = skuNum;
+
+ //鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+ stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
+ stockDetail.Qty -= pickQty;
+ if (stockDetail.Qty == stockDetail.LockQty)
+ {
+ stockDetail.Status = "2";
+ }
+ else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
+ {
+ stockDetail.Status = "1";
+ }
+ else
+ {
+ stockDetail.Status = "0";
+ }
+
+ if (stockDetail.Qty <= 0)
+ {
+ await Db.Deleteable(stockDetail).ExecuteCommandAsync();
+ }
+ else
+ {
+ await Db.Updateable(stockDetail).ExecuteCommandAsync();
+ }
+ stock.Qty -= pickQty;
+ if (stock.Qty <= 0)
+ {
+ await Db.Deleteable(stock).ExecuteCommandAsync();
+ }
+ else
+ {
+ await Db.Updateable(stock).ExecuteCommandAsync();
+ }
+
+ var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
+ if (num2 <= 0)
+ {
+ //鏀瑰彉鎵樼洏鐘舵��
+ var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == model.PalletNo && m.IsDel == "0");
+ if (pallet == null)
+ {
+ throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+ }
+ pallet.Status = "0";
+ await Db.Updateable(pallet).ExecuteCommandAsync();
+ }
+
+ #region 鎻掑叆杞﹂棿鍑哄叆搴撹褰曡〃
+ // 鍒涘缓瀹炰綋
+ var _log = new LogWorkShop
+ {
+ Type = "1",//绫诲瀷锛�0锛氬叆搴� 1锛氬嚭搴�
+ PalletNo = model.PalletNo,
+ BoxNo = "",
+ LotNo = model.LotNo,
+ SkuNo = skuModel.SkuNo,
+ SkuName = skuModel.SkuName,
+ Qty = pickQty
+ };
+ // 鎻掑叆杞﹂棿鍑哄簱璁板綍
+ Db.Insertable(_log).ExecuteCommand();
+ #endregion
+
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "杞﹂棿鍑哄簱",
+ skuModel.SkuName, "鎷ｈ揣", $"鍦≒DA杞﹂棿鍑哄簱椤典笂瀵癸細锛歿skuModel.SkuName}鐨勭墿鏂欒繘琛屾嫞璐ф搷浣�", userId);
+ Db.CommitTran();
+ }
+ catch (AppFriendlyException e)
+ {
+ Db.RollbackTran();
+ }
+ catch (Exception e)
+ {
+ Db.RollbackTran();
+ throw new Exception(e.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅锛堣溅闂村叆搴�-鑾峰彇WMS鐢熸垚鐨勭淇℃伅锛�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public List<BoxInfoDto> GetWmsBoxInfos(string boxNo)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(boxNo))
+ {
+ throw new Exception("璇锋壂鎻忓绠辨潯鐮�!");
+ }
+
+ string sqlString = $@"SELECT BoxNo, SkuNo, SkuName, LotNo FROM DataBoxInfo
+ WHERE IsDel = '0' and BoxNo = '{boxNo}'
+ GROUP BY BoxNo,SkuNo,SkuName,LotNo; ";
+ var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
+
+ if (models.Count != 0)
+ {
+ return models;
+ }
+ else
+ {
+ throw new Exception("娌℃湁鏌ヨ鍒扮鐮佷俊鎭�");
+ }
+
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
#endregion
@@ -1521,6 +1860,27 @@
return allotList2;
}
+
+
+ //鑾峰彇鎵樼洏涓惈鏈夌殑鎵ц涓殑鍗曟嵁
+ public async Task<List<string>> GetPalletListBySo(string soNo, string soDetailId)
+ {
+ if (string.IsNullOrWhiteSpace(soNo))//鍒ゆ柇鎵樼洏鏄惁涓虹┖
+ {
+ throw Oops.Bah("鍑哄簱鍗曚负绌猴紝璇烽�夋嫨鍑哄簱鍗�");
+ }
+ if (string.IsNullOrWhiteSpace(soDetailId))
+ {
+ throw Oops.Bah("鍑哄簱鏄庣粏涓虹┖锛岃閫夋嫨鐗╂枡-鎵规");
+ }
+
+ var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "0" && m.SONo == soNo && m.SODetailNo == int.Parse(soDetailId)).Select(m => m.PalletNo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ return allotList;
+
+
+ }
+
+
//鑾峰彇鎵樼洏涓惈鏈夌殑鎵ц涓殑鍗曟嵁
public async Task<List<string>> GetRunNoticeList(string type)
@@ -1827,7 +2187,7 @@
{
throw Oops.Bah("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
}
- if (notice.Status != "3")
+ if (notice.Status != "3" && notice.Status != "4")
{
throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
}
@@ -1840,7 +2200,7 @@
}
//鍑哄簱鍒嗛厤淇℃伅
var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
- m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.SONo == soNo &&
+ m.IsDel == "0" && (m.Status == "2" || m.Status == "3" || m.Status == "5") && m.SONo == soNo &&
m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
if (allot == null)
{
@@ -1866,7 +2226,7 @@
if (string.IsNullOrWhiteSpace(boxNo))//鏁存墭鎷ｈ揣
{
List<DataBoxInfo> boxInfos;
- var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo);//鎵惧埌鎵樼洏涓婃墍鏈夌鐮�
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);//鎵惧埌鎵樼洏涓婃墍鏈夌鐮�
boxInfos = await boxInfo.ToListAsync();
if (boxInfo.Count() <= 0)
{
@@ -1922,7 +2282,7 @@
await Db.Insertable(comList).ExecuteCommandAsync();
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += pickQty;
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
await Db.Updateable(allot).ExecuteCommandAsync();
//鍒犻櫎搴撳瓨鏄庣粏
@@ -1930,6 +2290,10 @@
//鍒犻櫎鎴栦慨鏀瑰簱瀛�
stock.Qty -= pickQty;
stock.LockQty -= pickQty;
+ if (stock.LockQty < 0)
+ {
+ stock.LockQty = 0;
+ }
if (stock.Qty <= 0)
{
await Db.Deleteable(stock).ExecuteCommandAsync();
@@ -1938,14 +2302,20 @@
{
await Db.Updateable(stock).ExecuteCommandAsync();
}
- //鏀瑰彉鎵樼洏鐘舵�佷负锛氭湭浣跨敤
- var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
- if (pallet == null)
+ //鍒ゆ柇鎵樼洏涓婅繕鏈夋病鏈夊叾浠栫墿鏂�
+ var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
+ if (palletData == null)
{
- throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+ //鏀瑰彉鎵樼洏鐘舵�佷负锛氭湭浣跨敤
+ var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+ if (pallet == null)
+ {
+ throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+ }
+ pallet.Status = "0";
+ await Db.Updateable(pallet).ExecuteCommandAsync();
}
- pallet.Status = "0";
- await Db.Updateable(pallet).ExecuteCommandAsync();
+
//淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
noticeDetail.CompleteQty += pickQty;
await Db.Updateable(noticeDetail).ExecuteCommandAsync();
@@ -2005,10 +2375,10 @@
throw Oops.Bah("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
}
var boxQty = boxInfos.First().Qty;
- if (boxQty > needQty)
- {
- throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
- }
+ //if (boxQty > needQty)
+ //{
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
+ //}
foreach (var item in boxInfos)
{
@@ -2031,10 +2401,10 @@
{
throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
}
- if (Convert.ToInt32(pickQty1) > needQty)
- {
- throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
- }
+ //if (Convert.ToInt32(pickQty1) > needQty)
+ //{
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
+ //}
biaoShi = "2";
}
@@ -2049,10 +2419,10 @@
throw Oops.Bah("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
}
var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
- if (boxQty[0] > needQty)
- {
- throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
- }
+ //if (boxQty[0] > needQty)
+ //{
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+ //}
foreach (var item in boxInfos)
{
@@ -2126,7 +2496,7 @@
await Db.Insertable(comList).ExecuteCommandAsync();
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += pickQty;
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
if (allot.Status == "5")
{
@@ -2138,6 +2508,10 @@
stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
stockDetail.Qty -= pickQty;
stockDetail.LockQty -= pickQty;
+ if (stockDetail.LockQty < 0)
+ {
+ stockDetail.LockQty = 0;
+ }
if (stockDetail.Qty == stockDetail.LockQty)
{
stockDetail.Status = "2";
@@ -2161,6 +2535,10 @@
}
stock.Qty -= pickQty;
stock.LockQty -= pickQty;
+ if (stock.LockQty < 0)
+ {
+ stock.LockQty = 0;
+ }
if (stock.Qty <= 0)
{
await Db.Deleteable(stock).ExecuteCommandAsync();
@@ -2214,10 +2592,10 @@
var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鍑哄簱", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
Db.CommitTran();
}
- catch (AppFriendlyException e)
- {
- Db.RollbackTran();
- }
+ //catch (AppFriendlyException e)
+ //{
+ // Db.RollbackTran();
+ //}
catch (Exception e)
{
Db.RollbackTran();
@@ -2265,7 +2643,7 @@
}
//鍑哄簱鍒嗛厤淇℃伅
var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
- m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.SONo == soNo &&
+ m.IsDel == "0" && (m.Status == "2" || m.Status == "3" || m.Status == "5") && m.SONo == soNo &&
m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
if (allot == null)
{
@@ -2345,7 +2723,7 @@
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += int.Parse(PickQty);
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
await Db.Updateable(allot).ExecuteCommandAsync();
@@ -2355,6 +2733,10 @@
stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
stockDetail.Qty -= int.Parse(PickQty);
stockDetail.LockQty -= int.Parse(PickQty);
+ if (stockDetail.LockQty < 0)
+ {
+ stockDetail.LockQty = 0;
+ }
if (stockDetail.Qty == stockDetail.LockQty)
{
stockDetail.Status = "2";
@@ -2366,7 +2748,7 @@
else
{
stockDetail.Status = "0";
- }
+ }
if (stockDetail.Qty <= 0)
{
await Db.Deleteable(stockDetail).ExecuteCommandAsync();
@@ -2396,7 +2778,9 @@
}
//鍒ゆ柇鎵樼洏涓婄墿鏂欐槸鍚︽嫞璐у畬姣�
- if (isDel == 0)
+ //鍒ゆ柇鎵樼洏涓婅繕鏈夋病鏈夊叾浠栫墿鏂�
+ var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
+ if (isDel == 0 && palletData == null)
{
pallet.Status = "0";
await Db.Updateable(pallet).ExecuteCommandAsync();
@@ -2458,8 +2842,8 @@
//鑾峰彇褰撳墠鏃堕棿
DateTime serverTime = Db.GetDate();
//鑾峰彇搴撳瓨鏄庣粏鏄惁灏忎簬绛変簬璇ュ灈鏁�
-
- var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && !string.IsNullOrWhiteSpace(s.WareHouseNo)).ToListAsync();
+
+ var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && s.WareHouseNo == "W02").ToListAsync();
if (stockDetail.Count > 0)
{
//鍒ゆ柇鏄惁澶т簬闇�瑕佸灈鏁�
@@ -2468,6 +2852,7 @@
throw Oops.Bah("闇�瑕佸灈鏁板ぇ浜庡簱瀛樺灈鏁帮紝璇烽噸鏂拌緭鍏�!");
}
}
+ //stockDetail = new AllotSku().GetDataListOrder(stockDetail);
//鑾峰彇搴撳瓨鎬昏〃淇℃伅
var stock = await Db.Queryable<DataStock>().FirstAsync(s => s.IsDel == "0" && s.SkuNo == "100099");
//楠岃瘉搴撳瓨鎬昏〃鏄惁涓虹┖
@@ -2475,16 +2860,26 @@
{
throw Oops.Bah("搴撳瓨淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
}
-
+ //鐩爣鍌ㄤ綅淇℃伅
+ var endLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.OutMode);
+ if (endLocat == null)
+ {
+ throw Oops.Bah("搴撳瓨淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
+ }
+ //if (endLocat.Status != "0")
+ //{
+ // throw Oops.Bah("鐩爣鍌ㄤ綅涓嶆槸绌哄偍浣嶏紝璇锋牳鏌�!");
+ //}
int i = 0;
+ //寮�鍚簨鍔�
Db.BeginTran();
//閬嶅巻搴撳瓨淇℃伅
foreach (var s in stockDetail)
{
//鑾峰彇鍌ㄤ綅淇℃伅
- var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && (l.WareHouseNo == "W01"||l.WareHouseNo == "W02"));
+ var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W02");
if (locat == null)
{
@@ -2498,7 +2893,7 @@
locat.Status = "3"; //3 鍑哄簱涓�
locat.UpdateTime = serverTime; //淇敼鏃堕棿
locat.UpdateUser = userId; //淇敼浜�
- //淇敼鍌ㄤ綅淇℃伅
+ //淇敼鍌ㄤ綅淇℃伅
await Db.Updateable(locat).ExecuteCommandAsync();
//澧炲姞搴撳瓨閿佸畾鏁伴噺
@@ -2543,7 +2938,7 @@
Status = "1",
LogisticsId = 0,
IsAdvance = "0",
- OutMode = model.OutMode,//鍑哄簱鍙�
+ OutMode = model.OutMode,//鍑哄簱鐩爣鍌ㄤ綅
CreateUser = userId,
CreateTime = DateTime.Now
@@ -2571,7 +2966,7 @@
Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "1",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- CreateTime = serverTime, //鍒涘缓鏃堕棿
+ CreateTime = Db.GetDate(), //鍒涘缓鏃堕棿
CreateUser = userId, //鍒涘缓浜�
Msg = "Pda绌烘墭浠�" + s.LocatNo + "鍒�" + model.OutMode + "鐨勫嚭搴撲换鍔�", //鍏抽敭淇℃伅
//FinishDate = serverTime, //瀹屾垚鏃堕棿
@@ -2594,7 +2989,7 @@
EndRoadway = endroad,
Order = 999,
- Type = locat.WareHouseNo == "W01"?PLCTypeEnum.ShuttleCar : PLCTypeEnum.AGV
+ Type = PLCTypeEnum.AGV,//locat.WareHouseNo == "W01"?PLCTypeEnum.ShuttleCar : PLCTypeEnum.AGV
});
await Db.Insertable(exTask).ExecuteCommandAsync();
@@ -3484,7 +3879,7 @@
await Db.Insertable(comList).ExecuteCommandAsync();
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += pickQty;
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
if (allot.Status == "5")
{
@@ -3497,6 +3892,10 @@
stockDetail.InspectMark = "1"; //鎶芥鎵樻爣璇�
stockDetail.Qty -= pickQty;
stockDetail.LockQty -= pickQty;
+ if (stockDetail.LockQty < 0)
+ {
+ stockDetail.LockQty = 0;
+ }
if (stockDetail.Qty == stockDetail.LockQty)
{
stockDetail.Status = "2";
@@ -3520,6 +3919,10 @@
}
stock.Qty -= pickQty;
stock.LockQty -= pickQty;
+ if (stock.LockQty < 0)
+ {
+ stock.LockQty = 0;
+ }
stock.IsSampling = "1";
if (stock.Qty <= 0)
{
@@ -3952,7 +4355,7 @@
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += int.Parse(PickQty);
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
await Db.Updateable(allot).ExecuteCommandAsync();
@@ -4277,7 +4680,7 @@
await Db.Insertable(comList).ExecuteCommandAsync();
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += pickQty;
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
await Db.Updateable(allot).ExecuteCommandAsync();
@@ -4488,7 +4891,7 @@
await Db.Insertable(comList).ExecuteCommandAsync();
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += pickQty;
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
if (allot.Status == "5")
{
@@ -4812,7 +5215,7 @@
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += int.Parse(PickQty);
- allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
await Db.Updateable(allot).ExecuteCommandAsync();
@@ -4936,9 +5339,6 @@
return data;
}
-
-
-
#endregion
}
--
Gitblit v1.8.0