From 5faa69086de125aeeeb49dc541b12a9985511b14 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 05 十二月 2025 10:12:16 +0800
Subject: [PATCH] 拣货拼托SoSetPinPick34支持出库单执行完毕也要超捡
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index a95d6f3..b033ad0 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -80,9 +80,14 @@
{
throw Oops.Bah("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
}
- if (notice.Status != "3")
+ //if (notice.Status != "3")
+ //{
+ // throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
+ //}
+ //2025骞�12鏈�05鏃ョ敳鏂硅姹傝秴鎹★紝鍑哄簱鍗曡皟鏁翠负鎵ц瀹屾瘯涔熷彲浠ヨ秴鎹�
+ if (notice.Status != "5")
{
- throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
+ throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�侀潪姝ｅ湪鎵ц锛屼笉鑳芥嫞璐�");
}
//鍑哄簱鍗曟槑缁�
var noticeDetail = await Db.Queryable<BllExportNoticeDetail>().FirstAsync(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
@@ -118,8 +123,8 @@
var sdId = 0;
bool isNew = false;
- //var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
- var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
+ var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
+ //var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
if (pinStockDetail != null)
{
@@ -607,8 +612,8 @@
#region 鎷兼墭淇℃伅
bool isNew = false;
- //var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
- var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
+ var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
+ //var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
if (pinStockDetail != null)
{
//淇敼鎵樼洏琛ㄧ姸鎬佽鎵樼洏琛ㄥ拰搴撳瓨鏄庣粏琛ㄤ繚鎸佷竴鑷�
@@ -1653,10 +1658,10 @@
boxNo, "鍑哄簱", $"鍦≒DA涓婂绠卞彿涓猴細{boxNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
Db.CommitTran();
}
- catch (AppFriendlyException e)
- {
- Db.RollbackTran();
- }
+ //catch (AppFriendlyException e)
+ //{
+ // Db.RollbackTran();
+ //}
catch (Exception e)
{
Db.RollbackTran();
--
Gitblit v1.8.0