From 05679f2a536bc8ee97af46009c50c6aa93306d46 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 19 十二月 2025 11:42:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Pda/View/SoSetting/productOutCode.html | 15 +++++++++------
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 7 +++++++
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/Pda/View/SoSetting/productOutCode.html b/Pda/View/SoSetting/productOutCode.html
index 8ba71e5..ba3e7ac 100644
--- a/Pda/View/SoSetting/productOutCode.html
+++ b/Pda/View/SoSetting/productOutCode.html
@@ -389,6 +389,8 @@
function clear3() {
$("#planQty").val(""); //璁″垝鏁伴噺
$("#finishQty").val("");//瀹屾垚鏁伴噺
+ scanQty=0;
+ $('#scanQty').val(0);
}
function clear4() {
$('#boxNo').val("");//绠辩爜
@@ -736,12 +738,12 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
- if($("#planQty").val()!=$("#scanQty").val()){
- layer.msg("宸叉壂鏁伴噺鍜岃鍒掓暟閲忎笉涓�鑷达紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }); return;
- }
+ // if($("#planQty").val()!=$("#scanQty").val()){
+ // layer.msg("宸叉壂鏁伴噺鍜岃鍒掓暟閲忎笉涓�鑷达紒", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }); return;
+ // }
if (isContinue == "0") {
if (boxes == null || boxes.length<=0) {
layer.msg("璇锋壂鎻忔爣绛剧爜", {
@@ -785,6 +787,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
canPickBox = true//鍥炶皟
+ scanQty=0;
$("#boxNo").val('');
$('#scanQty').val(0);
updateQtyList();
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 10da52c..987c28e 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1941,6 +1941,13 @@
foreach (var d in noticeDetail)
{
+ if (notice.Type == "0")//鎴愬搧鍑哄簱锛岃鍒掓暟閲忓拰鎷ｈ揣鏁伴噺蹇呴』涓�鑷�
+ {
+ if (d.CompleteQty != d.Qty)
+ {
+ throw new Exception($"鍏冲崟澶辫触,鐗╂枡:{d.SkuNo}璁″垝鏁伴噺鍜屾嫞璐ф暟閲忎笉涓�鑷达紒");
+ }
+ }
#region MyRegion
//鏇存敼搴撳瓨鏄庣粏閿佸畾鏁伴噺
//var orders = dataContext.WmsExportOrder.Where(o => o.ExportDetailId == d.Id
--
Gitblit v1.8.0