From c34986a09e6f98fc8c031bd15f847a71efa18349 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期五, 23 五月 2025 14:24:08 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Pda/View/SoSetting/ExNoticeOut.html | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/Pda/View/SoSetting/ExNoticeOut.html b/Pda/View/SoSetting/ExNoticeOut.html
index 8493134..09b6c98 100644
--- a/Pda/View/SoSetting/ExNoticeOut.html
+++ b/Pda/View/SoSetting/ExNoticeOut.html
@@ -105,6 +105,13 @@
<div class="layui-input-block">
<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>
@@ -214,22 +221,22 @@
if (i == 0) {
if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
- $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '-' + i + ' selected>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i]
.SkuName +
'</option>');
} else {
- $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '-' + i + ' selected>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i]
.SkuName + "-" + res.data[i].LotNo +
'</option>');
}
} else {
if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
- $("#goodSelect").append('<option value =' + res.data[i].ISoDetailIdd + '-' + i + '>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].ISoDetailIdd+ i + '>' + res.data[i]
.SkuName +
'</option>');
} else {
- $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '-' + i + '>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].SoDetailId+ '>' + res.data[i]
.SkuName + "-" + res.data[i].LotNo +
'</option>');
}
@@ -257,38 +264,33 @@
form.on('submit(formBind)', function (data) {
-
- if (!$("#PalletNo").val()) {
- layer.msg('璇锋壂鎻忔墭鐩樻潯鐮�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
-
+
var param = {
SoNo: $("#bar").val(),
- PalletNo: $("#PalletNo").val(),
+ soDetailId: $("#goodSelect").val(),
+ outMode:$("#endSelect").val(),
}
- // sendData(IP + "/PdaSo/PlaneExportSuccess", param, 'get', function (res) {
- // if (res.code == 0) { //鎴愬姛
- // layer.msg(res.msg, {
- // icon: 1,
- // time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function () {
+ console.log(param);
+
+ sendData(IP + "/DownApi/PDAIssueOut", param, 'get', function (res) {
+ if (res.Success == "0") { //鎴愬姛
+ layer.msg(res.Message, {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
- // clearTable()
- // $("#PalletNo").val('')
- // });
- // } else { //涓嶆垚鍔�
- // layer.msg(res.msg, {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function () {
- // //鍥炶皟
- // });
- // }
- // });
+ // clearTable()
+ // $("#PalletNo").val('')
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.Message, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ //鍥炶皟
+ });
+ }
+ });
return false; //闃绘琛ㄥ崟璺宠浆銆傚鏋滈渶瑕佽〃鍗曡烦杞紝鍘绘帀杩欐鍗冲彲銆�
});
//-------------------------------------------------------------------------------------------------
--
Gitblit v1.8.0