From 5579ff90ea725d9e098a46b5ddfb33e76c6819b7 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 16 三月 2024 16:57:27 +0800
Subject: [PATCH] Merge branch 'Liudl'
---
Wms/WMS.BLL/DataServer/StockServer.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 00dd6d4..6f7dbaf 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -266,9 +266,13 @@
public List<TotalRecordDto> GetTotalRecord(string skuNo, string skuName, string lotNo, string startTime, string endTime)
{
//鍏ュ簱
- string rstr = "select LotNo,SkuNo,SkuName,SUM(Qty) RQty,SUM(FactQty) RFactQty,SUM(CompleteQty) RCompleteQty from BllArrivalNoticeDetail where IsDel = '0' and Id in (select ASNDetailNo from DataStockDetail where IsDel = '0' group by ASNDetailNo) ";
+ string rstr = "select LotNo,SkuNo,SkuName,SUM(Qty) RQty,SUM(FactQty) RFactQty,SUM(CompleteQty) RCompleteQty " +
+ "from BllArrivalNoticeDetail where IsDel = '0' and Id in (select ASNDetailNo from DataStockDetail " +
+ "where IsDel = '0' group by ASNDetailNo) ";
//鍑哄簱
- string cstr = "select LotNo,SkuNo,SkuName,SUM(Qty) CQty,SUM(FactQty) CFactQty,SUM(CompleteQty) CompleteQty,SUM(AllotQty) CAllotQty from BllExportNoticeDetail where IsDel = '0' and LotNo in (select LotNo from DataStock where IsDel = '0') ";
+ string cstr = "select LotNo,SkuNo,SkuName,SUM(Qty) CQty,SUM(FactQty) CFactQty,SUM(CompleteQty) CompleteQty,SUM(AllotQty) CAllotQty " +
+ "from BllExportNoticeDetail " +
+ "where IsDel = '0' and LotNo in (select LotNo from DataStock where IsDel = '0') ";
//鍒ゆ柇鐗╂枡鍙锋槸鍚︿负绌�
if (!string.IsNullOrEmpty(skuNo))
@@ -288,6 +292,18 @@
rstr += " and LotNo like @lotno";
cstr += " and LotNo like @lotno";
}
+ // liudl 鏃堕棿涓嶅噯纭� 鏆傛椂娉ㄩ噴銆�
+ //if (!string.IsNullOrWhiteSpace(startTime))
+ //{
+ // rstr += " and UpdateTime >= @startTime";
+ // cstr += " and UpdateTime >= @startTime";
+ //}
+ //if (!string.IsNullOrWhiteSpace(endTime))
+ //{
+ // rstr += " and UpdateTime <= @endTime";
+ // cstr += " and UpdateTime <= @endTime";
+ //}
+
rstr += " group by LotNo,SkuNo,SkuName";
cstr += " group by LotNo,SkuNo,SkuName";
//鍏ュ簱
@@ -297,6 +313,9 @@
skuno = "%" + skuNo + "%", //鐗╂枡鍙�
skuname = "%" + skuName + "%", //鐗╂枡鍚嶇О
lotno = "%" + lotNo + "%", //鎵规鍙�
+ //startTime = startTime,
+ //endTime = endTime
+
});
List<TotalRecordDto> totalCListData = Db.Ado.SqlQuery<TotalRecordDto>(cstr, new
{
@@ -304,6 +323,8 @@
skuno = "%" + skuNo + "%", //鐗╂枡鍙�
skuname = "%" + skuName + "%", //鐗╂枡鍚嶇О
lotno = "%" + lotNo + "%", //鎵规鍙�
+ //startTime = startTime,
+ //endTime = endTime
});
//鍚堝苟鏁版嵁
@@ -348,12 +369,21 @@
/// <param name="startTime">寮�濮嬫椂闂�</param>
/// <param name="endTime">缁撴潫鏃堕棿</param>
/// <returns></returns>
- public List<TotalRecordDto> GetDetailedRecord(string skuNo, string skuName, string lotNo, string palletNo, string startTime, string endTime)
+ public List<TotalRecordDto> GetDetailedRecord(string skuNo, string skuName, string lotNo, string palletNo,
+ string startTime, string endTime)
{
//鍏ュ簱
- string rstr = "select notice.ASNNo,bind.LotNo,notice.SkuNo,notice.SkuName,bind.PalletNo,bind.Qty RQty,bind.Qty RFactQty,bind.Qty RCompleteQty,bind.CompleteTime,notice.LotText,notice.SupplierLot,bind.CompleteTime from BllPalletBind bind left join BllArrivalNoticeDetail notice on bind.ASNDetailNo = notice.Id where bind.IsDel = '0' and notice.IsDel = '0' and bind.LotNo in (select LotNo from DataStock where IsDel = '0') ";
+ string rstr = "select notice.ASNNo,bind.LotNo,notice.SkuNo,notice.SkuName,bind.PalletNo,bind.Qty RQty," +
+ "bind.Qty RFactQty,bind.Qty RCompleteQty,bind.CompleteTime,notice.LotText,notice.SupplierLot,bind.CompleteTime " +
+ "from BllPalletBind bind left join BllArrivalNoticeDetail notice on bind.ASNDetailNo = notice.Id " +
+ "where bind.IsDel = '0' and notice.IsDel = '0' and bind.LotNo in (select LotNo from DataStock where IsDel = '0') ";
//鍑哄簱
- string cstr = "select notice.SONo,allot.LotNo,allot.TaskNo CTaskNo,allot.SkuNo,allot.SkuName,allot.PalletNo,allot.CreateTime CCreateTime,allot.Qty CQty,allot.Qty CAllotQty,Allot.Qty CFactQty,Allot.CompleteQty CompleteQty,allot.LotText,allot.SupplierLot from BllExportAllot allot left join BllExportNoticeDetail notice on allot.SODetailNo = notice.Id where allot.IsDel = '0' and notice.IsDel = '0' and notice.LotNo in (select LotNo from DataStock where IsDel = '0') ";
+ string cstr = "select notice.SONo,allot.LotNo,allot.TaskNo CTaskNo,allot.SkuNo,allot.SkuName,allot.PalletNo," +
+ "allot.CreateTime CCreateTime,allot.Qty CQty,allot.Qty CAllotQty,Allot.Qty CFactQty,Allot.CompleteQty CompleteQty," +
+ "allot.LotText,allot.SupplierLot " +
+ "from BllExportAllot allot left join BllExportNoticeDetail notice on allot.SODetailNo = notice.Id " +
+ "where allot.IsDel = '0' and notice.IsDel = '0' " +
+ "and notice.LotNo in (select LotNo from DataStock where IsDel = '0') ";
//鍒ゆ柇鐗╂枡鍙锋槸鍚︿负绌�
if (!string.IsNullOrEmpty(skuNo))
@@ -373,12 +403,21 @@
rstr += " and notice.LotNo like @lotno";
cstr += " and allot.LotNo like @lotno";
}
-
//鍒ゆ柇鎵樼洏鏄惁涓虹┖
if (!string.IsNullOrEmpty(palletNo))
{
rstr += " and bind.PalletNo like @palletno";
cstr += " and allot.PalletNo like @palletno";
+ }
+ if (!string.IsNullOrWhiteSpace(startTime))
+ {
+ rstr += " and bind.CompleteTime >= @startTime";
+ cstr += " and allot.UpdateTime >= @startTime";
+ }
+ if (!string.IsNullOrWhiteSpace(endTime))
+ {
+ rstr += " and bind.CompleteTime <= @endTime";
+ cstr += " and allot.UpdateTime <= @endTime";
}
//rstr += " group by bind.LotNo,bind.SkuNo,bind.SkuName";
@@ -391,6 +430,8 @@
skuname = "%" + skuName + "%", //鐗╂枡鍚嶇О
lotno = "%" + lotNo + "%", //鎵规鍙�
palletno = "%" + palletNo + "%", //鎵樼洏鍙�
+ startTime = startTime,
+ endTime = endTime
});
//鍑哄簱
List<TotalRecordDto> totalCList = Db.Ado.SqlQuery<TotalRecordDto>(cstr, new
@@ -400,6 +441,8 @@
skuname = "%" + skuName + "%", //鐗╂枡鍚嶇О
lotno = "%" + lotNo + "%", //鎵规鍙�
palletno = "%" + palletNo + "%", //鎵樼洏鍙�
+ startTime = startTime,
+ endTime = endTime
});
//鍚堝苟
--
Gitblit v1.8.0