From 88430dbe00e46a856b918cef9372a3132aac5712 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期四, 27 十一月 2025 15:16:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
HTML/views/SOSetting/ExportNotice.html | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 48495f4..0b70f99 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -400,12 +400,13 @@
{{# function GetBtn2(d){
var html = '';
- if((d.Status == "0" ||d.Status == "1") && d.Qty > d.AllotQty && d.IsWave == "0"){
+ if(d.AllotQty<d.Qty){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs shoufenClass" lay-event="wan">
<i class="layui-icon layui-icon-ok"></i>鎵嬪姩鍒嗛厤
</a>`;
}
- if(d.Status == "0" && d.Origin == "WMS" && d.IsWave == "0"){
+
+ if(d.Status == "0" && d.Origin == "WMS"){
html +=`<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎
</a>`;
@@ -1127,6 +1128,7 @@
}
});
var isNeedUnpack = '0'//鏄惁闇�瑕佹媶绠憋紝0锛氬惁 1锛氭槸
+ var xmlFileName="";
//鐩戝惉鏁版嵁鎿嶄綔
table.on('tool(LAY-app-content-list)', function (obj) {
var data = obj.data;
@@ -1301,6 +1303,14 @@
};
sendData(IP + "/BllSo/AddExXmlStr", param, 'post', function (res) {
console.log(res);
+ if(data.Type=="0"){
+ xmlFileName="SalesWareHouseOut_"+data.OrderCode+"_linklink";
+ }else if(data.Type=="2"){
+ xmlFileName="CheckWareHouseOut_"+data.OrderCode+"_linklink";
+ }else{
+ xmlFileName=data.OrderCode+"_linklink";
+ }
+
if (res.code == 0) { //鎴愬姛
createFile(res.data);
layer.msg("鎿嶄綔鎴愬姛锛�", {
@@ -1366,25 +1376,33 @@
} else if (obj.event === 'check') {//澶嶆牳
// 浠ｇ爜鍖哄煙
layer.confirm('纭畾澶嶆牳姝ゅ崟鎹悧锛�', function (index) {
- var param = {
- Id: data.Id,
- };
- sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- refreshTable();
- doing = true
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { doing = true });
- }
- });
+ if (isChongFu == true) {
+ isChongFu = false;
+ var param = {
+ Id: data.Id,
+ };
+ sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ isChongFu = true;
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { isChongFu = true; });
+ }
+ });
+ } else {
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
});
}
});
@@ -1598,7 +1616,7 @@
function createFile(val) {
var content = val; // 鏂囦欢鍐呭
var blob = new Blob([content], { type: "text/plain;charset=utf-8" });
- var fileName = "ExInfo.xml"; // 鏂囦欢鍚�
+ var fileName = xmlFileName+".xml"; // 鏂囦欢鍚�
saveAs(blob, fileName);
}
//涓嬭浇鏂囦欢鍑芥暟
--
Gitblit v1.8.0