From e7864a4dcecba72ccbb06dfb6a3d4a77c65f2a3c Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期四, 07 三月 2024 11:25:38 +0800
Subject: [PATCH] 合并代码
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 5 +++++
HTML/views/SOSetting/ExportNotice.html | 26 +++++++++++++++++++++++++-
2 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 5b4f906..bb7e808 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -1386,10 +1386,11 @@
isChongFu= false;
if(pa == null)
{
- layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
+ isChongFu= true;
return;
}
if($('#UnstackWay').val()=='0'){
@@ -1412,6 +1413,29 @@
isChongFu= true;
return;
}
+ isChongFu= true;
+ return;
+ }
+ if(isNeedUnpack=='1'){
+ if(pa==''){
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ isChongFu= true;
+ return;
+ }
+ }
+ }else{
+ if(pa==''){
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ isChongFu= true;
+ return;
+ }
+ }
var param = {
soNo: soNo,
unstackingMode:$('#UnstackWay').val(),
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index a77991b..334564f 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2818,6 +2818,11 @@
d.Status = "0";
d.UpdateUser = userId;
d.UpdateTime = DateTime.Now;
+
+ if (notice.Type == "1" || notice.Type == "5" || notice.Type == "6" || notice.Type == "7" || notice.Type == "8")//1锛氶鏂欏嚭搴撱��
+ {
+ d.LotNo = "";
+ }
}
notice.Status = "0";
notice.UpdateUser = userId;
--
Gitblit v1.8.0