From c5dc821692c0529e3a688af84c647bf80cc49360 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期日, 21 九月 2025 10:49:40 +0800
Subject: [PATCH] Merge branch 'master' into djp
---
Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
index b94d8ee..c564488 100644
--- a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
+++ b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
@@ -35,7 +35,7 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
- string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
+ string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
{
string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName," +
"LotText,ProductionTime,ExpirationTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";
@@ -186,7 +186,7 @@
public List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus)
{
string str = @" select d.WareHouseName,d.WareHouseNo,e.RoadwayName,e.RoadwayNo,f.AreaName,f.AreaNo,c.LocatNo,a.PalletNo,
- a.SkuNo,a.SkuName,SUM(a.Qty) as Qty,a.Standard,a.LotNo,a.SupplierLot,a.ProductionTime,a.Status
+ a.SkuNo,a.SkuName,SUM(a.Qty) as Qty,a.Standard,a.LotNo,a.SupplierLot,a.ProductionTime,a.Status,c.ExpirationTime
from DataBoxInfo a
left join SysMaterials b on a.SkuNo = b.SkuNo
left join DataStockDetail c on a.StockDetailId = c.Id
@@ -230,7 +230,7 @@
str += " and a.InspectStatus = @inspectstatus";
}
//鎺掑簭
- str += @" group by d.WareHouseName,d.WareHouseNo,e.RoadwayName,e.RoadwayNo,f.AreaName,f.AreaNo,c.LocatNo,a.PalletNo,a.SkuNo,a.SkuName,a.Standard,a.LotNo,a.SupplierLot,a.ProductionTime,a.Status order by a.SkuNo,a.LotNo ";
+ str += @" group by d.WareHouseName,d.WareHouseNo,e.RoadwayName,e.RoadwayNo,f.AreaName,f.AreaNo,c.LocatNo,a.PalletNo,a.SkuNo,a.SkuName,a.Standard,a.LotNo,a.SupplierLot,a.ProductionTime,a.Status,c.ExpirationTime order by a.SkuNo,a.LotNo ";
List<AdventBoxInfoDto> stockList = Db.Ado.SqlQuery<AdventBoxInfoDto>(str, new
{
skuno = skuNo, //鐗╂枡鍙�
--
Gitblit v1.8.0