From b34e22087879092e0577b54faf9ed24a1f8de2ae Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 05 十一月 2025 16:57:40 +0800
Subject: [PATCH] 化PDA下发出库功能，增加储位楼层分类；修改agv转运未校验目标储位状态问题
---
Pda/View/SoSetting/ExNoticeOut.html | 58 +++++++++++++++++++++++++----
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 4 ++
2 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/Pda/View/SoSetting/ExNoticeOut.html b/Pda/View/SoSetting/ExNoticeOut.html
index c37f187..e2e8d31 100644
--- a/Pda/View/SoSetting/ExNoticeOut.html
+++ b/Pda/View/SoSetting/ExNoticeOut.html
@@ -103,17 +103,21 @@
</div>
</div>
<div id="" class="layui-form-item layout-dropdownlist">
- <label class="layui-form-label" lang>鍑哄簱鍦板潃锛�</label>
+ <label class="layui-form-label" lang>鍑哄簱妤煎眰锛�</label>
<div class="layui-input-block">
+ <select id="endFloor" lay-filter="endFloor" lay-search>
+ <option value=""></option>
+ <option value="1">涓�妤�</option>
+ <option value="2">浜屾ゼ</option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+ <div id="" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label" lang>鍑哄簱鍦板潃锛�</label>
+ <div class="layui-input-block" id="endSelectDiv">
<select id="endSelect" lay-filter="endSelect" lay-search>
<option value=""></option>
- <option value="B020101">涓�妤�-1</option>
- <option value="B020102">涓�妤�-2</option>
- <option value="B020103">涓�妤�-3</option>
- <option value="B020104">涓�妤�-4</option>
- <option value="B050101">浜屾ゼ-1</option>
- <option value="B050102">浜屾ゼ-2</option>
- <option value="B050103">浜屾ゼ-3</option>
</select>
<img src="/assets/down_arraw.png">
</div>
@@ -282,6 +286,44 @@
});
}
+
+ //閫変腑鍗曟嵁鏄庣粏浜嬩欢
+ form.on('select(endFloor)', function (data) {
+ $("#endSelect").empty()
+ $("#endSelect").append('<option value =>' + '</option>');
+
+ if($("#endFloor").val() == "1"){
+ $("#endSelect").append('<option value ="B020101">涓�妤�-B020101</option> <option value ="B020102">涓�妤�-B020102</option> <option value ="B020103">涓�妤�-B020103</option> '
+ +'<option value ="B020104">涓�妤�-B020104</option> <option value ="B020201">涓�妤�-B020201</option> <option value ="B020202">涓�妤�-B020202</option>'
+ +' <option value ="B020301">涓�妤�-B020301</option> <option value ="B020302">涓�妤�-B020302</option> <option value ="B020303">涓�妤�-B020303</option>'
+ +' <option value ="B020304">涓�妤�-B020304</option>');
+
+ }else if($("#endFloor").val() == "2"){
+ $("#endSelect").append('<option value ="B050101">浜屾ゼ-B050101</option> <option value ="B050102">浜屾ゼ-B050102</option> <option value ="B050103">浜屾ゼ-B050103</option> '
+ +' <option value ="B050104">浜屾ゼ-B050104</option> <option value ="B050105">浜屾ゼ-B050105</option> <option value ="B050106">浜屾ゼ-B050106</option>'
+ +' <option value ="B050107">浜屾ゼ-B050107</option> <option value ="B050108">浜屾ゼ-B050108</option> <option value ="B050109">浜屾ゼ-B050109</option>'
+ +' <option value ="B050110">浜屾ゼ-B050110</option> <option value ="B050111">浜屾ゼ-B050111</option> <option value ="B050112">浜屾ゼ-B050112</option>'
+ +' <option value ="B050113">浜屾ゼ-B050113</option>');
+ }else{
+ layer.msg("閫夋嫨鍑哄簱妤煎眰閿欒", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ return;
+ }
+ form.render('select');
+ });
+ //鐐瑰嚮鍑哄簱鍦板潃涓嬫媺妗嗕簨浠�
+ $("#endSelectDiv").click(function () {
+ if ($("#endFloor").val() == null || $("#endFloor").val() == "" || $("#endFloor").val() == undefined) {
+ layer.msg("璇峰厛閫夋嫨鍑哄簱妤煎眰", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ return;
+ }
+
+ })
function updatePalletNoList(callback) {
var input = $('select[id="PalletNo"]').next().find('.layui-select-title input')
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index c0ec622..304dd3b 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1161,6 +1161,10 @@
{
throw Oops.Bah("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
}
+ if ((storageLocatEnd.AreaNo == "B01" || storageLocatEnd.AreaNo == "B02" || storageLocatEnd.AreaNo == "B05") && storageLocatEnd.Status != "0")
+ {
+ throw Oops.Bah("鐩爣鍌ㄤ綅涓嶆槸绌洪棽鐘舵��,璇锋鏌�!");
+ }
//娣诲姞鍑哄簱浠诲姟
--
Gitblit v1.8.0