From af73aff35be4607dd22232d5695e30ca3059c436 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 01 四月 2025 15:58:21 +0800
Subject: [PATCH] PDA的2个拣货页面修改
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 8746b3a..e0b0cbc 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -2870,26 +2870,44 @@
throw new Exception("褰撳墠鎵樼洏鏈湪搴撳瓨涓�");
}
//鎬庝箞鍒ゆ柇褰撳墠鎵樼洏鏄簱澶栬鍙栨牱鐨勬墭鐩橈紝姝ｅ父鍑哄簱鍓╀綑鎵樼洏鐩墠杩欑鎯呭喌涔熻兘鎷ｈ揣鍟婏紝涔熸病鏈夊垎閰嶄俊鎭�
- var allot = Db.Queryable<BllExportAllot>().First(m =>
- m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "5" && m.Status != "6");
- if (allot != null)
+ //鍏堣幏鍙栧崟鎹垎閰嶄俊鎭紝鍐嶈幏鍙栨墭鐩樺垎閰嶄俊鎭�
+ var allotnotice = Db.Queryable<BllExportNotice>().Where(m =>
+ m.IsDel == "0" && m.Type == "3").ToList();
+ if (allotnotice.Count == 0)
{
- var soNo = Db.Queryable<BllExportNotice>()
- .First(m => m.IsDel == "0" && m.SONo == allot.SONo);
- if (soNo == null)
+ throw new Exception("鏈壘鍒板彇鏍峰崟鎹俊鎭�");
+ }
+ int pano = 0;
+ var sono = "";
+ foreach (var item in allotnotice)
+ {
+ var allot = Db.Queryable<BllExportAllot>().First(m =>
+ m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "5" && m.Status != "6" && m.SONo == item.SONo);
+ if (allot != null)
{
- throw new Exception("鏈壘鍒版墭鐩樹笂鍑哄簱鍗曟嵁淇℃伅");
+ pano++;
+ sono = item.SONo;
}
- if (soNo.Type != "3")
+ }
+ if (pano > 0)
+ {
+ var locate = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == palletNo);
+ if (locate != null)
{
- throw new Exception("璇ユ墭鐩樹笉鏄彇鏍锋墭鐩�");
+ if (locate.WareHouseNo == "w01")
+ {
+ type = "0";//搴撳唴鍙栨牱
+ }
+ else
+ {
+ type = "1";
+ }
+
}
- type = "0";//搴撳唴鍙栨牱
}
else
{
- //鍒ゆ柇褰撳墠鎵樼洏鏄惁鏄湪骞冲簱鎴栧簱澶�
- type = "1";//搴撳墠鍙栨牱
+ throw new Exception("鏈壘鍒板彇鏍锋墭鐩樹俊鎭�");
}
return type;
}
--
Gitblit v1.8.0