From db1833f3ecc5ae4eb14eb9d1bd8990e36fa85a97 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 06 三月 2024 14:52:38 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/SOSetting/ExportNotice.html | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 8299035..cbb0614 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -66,6 +66,7 @@
<option value="5">涓棿鍝佸嚭搴�</option>
<option value="6">浠ｅ偍鍑哄簱</option>
<option value="7">鍏朵粬鍑哄簱</option>
+ <option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
<!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
<option value="1">闈炴爣閿�鍞嚭搴�</option>
@@ -142,7 +143,7 @@
<div class="layui-input-inline" style="width: 220px;">
<select name="UnstackWay" id="UnstackWay" lay-filter="UnstackWay" lay-search>
<option value="0" selected>鏈哄櫒浜烘媶鍨�</option>
- <option value="1">浜哄伐鎷嗗灈</option>
+ <option value="1">PDA鎷嗗灈</option>
</select>
</div>
</div>
@@ -212,6 +213,8 @@
return "浠ｅ偍鍑哄簱";
case "7":
return "鍏朵粬鍑哄簱";
+ case "8":
+ return "瀵勫瓨鍑哄簱";
default:
return "";
}
@@ -333,9 +336,11 @@
var html = '';
if(d.IsWave == '0'){
if(d.Status == '0' || d.Status == '1' ){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
- <i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
- </a>`;
+ if(d.Type != "8") {
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
+ <i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
+ </a>`;
+ }
}
if(d.Status == '0' && d.Origin == 'WMS'){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs uptClass" lay-event="edit">
@@ -1223,10 +1228,13 @@
});
}else if(obj.event === 'outKu'){
$("#UnstackWay option[value='0']").attr("selected","selected");
+ $("#LoadingArea option[value='']").attr("selected","selected");
+ $("#PickingArea option[value='']").attr("selected","selected");
form.render('select');
var param = {
soNo: SoNo
};
+ // 鍒ゆ柇鏄惁闇�瑕佹媶绠憋紝闇�瑕佹媶绠卞氨闇�瑕侀�夋嫨鍑哄簱鍙�
sendData(IP + "/BllSo/IsNeedUnpack", param, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
if(res.data=="1"){
@@ -1266,10 +1274,39 @@
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
+ return;
+ }
+ if($('#UnstackWay').val()=='0'){
+ if($('#LoadingArea').val()==''){
+ layer.msg("璇烽�夋嫨瑁呰溅鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ if(isNeedUnpack=='1'){
+ if(pa==''){
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ }
+ }else{
+ if(pa==''){
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
}
var param = {
soNo: data.SONo,
+ unstackingMode:$('#UnstackWay').val(),
outMode: pa,
+ loadingAddre:$('#LoadingArea').val()
};
console.log(param);
sendData(IP + "/DownApi/IssueOutHouse", param, 'get', function(res) {
--
Gitblit v1.8.0