From 5078a70f3972915dc887916e5c828b268671d004 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期二, 19 三月 2024 18:54:16 +0800
Subject: [PATCH] 修改BUG问题
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 3eaa00c..43a9406 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -309,7 +309,7 @@
throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍑哄簱鍗曟�诲崟淇℃伅锛岃鏍稿疄锛�");
}
//鍒嗛厤淇℃伅
- var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.PalletNo == palletNo && a.Status == "2" || a.Status == "3");
+ var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.PalletNo == palletNo && (a.Status == "2" || a.Status == "3"));
if (allot == null)
{
throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍒嗛厤淇℃伅锛岃鏍稿疄锛�");
@@ -1541,7 +1541,7 @@
throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
}
boxInfos = boxInfo.ToList();
-
+ var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot2.Id && m.PalletNo == palletNo).ToList();
if (!string.IsNullOrWhiteSpace(boxNo3)) //鏁ｆ敮鎷ｈ揣
{
boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo3).ToList();
@@ -1559,7 +1559,13 @@
{
throw new Exception("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
}
-
+ foreach (var item in boxInfos)
+ {
+ if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+ {
+ throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ }
+ }
biaoShi = "1";
}
else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
@@ -1586,17 +1592,23 @@
{
throw new Exception("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
}
-
+ foreach (var item in boxInfos)
+ {
+ if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo == item.BoxNo))
+ {
+ throw new Exception($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ }
+ }
}
var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
- var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot2.Id && m.PalletNo == palletNo).ToList();
+
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
{
- if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
- {
- throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
- }
+ //if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+ //{
+ // throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ //}
//娣诲姞鎷ｈ揣鏄庣粏
var completeDetail = new BllCompleteDetail()
{
@@ -1778,6 +1790,7 @@
throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
}
boxInfos = boxInfo.ToList();
+ 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();
@@ -1800,7 +1813,13 @@
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
}
-
+ foreach (var item in boxInfos)
+ {
+ if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+ {
+ throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ }
+ }
biaoShi = "1";
}
else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
@@ -1836,16 +1855,23 @@
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
}
+ foreach (var item in boxInfos)
+ {
+ if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo == item.BoxNo))
+ {
+ throw new Exception($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ }
+ }
}
var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
- var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
+
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
{
- if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
- {
- throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
- }
+ //if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+ //{
+ // throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ //}
//娣诲姞鎷ｈ揣鏄庣粏
var completeDetail = new BllCompleteDetail()
{
--
Gitblit v1.8.0