From c5ba5ced45cddbe2fb4964dddc620f8fcecce6af Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 17 九月 2025 17:54:24 +0800
Subject: [PATCH] 修改PDA组托收货功能
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 445 +++++++++++++++++++++++++++++++++++++++++++++++++
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 37 ++-
2 files changed, 471 insertions(+), 11 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 657aebb..f854f15 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -126,11 +126,11 @@
throw new Exception("褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
}
//鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱澶�
- var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
- if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
- {
- throw new Exception("璇ユ墭鐩樺凡鏈夊偍浣嶄俊鎭紝涓嶅彲缁勬墭锛岃鏍稿疄锛�");
- }
+ //var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
+ //if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
+ //{
+ // throw new Exception("璇ユ墭鐩樺凡鏈夊偍浣嶄俊鎭紝涓嶅彲缁勬墭锛岃鏍稿疄锛�");
+ //}
#endregion
@@ -272,13 +272,13 @@
}
// 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�
- var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo);
+ var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && m.LotNo == detail.LotNo && m.SkuNo == detail.SkuNo);// && m.ASNDetailNo == bind.ASNDetailNo
var sdId1 = 0;
if (sd1 != null)
{
sdId1 = sd1.Id;
// 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
- sd1.Qty = bind.Qty;
+ sd1.Qty += bind.Qty;
sd1.CompleteTime = comTime;
sd1.UpdateUser = userId;
sd1.UpdateTime = comTime;
@@ -286,7 +286,7 @@
Db.Updateable(sd1).ExecuteCommand();
}
else
- {
+ {
// 搴撳瓨涓嶅瓨鍦� 鎻掑叆鏁版嵁
sd1 = new DataStockDetail()
{
@@ -325,6 +325,14 @@
CreateUser = 0,
CreateTime = comTime
};
+ var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == sd1.PalletNo && !string.IsNullOrEmpty(w.LocatNo));
+ if (palletData != null)
+ {
+ sd1.WareHouseNo = palletData.WareHouseNo;
+ sd1.RoadwayNo = palletData.RoadwayNo;
+ sd1.AreaNo = palletData.AreaNo;
+ sd1.LocatNo = palletData.LocatNo;
+ }
//缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭� //0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠ｅ偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")
@@ -484,6 +492,10 @@
}
detail.UpdateUser = userId;
detail.UpdateTime = comTime;
+ if (notice.Type == "4" || notice.Type == "8")
+ {
+ detail.InspectStatus = "1";//杞﹂棿閫�鏂欓粯璁ゆ楠屽悎鏍�
+ }
//鏇存柊鍏ュ簱鍗曟槑缁�
Db.Updateable(detail).ExecuteCommand();
@@ -504,7 +516,10 @@
#endregion
#region 搴撳瓨鏄庣粏
- sd1.Qty = bind.Qty;
+ if (sd1.Qty <= 0)
+ {
+ sd1.Qty = bind.Qty;
+ }
//鏇存敼搴撳瓨鏄庣粏鏁伴噺
Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
#endregion
@@ -1822,7 +1837,7 @@
}
}
- else if (notice.Type == "1" || notice.Type == "4") //閲囪喘鍏ュ簱
+ else if (notice.Type == "1" || notice.Type == "4" || notice.Type == "8") //閲囪喘鍏ュ簱
{
string sqlString = $@"SELECT
ASNNo,
@@ -2726,7 +2741,7 @@
ExpirationTime = boxInfoOne.ExpirationTime,
Status = "0",
InspectMark = boxInfoOne.InspectMark,
- InspectStatus = sku.IsInspect,
+ InspectStatus = "1",//sku.IsInspect,//浠庤溅闂村叆搴撶殑璐ㄦ鐘舵�侀粯璁ゅ悎鏍�
BitPalletMark = "1",
PackagNo = sku.PackagNo,
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index b53143b..f6c348e 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -2603,6 +2603,451 @@
}
}
+ //public async Task SoSetPick34(string soNo, string soDetailId, string palletNo, string boxNo, string pickQty1, int userId)
+ //{
+ // Db.BeginTran();
+ // try
+ // {
+ // #region 鍒ゆ柇
+
+ // if (string.IsNullOrWhiteSpace(soNo))
+ // {
+ // throw Oops.Bah("鍑哄簱鍗曟嵁涓嶈兘涓虹┖");
+ // }
+ // if (string.IsNullOrWhiteSpace(soDetailId))
+ // {
+ // throw Oops.Bah("鍑哄簱鐗╂枡-鎵规涓嶈兘涓虹┖");
+ // }
+ // if (string.IsNullOrWhiteSpace(palletNo))
+ // {
+ // throw Oops.Bah("鎵樼洏鐮佷笉鑳戒负绌�");
+ // }
+ // //if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)
+ // //{
+ // // throw Oops.Bah("杩芥函鏉＄爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏�");
+ // //}
+
+ // //鍑哄簱鍗�
+ // var notice = await Db.Queryable<BllExportNotice>().FirstAsync(m => m.IsDel == "0" && m.SONo == soNo);
+ // if (notice == null)
+ // {
+ // throw Oops.Bah("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
+ // }
+ // if (notice.Status != "3" && notice.Status != "4")
+ // {
+ // throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
+ // }
+ // //鍑哄簱鍗曟槑缁�
+ // var noticeDetail = await Db.Queryable<BllExportNoticeDetail>()
+ // .FirstAsync(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
+ // if (noticeDetail == null)
+ // {
+ // throw Oops.Bah("鏈煡璇㈠埌璇ュ嚭搴撳崟鏄庣粏鐨勪俊鎭�");
+ // }
+ // //鍑哄簱鍒嗛厤淇℃伅
+ // var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
+ // 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)
+ // {
+ // throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樼殑鍒嗛厤淇℃伅");
+ // }
+ // //鍓╀綑鎷ｈ揣鏁伴噺锛堝緟鎷ｅ噺鍘诲凡鎷ｏ級
+ // var needQty = allot.Qty - allot.CompleteQty;
+
+ // //搴撳瓨鏄庣粏
+ // var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.Id == allot.StockId);
+ // if (stockDetail == null)
+ // {
+ // 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
+
+ // if (string.IsNullOrWhiteSpace(boxNo))//鏁存墭鎷ｈ揣
+ // {
+ // List<DataBoxInfo> boxInfos;
+ // 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)
+ // {
+ // 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("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+ // }
+ // decimal pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+ // var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
+ // var comList = new List<BllCompleteDetail>();
+ // foreach (var item in boxInfos)
+ // {
+ // if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3) && item.BoxNo3 != null)
+ // {
+ // throw Oops.Bah($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ // }
+ // if (item.SkuNo != allot.SkuNo || item.LotNo != allot.LotNo)
+ // {
+ // throw Oops.Bah("褰撳墠鎵樼洏涓婃湁鍏朵粬涓嶅悓鐗╂枡鎵规锛屾嫞璐уけ璐�");
+ // }
+ // //娣诲姞鎷ｈ揣鏄庣粏
+ // var completeDetail = new BllCompleteDetail()
+ // {
+ // SONo = soNo,
+ // SODetailNo = int.Parse(soDetailId),
+ // ExportAllotId = allot.Id,
+ // StockId = allot.StockId,
+ // BoxNo = item.BoxNo,
+ // BoxNo2 = item.BoxNo2,
+ // BoxNo3 = item.BoxNo3,
+
+ // LotNo = allot.LotNo,
+ // LotText = allot.LotText,
+ // SupplierLot = allot.SupplierLot,
+ // SkuNo = allot.SkuNo,
+ // SkuName = allot.SkuName,
+ // Standard = allot.Standard,
+ // PalletNo = palletNo,
+ // CompleteQty = item.Qty,
+
+ // CreateUser = userId
+ // };
+ // comList.Add(completeDetail);
+
+ // //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
+ // await Db.Deleteable(item).ExecuteCommandAsync();
+ // pickQty += item.Qty;
+ // }
+ // //娣诲姞鎷ｈ揣鏄庣粏
+ // await Db.Insertable(comList).ExecuteCommandAsync();
+ // //淇敼鍑哄簱鍒嗛厤淇℃伅
+ // allot.CompleteQty += pickQty;
+ // allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
+ // allot.UpdateTime = DateTime.Now;
+ // await Db.Updateable(allot).ExecuteCommandAsync();
+ // //鍒犻櫎搴撳瓨鏄庣粏
+ // await Db.Deleteable(stockDetail).ExecuteCommandAsync();
+ // //鍒犻櫎鎴栦慨鏀瑰簱瀛�
+ // stock.Qty -= pickQty;
+ // stock.LockQty -= pickQty;
+ // if (stock.LockQty < 0)
+ // {
+ // stock.LockQty = 0;
+ // }
+ // if (stock.Qty <= 0)
+ // {
+ // await Db.Deleteable(stock).ExecuteCommandAsync();
+ // }
+ // else
+ // {
+ // await Db.Updateable(stock).ExecuteCommandAsync();
+ // }
+ // //鍒ゆ柇鎵樼洏涓婅繕鏈夋病鏈夊叾浠栫墿鏂�
+ // var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
+ // if (palletData == null)
+ // {
+ // //鏀瑰彉鎵樼洏鐘舵�佷负锛氭湭浣跨敤
+ // 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();
+ // }
+
+ // //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+ // noticeDetail.CompleteQty += pickQty;
+ // await Db.Updateable(noticeDetail).ExecuteCommandAsync();
+
+ // var num = await Db.Queryable<BllExportNoticeDetail>()
+ // .CountAsync(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
+ // if (num <= 0)
+ // {
+ // notice.Status = "4"; //鏇存敼涓烘墽琛屽畬鎴�
+ // //淇敼鍑哄簱鍗曚俊鎭�
+ // await Db.Updateable(notice).ExecuteCommandAsync();
+ // if (notice.IsWave == "1")
+ // {
+ // var waveNum = await Db.Queryable<BllExportNotice>().CountAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo && m.Status != "4");
+ // if (waveNum == 0)
+ // {
+ // var wave = await Db.Queryable<BllWaveMage>().FirstAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo);
+ // if (wave != null)
+ // {
+ // wave.Status = "4";
+ // wave.UpdateUser = userId;
+ // wave.UpdateTime = DateTime.Now;
+ // await Db.Updateable(wave).ExecuteCommandAsync();
+ // }
+ // }
+ // }
+ // }
+
+ // }
+ // else
+ // {
+ // var biaoShi = "0";//0锛氭暣绠辨嫞璐с��1锛氭暣鐩掓嫞璐с�� 2锛氭暎鏀嫞璐с��3锛氭暟閲忔嫞璐�
+ // 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 comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
+ // if (!string.IsNullOrWhiteSpace(boxNo3)) //鏁ｆ敮鎷ｈ揣
+ // {
+ // boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo3).ToList();
+
+ // if (boxInfos.Count() == 0)
+ // {
+ // throw Oops.Bah("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
+ // }
+ // if (boxInfos.Count() > 1)
+ // {
+ // throw Oops.Bah("璇ヨ拷婧敮鐮佺殑淇℃伅澶т簬1鏉★紝淇℃伅閿欒锛岃鏍稿疄锛�");
+ // }
+
+ // if (boxInfos.Any(m => m.PalletNo != palletNo))
+ // {
+ // throw Oops.Bah("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
+ // }
+ // var boxQty = boxInfos.First().Qty;
+ // //if (boxQty > needQty)
+ // //{
+ // // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
+ // //}
+
+ // foreach (var item in boxInfos)
+ // {
+ // if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+ // {
+ // throw Oops.Bah($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ // }
+ // }
+
+ // biaoShi = "1";
+ // }
+ // else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
+ // {
+ // if (boxInfo.Count() > 1)
+ // {
+ // throw Oops.Bah("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
+ // }
+ // decimal boxQty = boxInfo.First().Qty;
+ // if (Convert.ToInt32(pickQty1) > boxQty)
+ // {
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
+ // }
+ // //if (Convert.ToInt32(pickQty1) > needQty)
+ // //{
+ // // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
+ // //}
+
+ // biaoShi = "2";
+ // }
+ // else //鏁寸鎷ｈ揣
+ // {
+ // if (boxInfo.Count() == 0)
+ // {
+ // throw Oops.Bah("鏈煡璇㈠埌璇ョ鐮佺殑淇℃伅");
+ // }
+ // if (boxInfo.Any(m => m.PalletNo != palletNo))
+ // {
+ // 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("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+ // //}
+
+ // foreach (var item in boxInfos)
+ // {
+ // if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo == item.BoxNo))
+ // {
+ // throw Oops.Bah($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ // }
+ // }
+ // }
+ // decimal pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+
+ // var comList = new List<BllCompleteDetail>();
+ // foreach (var item in boxInfos)
+ // {
+ // //娣诲姞鎷ｈ揣鏄庣粏
+ // var completeDetail = new BllCompleteDetail()
+ // {
+ // SONo = soNo,
+ // SODetailNo = int.Parse(soDetailId),
+ // ExportAllotId = allot.Id,
+ // StockId = allot.StockId,
+ // BoxNo = item.BoxNo,
+ // BoxNo2 = item.BoxNo2,
+ // BoxNo3 = item.BoxNo3,
+
+ // LotNo = allot.LotNo,
+ // LotText = allot.LotText,
+ // SupplierLot = allot.SupplierLot,
+ // SkuNo = allot.SkuNo,
+ // SkuName = allot.SkuName,
+ // Standard = allot.Standard,
+ // PalletNo = palletNo,
+ // CompleteQty = biaoShi == "2" ? decimal.Parse(pickQty1) : item.Qty,
+
+ // CreateUser = userId
+ // };
+ // comList.Add(completeDetail);
+
+ // if (biaoShi != "2")
+ // {
+ // //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
+ // await Db.Deleteable(item).ExecuteCommandAsync();
+ // }
+ // else//鏁伴噺鎷ｈ揣
+ // {
+ // if (decimal.Parse(pickQty1) == item.Qty)
+ // {
+ // //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
+ // await Db.Deleteable(item).ExecuteCommandAsync();
+ // }
+ // else
+ // {
+ // item.Qty -= decimal.Parse(pickQty1);
+ // item.BitBoxMark = "1";//闆剁鏍囪瘑
+ // await Db.Updateable(item).ExecuteCommandAsync();
+ // }
+ // }
+ // pickQty += item.Qty;
+ // }
+ // //鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
+ // if (biaoShi == "1")
+ // {
+ // var boxSurplusList = boxInfo.Where(m => m.BoxNo3 != boxNo3).ToList();
+ // foreach (var item in boxSurplusList)
+ // {
+ // item.BitBoxMark = "1";
+ // await Db.Updateable(item).ExecuteCommandAsync();
+ // }
+ // }
+
+ // await Db.Insertable(comList).ExecuteCommandAsync();
+ // //淇敼鍑哄簱鍒嗛厤淇℃伅
+ // allot.CompleteQty += pickQty;
+ // allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
+ // allot.UpdateTime = DateTime.Now;
+ // if (allot.Status == "5")
+ // {
+ // //鍒ゆ柇璇ユ墭鐩樻槸鍚﹁繕瀛樺湪鐗╂枡 瀛樺湪鏀逛负寰呭洖搴� 寰呭洖搴撳畬鎴愬悗鏀逛负宸插畬鎴�
+ // }
+ // await Db.Updateable(allot).ExecuteCommandAsync();
+
+ // //鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+ // stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
+ // stockDetail.Qty -= pickQty;
+ // stockDetail.LockQty -= pickQty;
+ // if (stockDetail.LockQty < 0)
+ // {
+ // stockDetail.LockQty = 0;
+ // }
+ // 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.LockQty < 0)
+ // {
+ // stock.LockQty = 0;
+ // }
+ // 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();
+ // }
+ // //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+ // noticeDetail.CompleteQty += pickQty;
+ // await Db.Updateable(noticeDetail).ExecuteCommandAsync();
+
+ // var num = await Db.Queryable<BllExportNoticeDetail>()
+ // .CountAsync(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
+ // if (num <= 0)
+ // {
+ // notice.Status = "4"; //鏇存敼涓烘墽琛屽畬鎴�
+ // //淇敼鍑哄簱鍗曚俊鎭�
+ // await Db.Updateable(notice).ExecuteCommandAsync();
+ // if (notice.IsWave == "1")
+ // {
+ // var waveNum = await Db.Queryable<BllExportNotice>()
+ // .CountAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo && m.Status != "4");
+ // if (waveNum == 0)
+ // {
+ // var wave = await Db.Queryable<BllWaveMage>().FirstAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo);
+ // if (wave != null)
+ // {
+ // wave.Status = "4";
+ // wave.UpdateUser = userId;
+ // wave.UpdateTime = DateTime.Now;
+ // await Db.Updateable(wave).ExecuteCommandAsync();
+ // }
+ // }
+ // }
+ // }
+ // }
+ // //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ // var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鍑哄簱", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
+ // Db.CommitTran();
+ // }
+ // //catch (AppFriendlyException e)
+ // //{
+ // // Db.RollbackTran();
+ // //}
+ // catch (Exception e)
+ // {
+ // Db.RollbackTran();
+ // throw new Exception(e.Message);
+ // }
+ //}
//鍑哄簱pda鎷ｈ揣
public async Task SoSetQtyPick(string soNo, string soDetailId, string palletNo, string PickQty, int userId)
{
--
Gitblit v1.8.0