From edbaa2b80abdc9e5de779dcd0bdda33b2f16f0b4 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 14 七月 2025 15:57:48 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/HttpServer.cs | 6 +++++-
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 10 +++++-----
Pda/View/SoSetting/ExNoticeOut.html | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Pda/View/SoSetting/ExNoticeOut.html b/Pda/View/SoSetting/ExNoticeOut.html
index 26b6c46..c37f187 100644
--- a/Pda/View/SoSetting/ExNoticeOut.html
+++ b/Pda/View/SoSetting/ExNoticeOut.html
@@ -253,7 +253,7 @@
} else {
if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
- $("#goodSelect").append('<option value =' + res.data[i].ISoDetailIdd+ i + '>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '>' + res.data[i]
.SkuName +
'</option>');
} else {
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index ad3c91d..7bb5981 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -2728,10 +2728,8 @@
else
{
stockDetail.Status = "0";
- }
- //鍒ゆ柇鎵樼洏涓婅繕鏈夋病鏈夊叾浠栫墿鏂�
- var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
- if (stockDetail.Qty <= 0 && palletData == null)
+ }
+ if (stockDetail.Qty <= 0)
{
await Db.Deleteable(stockDetail).ExecuteCommandAsync();
}
@@ -2760,7 +2758,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();
diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs
index 3158a57..55e1e9a 100644
--- a/Wms/WMS.BLL/HttpServer.cs
+++ b/Wms/WMS.BLL/HttpServer.cs
@@ -1774,7 +1774,11 @@
}
else if (locateEnd.Status != "0")
{
- throw new Exception("鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅");
+ var logEnd = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.Status == "1" && w.EndLocat == locateEnd.LocatNo);
+ if (logEnd != null && logEnd.PalletNo != palletNo)
+ {
+ throw new Exception("鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅");
+ }
}
#endregion
--
Gitblit v1.8.0