From fc47b123b85f912fca2c6fa80def7e928149c95c Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期六, 18 一月 2025 09:21:13 +0800
Subject: [PATCH] 抽检修改
---
Pda/View/SoSetting/productOut.html | 6 +++---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 2 +-
HTML/views/SOSetting/ExportHandOutList.html | 2 +-
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HTML/views/SOSetting/ExportHandOutList.html b/HTML/views/SOSetting/ExportHandOutList.html
index 73ace4e..5a5ba5f 100644
--- a/HTML/views/SOSetting/ExportHandOutList.html
+++ b/HTML/views/SOSetting/ExportHandOutList.html
@@ -392,7 +392,7 @@
}
var item = {
StockId: parseInt(infoOptions.data[i].Id),
- Qty: parseInt(infoOptions.data[i].ExportQty)
+ Qty: parseFloat(infoOptions.data[i].ExportQty)
};
DataList.push(item);
}
diff --git a/Pda/View/SoSetting/productOut.html b/Pda/View/SoSetting/productOut.html
index b538ac9..4e781fd 100644
--- a/Pda/View/SoSetting/productOut.html
+++ b/Pda/View/SoSetting/productOut.html
@@ -975,7 +975,7 @@
});
return;
}
- if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseInt($('#pickQty').val())){
+ if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseFloat($('#pickQty').val())){
layer.msg("鎷ｈ揣鏁伴噺涓嶈兘澶т簬寰呮嫞鏁伴噺锛�", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -1473,8 +1473,8 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
- let pickedQty = parseInt($('#pickedQty2').val()) //宸叉嫞鏁伴噺
- let pickQty = parseInt($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
+ let pickedQty = parseFloat($('#pickedQty2').val()) //宸叉嫞鏁伴噺
+ let pickQty = parseFloat($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
if (pickQty <= 0) {
layer.msg("鎷ｈ揣鏁伴噺闇�澶т簬0", {
icon: 2,
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 517de10..52a0b07 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -399,8 +399,8 @@
{
throw new Exception("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
}
- var type1 = new List<string>() { "0", "4" }; //鎷ｈ揣涓嶅彲澶氬嚭
- var type2 = new List<string>() { "1", "2", "3", "5", "6", "7", "8" };//鎷ｈ揣鍙鍑�
+ var type1 = new List<string>() { "0", "4" }; //鎷ｈ揣涓嶅彲澶氬嚭 鎴愬搧鍑哄簱銆佷笉鍚堟牸鍝佸嚭搴�
+ var type2 = new List<string>() { "1", "2", "3", "5", "6", "7", "8" };//鎷ｈ揣鍙鍑� 棰嗘枡鍑哄簱銆佹娊妫�鍑哄簱銆佺墿鏂欏彇鏍峰嚭搴撱�佷腑闂村搧鍑哄簱銆佷唬鍌ㄥ嚭搴撱�佸叾浠栧嚭搴撱�佸瘎瀛樺嚭搴�
if (type1.Contains(notice.Type))
{
if (notice.Status != "3")
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index dcd9c1d..7ddb5c8 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -3586,7 +3586,7 @@
foreach (var item in detailList)
{
totalQty += item.Qty;
- totalAllotQty += Convert.ToInt32(item.AllotQty);
+ totalAllotQty += Convert.ToDecimal(item.AllotQty);
}
if (totalAllotQty >= totalQty)
--
Gitblit v1.8.0