From 598ba81de7ee41a1f62fd818bf9c29e910ec3306 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期五, 29 三月 2024 11:28:39 +0800
Subject: [PATCH] 修改数据类型
---
Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs | 2
Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs | 4 +-
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 2
Wms/WMS.Entity/DataEntity/DataStock.cs | 2
Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs | 4 +-
Wms/Model/ModelDto/BllCheckDto/StockCheckDto.cs | 8 ++--
Wms/WMS.Entity/BllCheckEntity/BllStockCheckLog.cs | 4 +-
Wms/WMS.Entity/BllSoEntity/BllCompleteDetail.cs | 2
Wms/Model/ModelDto/PdaDto/PdaCheckDto.cs | 2
Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs | 4 +-
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 12 +++---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 10 ++--
Wms/Model/ModelDto/PdaDto/PdaSoDto.cs | 4 +-
Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs | 2
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 18 ++++----
Wms/WMS.Entity/BllAsnEntity/BllPalletUnbind.cs | 2
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 6 +-
Wms/WMS.Entity/DataEntity/DataBoxInfo.cs | 4 +-
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 2
19 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs b/Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs
index 96237f4..7aad7f1 100644
--- a/Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs
+++ b/Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs
@@ -73,14 +73,14 @@
/// Default:
/// Nullable:False
/// </summary>
- public int? Qty { get; set; }
+ public decimal? Qty { get; set; }
/// <summary>
/// Desc:鏁寸鏁伴噺
/// Default:
/// Nullable:True
/// </summary>
- public int? FullQty { get; set; }
+ public decimal? FullQty { get; set; }
/// <summary>
/// Desc:鐘舵��
diff --git a/Wms/Model/ModelDto/BllCheckDto/StockCheckDto.cs b/Wms/Model/ModelDto/BllCheckDto/StockCheckDto.cs
index d4bafab..6852d7c 100644
--- a/Wms/Model/ModelDto/BllCheckDto/StockCheckDto.cs
+++ b/Wms/Model/ModelDto/BllCheckDto/StockCheckDto.cs
@@ -110,7 +110,7 @@
/// <summary>
/// 瀹為檯鏁伴噺
/// </summary>
- public int? RealQty { get; set; }
+ public decimal? RealQty { get; set; }
/// <summary>
/// 鐩樼偣缁撴灉
@@ -192,7 +192,7 @@
public string Standard { get; set; }
public string LotNo { get; set; }
public string LotText { get; set; }
- public int Qty { get; set; }
+ public decimal Qty { get; set; }
public string SupplierLot { get; set; }
public string PalletNo { get; set; }
@@ -233,12 +233,12 @@
/// <summary>
/// 搴撳瓨鏁伴噺
/// </summary>
- public int? Qty { get; set; }
+ public decimal? Qty { get; set; }
/// <summary>
/// 瀹為檯鏁伴噺
/// </summary>
- public int? RealQty { get; set; }
+ public decimal? RealQty { get; set; }
/// <summary>
/// 鐩樼偣缁撴灉
diff --git a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs
index 4070e47..0c3aae6 100644
--- a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs
+++ b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs
@@ -366,7 +366,7 @@
/// <summary>
/// Desc:鎷ｈ揣鏁伴噺
/// </summary>
- public int? CompleteQty { get; set; }
+ public decimal? CompleteQty { get; set; }
/// <summary>
/// Desc:鏂版墭鐩�
diff --git a/Wms/Model/ModelDto/PdaDto/PdaCheckDto.cs b/Wms/Model/ModelDto/PdaDto/PdaCheckDto.cs
index 39235db..5d80289 100644
--- a/Wms/Model/ModelDto/PdaDto/PdaCheckDto.cs
+++ b/Wms/Model/ModelDto/PdaDto/PdaCheckDto.cs
@@ -8,7 +8,7 @@
{
public string PalletNo { get; set; }
public string BoxNo { get; set; }
- public int Qty { get; set; }
+ public decimal Qty { get; set; }
public string SkuNo { get; set; }
public string SkuName { get; set; }
diff --git a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
index 5fff76d..ab65750 100644
--- a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
+++ b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
@@ -17,11 +17,11 @@
public class BoxInfo
{
public string BoxNo { get; set; } // 绠辩爜/鏀爜
- public int Qty { get; set; } // 绠卞唴鏁伴噺
+ public decimal Qty { get; set; } // 绠卞唴鏁伴噺
public string SkuNo { get; set; } // 鐗╂枡缂栫爜
public string SkuName { get; set; } // 鐗╂枡鍚嶇О
public string LotNo { get; set; } // 鎵规
- public int? PickedQty { get; set; } // 绠卞唴宸叉嫞鏁伴噺
+ public decimal? PickedQty { get; set; } // 绠卞唴宸叉嫞鏁伴噺
}
public class DetailIdSkuLotNo
{
diff --git a/Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs b/Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs
index b8d986d..a7811f4 100644
--- a/Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs
+++ b/Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs
@@ -67,14 +67,14 @@
/// Default:
/// Nullable:False
/// </summary>
- public int? Qty { get; set; }
+ public decimal? Qty { get; set; }
/// <summary>
/// Desc:鏁存墭鏁伴噺
/// Default:
/// Nullable:True
/// </summary>
- public int? FullQty { get; set; }
+ public decimal? FullQty { get; set; }
/// <summary>
/// Desc:鐘舵��
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index 8a69d15..9d69feb 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -757,7 +757,7 @@
ASNNo = asnList.ASNNo,
ASNDetailNo = asnList.Id,
BoxNo = maxBoxCode,
- Qty = int.Parse(boxQty.ToString()),
+ Qty = boxQty,
FullQty = bNum,
Status = "0",
SkuNo = asnList.SkuNo,
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 8793a2c..7921784 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -371,7 +371,7 @@
}
Db.BeginTran();
var time = DateTime.Now;
- var qty = 0;
+ decimal qty = 0;
foreach (var item in boxInfos)
{
//鍒犻櫎瑙ｇ粦绠辨敮淇℃伅
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index ebb1509..3e4ae44 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -200,7 +200,7 @@
LotNo = m.LotNo,
LotText = m.LotText,
SupplierLot = m.SupplierLot,
- Qty = (int)m.Qty,
+ Qty = (decimal)m.Qty,
PalletNo = m.PalletNo
}).ToList();
@@ -641,7 +641,7 @@
BoxNo2 = l.BoxNo2,
BoxNo3 = l.BoxNo3,
PalletNo = l.PalletNo,
- Qty = (int)l.RealQty,
+ Qty = (decimal)l.RealQty,
FullQty = stockBoxInfo.FullQty,//婊＄鏁伴噺
Status = "2",
SkuNo = l.SkuNo,
@@ -658,12 +658,12 @@
};
Db.Insertable<DataBoxInfo>(databox).ExecuteCommand();
//搴撳瓨鏄庣粏澧炲姞鏁伴噺
- stockDetailInfo.Qty += (int)l.RealQty;
+ stockDetailInfo.Qty += l.RealQty;
}
else
{
//搴撳瓨鏄庣粏澧炲姞鏁伴噺
- stockDetailInfo.Qty = (int)l.RealQty;
+ stockDetailInfo.Qty = l.RealQty;
}
stockDetailInfo.Status = "0";
@@ -676,11 +676,11 @@
}
if (sku.Type != "4")
{
- de.Qty += (int)l.RealQty;
+ de.Qty += (decimal)l.RealQty;
}
else
{
- de.Qty += (int)(l.RealQty - l.Qty);
+ de.Qty += (decimal)(l.RealQty - l.Qty);
}
Db.Updateable(de).ExecuteCommand();
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 2344c3b..2a58636 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -324,7 +324,7 @@
PalletNo3 = model.PalletNo3,
Status = "1",
CompleteTime = DateTime.Now,
- Qty = (int)model.Qty,
+ Qty = (decimal)model.Qty,
FullQty = null,
SkuNo = "100099",
SkuName = "鎵樼洏",
@@ -415,7 +415,7 @@
UpbindPalletNo = upBindPalletNo,
PalletNo2 = bindVms[0].PalletNo2,
PalletNo3 = bindVms[0].PalletNo3,
- Qty = (int)bindVms[0].Qty,
+ Qty = bindVms[0].Qty,
LotNo = bindVms[0].LotNo,
LotText = bindVms[0].LotText,
SupplierLot = bindVms[0].SupplierLot,
@@ -801,7 +801,7 @@
return strMsg;
}
#endregion
- var pallQty = 0;//鎵樼洏涓婃暟閲�
+ decimal pallQty = 0;//鎵樼洏涓婃暟閲�
var boxinfo2 = boxinfo.Where(w => w.SkuNo == noticeItem.SkuNo && w.LotNo == noticeItem.LotNo && w.PalletNo == model.PalletNo).ToList();
if (boxinfo2.Count <= 0)
{
@@ -1402,7 +1402,7 @@
{
throw new Exception("-1:绠辩爜淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
}
- var bNum = 0;//鏁伴噺
+ decimal bNum = 0;//鏁伴噺
//楠岃瘉绠辩爜鏄惁宸茬粦瀹氭墭鐩�
foreach (var item in boxinfo)
{
@@ -2090,7 +2090,7 @@
var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
foreach (var g in boxGroup)
{
- var boxFullQty = 0;//绠卞唴鎬绘暟閲�
+ decimal boxFullQty = 0;//绠卞唴鎬绘暟閲�
foreach (var box in g)
{
if (box.BindNo != null && box.BindNo != 0)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 8e3fd47..063f080 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -139,7 +139,7 @@
{
PalletNo = palletNo,
SkuNo = sku,
- Qty = (int?)stockDetail.Qty,
+ Qty = stockDetail.Qty,
CheckResult = 4,
};
@@ -276,14 +276,14 @@
var list = checkLog.ToList();
- var num = 0;
+ decimal num = 0;
foreach (var l in list)
{
l.RealQty = 0;
l.CheckResult = 1;
l.CheckDate = time;
l.CheckUserId = userId;
- num -= int.Parse(l.RealQty.ToString());
+ num -= (decimal)l.RealQty;
}
if (checkDetail.RealQty == null)
{
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index b563a8d..b1a74da 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -447,7 +447,7 @@
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
}
- var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+ decimal pickQty = 0;//鎷ｈ揣鐨勬暟閲�
var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
@@ -580,7 +580,7 @@
{
throw new Exception("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
}
- int boxQty = boxInfo.First().Qty;
+ decimal boxQty = boxInfo.First().Qty;
if (Convert.ToInt32(pickQty1) > boxQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
@@ -616,7 +616,7 @@
}
}
}
- var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+ decimal pickQty = 0;//鎷ｈ揣鐨勬暟閲�
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
@@ -1614,7 +1614,7 @@
{
throw new Exception("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
}
- int boxQty = boxInfo.First().Qty;
+ decimal boxQty = boxInfo.First().Qty;
if (Convert.ToInt32(pickQty1) > boxQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
@@ -1640,7 +1640,7 @@
}
}
}
- var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+ decimal pickQty = 0;//鎷ｈ揣鐨勬暟閲�
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
@@ -1868,7 +1868,7 @@
{
throw new Exception("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
}
- int boxQty = boxInfo.First().Qty;
+ decimal boxQty = boxInfo.First().Qty;
if (Convert.ToInt32(pickQty1) > boxQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
@@ -1903,7 +1903,7 @@
}
}
}
- var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+ decimal pickQty = 0;//鎷ｈ揣鐨勬暟閲�
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
@@ -2692,7 +2692,7 @@
}
#endregion
- var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+ decimal pickQty = 0;//鎷ｈ揣鐨勬暟閲�
if (string.IsNullOrWhiteSpace(boxNo))//鏁存墭鎷ｈ揣
{
List<DataBoxInfo> boxInfos;
@@ -2848,7 +2848,7 @@
{
throw new Exception("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
}
- int boxQty = boxInfo.First().Qty;
+ decimal boxQty = boxInfo.First().Qty;
if (Convert.ToInt32(pickQty1) > boxQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
diff --git a/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs b/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs
index 7553ede..5de4dbc 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs
@@ -79,14 +79,14 @@
/// Default:
/// Nullable:False
/// </summary>
- public int Qty {get;set;}
+ public decimal Qty {get;set;}
/// <summary>
/// Desc:鏁寸鏁伴噺
/// Default:
/// Nullable:True
/// </summary>
- public int? FullQty {get;set;}
+ public decimal? FullQty {get;set;}
/// <summary>
/// Desc:鐘舵��
diff --git a/Wms/WMS.Entity/BllAsnEntity/BllPalletUnbind.cs b/Wms/WMS.Entity/BllAsnEntity/BllPalletUnbind.cs
index 6e8006e..0d9952c 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllPalletUnbind.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllPalletUnbind.cs
@@ -72,7 +72,7 @@
/// Default:
/// Nullable:True
/// </summary>
- public int? Qty {get;set;}
+ public decimal? Qty {get;set;}
/// <summary>
/// Desc:浜岀骇鎵樼洏鍙�
diff --git a/Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs b/Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs
index c9e16a1..d7c4a78 100644
--- a/Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs
+++ b/Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs
@@ -37,7 +37,7 @@
/// Default:
/// Nullable:True
/// </summary>
- public int? RealQty {get;set;}
+ public decimal? RealQty {get;set;}
/// <summary>
/// Desc:鐩樼偣缁撴灉
diff --git a/Wms/WMS.Entity/BllCheckEntity/BllStockCheckLog.cs b/Wms/WMS.Entity/BllCheckEntity/BllStockCheckLog.cs
index 0521f97..6f0f37b 100644
--- a/Wms/WMS.Entity/BllCheckEntity/BllStockCheckLog.cs
+++ b/Wms/WMS.Entity/BllCheckEntity/BllStockCheckLog.cs
@@ -94,14 +94,14 @@
/// Default:
/// Nullable:True
/// </summary>
- public int? Qty {get;set;}
+ public decimal? Qty {get;set;}
/// <summary>
/// Desc:瀹為檯鏁伴噺
/// Default:
/// Nullable:True
/// </summary>
- public int? RealQty {get;set;}
+ public decimal? RealQty {get;set;}
/// <summary>
/// Desc:鐩樼偣缁撴灉
diff --git a/Wms/WMS.Entity/BllSoEntity/BllCompleteDetail.cs b/Wms/WMS.Entity/BllSoEntity/BllCompleteDetail.cs
index c13d2d5..82576be 100644
--- a/Wms/WMS.Entity/BllSoEntity/BllCompleteDetail.cs
+++ b/Wms/WMS.Entity/BllSoEntity/BllCompleteDetail.cs
@@ -114,7 +114,7 @@
/// Default:
/// Nullable:True
/// </summary>
- public int? CompleteQty {get;set;}
+ public decimal? CompleteQty {get;set;}
/// <summary>
/// Desc:鏂版墭鐩�
diff --git a/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs b/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs
index b644278..650be2b 100644
--- a/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs
+++ b/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs
@@ -72,14 +72,14 @@
/// Default:
/// Nullable:False
/// </summary>
- public int Qty {get;set;}
+ public decimal Qty {get;set;}
/// <summary>
/// Desc:鏁寸鏁伴噺
/// Default:
/// Nullable:True
/// </summary>
- public int? FullQty {get;set;}
+ public decimal? FullQty {get;set;}
/// <summary>
/// Desc:鐘舵��
diff --git a/Wms/WMS.Entity/DataEntity/DataStock.cs b/Wms/WMS.Entity/DataEntity/DataStock.cs
index 12398b2..133aa49 100644
--- a/Wms/WMS.Entity/DataEntity/DataStock.cs
+++ b/Wms/WMS.Entity/DataEntity/DataStock.cs
@@ -78,6 +78,6 @@
/// Default:
/// Nullable:False
/// </summary>
- public int FrozenQty { get; set; }
+ public decimal FrozenQty { get; set; }
}
}
--
Gitblit v1.8.0