From 165a01e366d3331f8a2d2a9e42c05bcd1209abde Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 10 七月 2025 08:41:39 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 2 +-
Wms/Model/InterFaceModel/HttpModel.cs | 8 ++++----
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 7 +++++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index e7c4045..9aa5beb 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -600,12 +600,12 @@
/// <summary>
/// 鍏ュ簱鍗曞彿
/// </summary>
- public long orderNo { get; set; }
+ public string orderNo { get; set; }
/// <summary>
/// 鍏ュ簱鍗曠被鍨�
/// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 锛堥攢鍞��璐э級4锛氫綑鏂欓��鍥炲叆搴� 8 锛氱敓浜ч��鏂欏叆搴�
/// </summary>
- public int billType { get; set; }
+ public string billType { get; set; }
/// <summary>
/// 渚涘簲鍟嗙紪鍙�
/// </summary>
@@ -628,7 +628,7 @@
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
- public long skuNo { get; set; }
+ public string skuNo { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
@@ -640,7 +640,7 @@
/// <summary>
/// 鎵瑰彿
/// </summary>
- public long lotNo { get; set; }
+ public string lotNo { get; set; }
/// <summary>
/// 鐢熶骇鏃ユ湡
/// </summary>
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 805a2b3..80ad10c 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -6074,9 +6074,12 @@
{
foreach (var item in stockDetail)
{
- if (!string.IsNullOrEmpty(item.WareHouseNo))
+ if (!string.IsNullOrEmpty(item.WareHouseNo) && !string.IsNullOrEmpty(item.AreaNo))
{
- throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳鏌�!");
+ if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09")
+ {
+ throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳鏌�!");
+ }
}
}
iscount = 1; //鍥炴祦鍏ュ簱
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 7154975..3e14ce4 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -420,7 +420,7 @@
public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo)
{
return await Db.Queryable<DataStockDetail>()
- .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) && s.PalletNo.Contains(palletNo))
+ .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) || s.PalletNo.Contains(palletNo))
.OrderBy(s => new { s.LotNo, s.LocatNo, s.PalletNo })
.ToListAsync();
--
Gitblit v1.8.0