From b6337b7478765f3bf3628e84c0ecfac133d61b95 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@DESKTOP-5BIMHQ3> Date: 星期四, 01 二月 2024 14:30:34 +0800 Subject: [PATCH] 修改类型 --- Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs | 6 +++--- Wms/WMS.Entity/DataEntity/DataStockDetail.cs | 4 ++-- Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs | 2 +- Wms/WMS.Entity/DataEntity/DataStock.cs | 4 ++-- Wms/Model/ModelDto/BllCheckDto/StockCheckDto.cs | 2 +- Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs | 4 ++-- Wms/Model/ModelVm/SysVm/LocateVm.cs | 2 +- Wms/Model/ModelDto/PdaDto/PdaSoDto.cs | 2 +- Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs | 2 +- Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 2 +- Wms/Model/ModelDto/DataDto/StockDetailDto.cs | 2 +- Wms/WMS.Entity/BllQualityEntity/BllQualityInspect.cs | 4 ++-- Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs | 6 +++--- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs b/Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs index cd86024..12dd9d2 100644 --- a/Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs +++ b/Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs @@ -80,14 +80,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 f6279b9..d4bafab 100644 --- a/Wms/Model/ModelDto/BllCheckDto/StockCheckDto.cs +++ b/Wms/Model/ModelDto/BllCheckDto/StockCheckDto.cs @@ -105,7 +105,7 @@ /// <summary> /// 搴撳瓨鏁伴噺 /// </summary> - public int? Qty { get; set; } + public decimal? Qty { get; set; } /// <summary> /// 瀹為檯鏁伴噺 diff --git a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs index 9c66d49..962ca86 100644 --- a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs +++ b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs @@ -111,7 +111,7 @@ public string SkuName { get; set; } public string Standard { get; set; } public string LotNo { get; set; } - public int? Qty { get; set; } + public decimal? Qty { get; set; } } public class EditExportNotifyDto @@ -127,7 +127,7 @@ public string LotNo { get; set; } //鎵规 public string SkuNo { get; set; } //鐗╂枡缂栫爜 public string SkuName { get; set; } //鐗╂枡鍚嶇О - public int Qty { get; set; } //搴撳瓨鏁伴噺 + public decimal Qty { get; set; } //搴撳瓨鏁伴噺 public int ExQty { get; set; } //鏁伴噺 public string Standard { get; set; } public string IsBale { get; set; } //鏄惁瑁瑰寘 @@ -219,7 +219,7 @@ /// <summary> /// Desc:鎷h揣鏁伴噺 /// </summary> - public int? CompleteQty { get; set; } + public decimal? CompleteQty { get; set; } /// <summary> /// Desc:鐘舵�� diff --git a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs index b022414..6589bdc 100644 --- a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs +++ b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs @@ -44,7 +44,7 @@ /// <summary> /// 鏁伴噺 /// </summary> - public int? Qty { get; set; } + public decimal? Qty { get; set; } /// <summary> /// 閿佸畾鏁伴噺 diff --git a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs index 971b42f..6b427a3 100644 --- a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs +++ b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs @@ -11,7 +11,7 @@ public int? FinishQty { get; set; } // 瀹屾垚鏁伴噺 public string Standard { get; set; } // 瑙勬牸 public int PickQty { get; set; } // 鎵樼洏寰呮嫞鏁伴噺 - public int? PickedQty { get; set; } // 鎵樼洏宸叉嫞鏁伴噺 + public decimal? PickedQty { get; set; } // 鎵樼洏宸叉嫞鏁伴噺 } public class BoxInfo { diff --git a/Wms/Model/ModelVm/SysVm/LocateVm.cs b/Wms/Model/ModelVm/SysVm/LocateVm.cs index cfb1d32..de363a7 100644 --- a/Wms/Model/ModelVm/SysVm/LocateVm.cs +++ b/Wms/Model/ModelVm/SysVm/LocateVm.cs @@ -144,6 +144,6 @@ /// <summary> /// 鏁伴噺 /// </summary> - public int? Qty { get; set; } + public decimal? Qty { get; set; } } } diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs index ab76a7d..714766d 100644 --- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs +++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs @@ -608,7 +608,7 @@ s = stock.FirstOrDefault(m => m.SkuNo == d.SkuNo && m.LotNo == d.LotNo); } - var stockCount = 0; //st.StockQuantity.Value + var stockCount = 0.00m; //st.StockQuantity.Value if (s != null) { stockCount = s.Qty-s.FrozenQty-s.LockQty+d.Qty; diff --git a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs index 799d05d..19c7495 100644 --- a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs +++ b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs @@ -58,21 +58,21 @@ /// Default: /// Nullable:False /// </summary> - public int Qty {get;set;} + public decimal Qty {get;set;} /// <summary> /// Desc:宸茬粍鏁伴噺 /// Default:0 /// Nullable:True /// </summary> - public int? FactQty {get;set;} + public decimal? FactQty {get;set;} /// <summary> /// Desc:鍏ュ簱鏁伴噺 /// Default:0 /// Nullable:True /// </summary> - public int? CompleteQty {get;set;} + public decimal? CompleteQty {get;set;} /// <summary> /// Desc:鍖呰缂栧彿 diff --git a/Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs b/Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs index bef4f95..c9e16a1 100644 --- a/Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs +++ b/Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs @@ -30,7 +30,7 @@ /// Default: /// Nullable:True /// </summary> - public int? Qty {get;set;} + public decimal? Qty {get;set;} /// <summary> /// Desc:瀹為檯鏁伴噺 diff --git a/Wms/WMS.Entity/BllQualityEntity/BllQualityInspect.cs b/Wms/WMS.Entity/BllQualityEntity/BllQualityInspect.cs index 0a22780..148798b 100644 --- a/Wms/WMS.Entity/BllQualityEntity/BllQualityInspect.cs +++ b/Wms/WMS.Entity/BllQualityEntity/BllQualityInspect.cs @@ -65,14 +65,14 @@ /// Default: /// Nullable:True /// </summary> - public int? PassQty {get;set;} + public decimal? PassQty {get;set;} /// <summary> /// Desc:涓嶅悎鏍兼暟閲� /// Default: /// Nullable:True /// </summary> - public int? FailQty {get;set;} + public decimal? FailQty {get;set;} /// <summary> /// Desc:鏉ユ簮 diff --git a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs index 039d0ab..87334f4 100644 --- a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs +++ b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs @@ -123,7 +123,7 @@ /// Default: /// Nullable:True /// </summary> - public int? CompleteQty {get;set;} + public decimal? CompleteQty {get;set;} /// <summary> /// Desc:鐘舵�� diff --git a/Wms/WMS.Entity/DataEntity/DataStock.cs b/Wms/WMS.Entity/DataEntity/DataStock.cs index 9ee327a..86517a1 100644 --- a/Wms/WMS.Entity/DataEntity/DataStock.cs +++ b/Wms/WMS.Entity/DataEntity/DataStock.cs @@ -54,13 +54,13 @@ /// Default: /// Nullable:False /// </summary> - public int Qty { get; set; } + public decimal Qty { get; set; } /// <summary> /// Desc:閿佸畾鏁伴噺 /// Default: /// Nullable:False /// </summary> - public int LockQty { get; set; } + public decimal LockQty { get; set; } /// <summary> /// Desc:鍐荤粨鏁伴噺 /// Default: diff --git a/Wms/WMS.Entity/DataEntity/DataStockDetail.cs b/Wms/WMS.Entity/DataEntity/DataStockDetail.cs index c6a8e19..301fffc 100644 --- a/Wms/WMS.Entity/DataEntity/DataStockDetail.cs +++ b/Wms/WMS.Entity/DataEntity/DataStockDetail.cs @@ -58,14 +58,14 @@ /// Default: /// Nullable:True /// </summary> - public int? Qty {get;set;} + public decimal? Qty {get;set;} /// <summary> /// Desc:閿佸畾鏁伴噺 /// Default: /// Nullable:True /// </summary> - public int? LockQty {get;set;} + public decimal? LockQty {get;set;} /// <summary> /// Desc:鍐荤粨鏁伴噺 -- Gitblit v1.8.0