From 3a9b5dcd5dd6ed033f80f1696b07135635b3e9f8 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期三, 17 七月 2024 15:35:07 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Wms/WMS.BLL/DataServer/StockServer.cs | 85 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 6f7dbaf..76b0595 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -40,7 +40,7 @@
"stock.LockQty,stock.FrozenQty,stock.OwnerNo,stock.OwnerName,(mate.Weight * stock.Qty) WeightSum " +
"from DataStock stock " +
"left join SysMaterials mate on stock.SkuNo = mate.SkuNo " +
- "Where stock.IsDel = @isdel";
+ "Where stock.IsDel = @isdel and mate.IsDel = 0 ";
//鍒ゆ柇鐗╂枡缂栫爜鏄惁涓虹┖
if (!string.IsNullOrEmpty(skuNo))
{
@@ -83,36 +83,37 @@
foreach (var item in StockList)
{
- //鍒ゆ柇搴撳瓨鎬婚噺鏄惁鎷ユ湁鐗╂枡
- if (StockListDto.Count > 0)
- {
- int i = 0;
- //foreach寰幆搴撳瓨鎬婚噺
- foreach (var dto in StockListDto)
- {
- //鍒ゆ柇鐗╂枡鍜屾壒娆℃槸鍚︾浉鍚�
- if (dto.SkuNo == item.SkuNo && dto.LotNo == item.LotNo)
- {
- dto.Qty = (Convert.ToDecimal(dto.Qty) + Convert.ToDecimal(item.Qty)).ToString();
- dto.FrozenQty = (Convert.ToDecimal(dto.FrozenQty) + Convert.ToDecimal(item.FrozenQty)).ToString();
- dto.LockQty = (Convert.ToDecimal(dto.LockQty) + Convert.ToDecimal(item.LockQty)).ToString();
- dto.ResidueQty= (Convert.ToDecimal(dto.ResidueQty) + Convert.ToDecimal(item.ResidueQty)).ToString();
- break;
- }
- i += 1;
- //鍒ゆ柇宸叉湁鐩稿悓鐗╂枡
- if (i == StockListDto.Count)
- {
- StockListDto.Add(item);
- break;
- }
- }
- }
- else
- {
- StockListDto.Add(item);
- continue;
- }
+ StockListDto.Add(item);
+ ////鍒ゆ柇搴撳瓨鎬婚噺鏄惁鎷ユ湁鐗╂枡
+ //if (StockListDto.Count > 0)
+ //{
+ // int i = 0;
+ // //foreach寰幆搴撳瓨鎬婚噺
+ // foreach (var dto in StockListDto)
+ // {
+ // //鍒ゆ柇鐗╂枡鍜屾壒娆℃槸鍚︾浉鍚�
+ // if (dto.SkuNo == item.SkuNo && dto.LotNo == item.LotNo)
+ // {
+ // dto.Qty = (Convert.ToDecimal(dto.Qty) + Convert.ToDecimal(item.Qty)).ToString();
+ // dto.FrozenQty = (Convert.ToDecimal(dto.FrozenQty) + Convert.ToDecimal(item.FrozenQty)).ToString();
+ // dto.LockQty = (Convert.ToDecimal(dto.LockQty) + Convert.ToDecimal(item.LockQty)).ToString();
+ // dto.ResidueQty= (Convert.ToDecimal(dto.ResidueQty) + Convert.ToDecimal(item.ResidueQty)).ToString();
+ // break;
+ // }
+ // i += 1;
+ // //鍒ゆ柇宸叉湁鐩稿悓鐗╂枡
+ // if (i == StockListDto.Count)
+ // {
+ // StockListDto.Add(item);
+ // break;
+ // }
+ // }
+ //}
+ //else
+ //{
+ // StockListDto.Add(item);
+ // continue;
+ //}
}
return StockListDto;
@@ -379,7 +380,7 @@
"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.UpdateTime 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' " +
@@ -570,7 +571,7 @@
{
EndTime = (Convert.ToDateTime(EndTime).AddDays(1)).ToString();
}
- int countjie = 0; //缁熻缁撳瓨鏁伴噺
+ decimal countjie = 0; //缁熻缁撳瓨鏁伴噺
////鍒ゆ柇搴撳瓨淇℃伅鏄惁涓虹┖
//if (stockInfo != null)
//{
@@ -595,10 +596,10 @@
}
//}
- int yeara = 0; //骞村叆搴�
- int years = 0; //骞村嚭搴�
- int montha = 0; //鏈堝叆搴�
- int months = 0; //鏈堝嚭搴�
+ decimal yeara = 0; //骞村叆搴�
+ decimal years = 0; //骞村嚭搴�
+ decimal montha = 0; //鏈堝叆搴�
+ decimal months = 0; //鏈堝嚭搴�
DateTime createTime = DateTime.Now.AddYears(-1000); //鏃堕棿
//鑾峰彇鏈夊灏戝勾
@@ -838,10 +839,12 @@
//鍒ゆ柇鐗╂枡鏄惁鐩稿悓
if (dto.SkuNo == item.SkuNo)
{
- dto.Qty = (Convert.ToInt32(dto.Qty) + Convert.ToInt32(item.Qty)).ToString();
- dto.FrozenQty = (Convert.ToInt32(dto.FrozenQty) + Convert.ToInt32(item.FrozenQty)).ToString();
- dto.LockQty = (Convert.ToInt32(dto.LockQty) + Convert.ToInt32(item.LockQty)).ToString();
- dto.ResidueQty = (Convert.ToInt32(dto.ResidueQty) + Convert.ToInt32(item.ResidueQty)).ToString();
+ var s = Convert.ToDecimal(dto.Qty) ;
+ var ss = Convert.ToDecimal(item.Qty);
+ dto.Qty = (Convert.ToDecimal(dto.Qty) + Convert.ToDecimal(item.Qty)).ToString();
+ dto.FrozenQty = (Convert.ToDecimal(dto.FrozenQty) + Convert.ToDecimal(item.FrozenQty)).ToString();
+ dto.LockQty = (Convert.ToDecimal(dto.LockQty) + Convert.ToDecimal(item.LockQty)).ToString();
+ dto.ResidueQty = (Convert.ToDecimal(dto.ResidueQty) + Convert.ToDecimal(item.ResidueQty)).ToString();
break;
}
i += 1;
--
Gitblit v1.8.0