From 778d43af844492ef0496b0981ee95e0a1da17a6e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 04 三月 2024 17:02:12 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
HTML/views/SOSetting/ExportNotice.html | 190 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 164 insertions(+), 26 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 8d5e6d6..b8e85a1 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -57,11 +57,21 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
+ <!-- 24 -->
+ <option value="0">鎴愬搧鍑哄簱</option>
+ <option value="1">棰嗘枡鍑哄簱</option>
+ <option value="2">鎶芥鍑哄簱</option>
+ <option value="3">鐗╂枡鍙栨牱鍑哄簱</option>
+ <option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
+ <option value="5">涓棿鍝佸嚭搴�</option>
+ <option value="6">浠ｅ偍鍑哄簱</option>
+ <option value="7">鍏朵粬鍑哄簱</option>
+ <option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
+ <!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
<option value="1">闈炴爣閿�鍞嚭搴�</option>
<option value="2">鏍囧噯璋冩嫧鍑哄簱</option>
- <option value="3">闈炴爣璋冩嫧鍑哄簱</option>
+ <option value="3">闈炴爣璋冩嫧鍑哄簱</option> -->
<!-- 08 -->
<!-- <option value="0">鎴愬搧鍑哄簱</option>
<option value="1">鍘熻緟鏂欏嚭搴�</option>
@@ -81,6 +91,7 @@
<option value="3">姝ｅ湪鎵ц</option>
<option value="4">鎵ц瀹屾瘯</option>
<option value="5">璁㈠崟鍏抽棴</option>
+ <option value="6">涓婁紶瀹屾瘯</option>
</select>
</div>
</div>
@@ -118,26 +129,49 @@
<option value="1">鏄�</option>
</select>
</div>
- </div>
- <div class="layui-inline" id="divPickingArea" style="display: none; padding-top: 10px;">
- <label class="layui-form-label">鍑哄簱鍙�</label>
- <div class="layui-input-inline">
- <select name="PickingArea" id="PickingArea" lay-search>
- <option value=""></option>
- <option value="1">1</option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</option>
- </select>
- </div>
- </div>
+ </div>
<div class="layui-inline">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
lay-filter="LAY-app-contlist-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
</div>
-
+ <!-- 纭鍑哄簱鍙ｅ脊绐� -->
+ <div class="layui-inline" id="divPickingArea" style="display: none; padding-top: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鎷嗗灈鏂瑰紡</label>
+ <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">PDA鎷嗗灈</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
+ <label class="layui-form-label">瑁呰溅鍙�</label>
+ <div class="layui-input-inline" style="width: 220px;">
+ <select name="LoadingArea" id="LoadingArea" lay-search>
+ <option value=""></option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline DivPickingArea2" style="margin-top: 10px;">
+ <label class="layui-form-label">鍑哄簱鍙�</label>
+ <div class="layui-input-inline" style="width: 220px;">
+ <select name="PickingArea" id="PickingArea" lay-search>
+ <option value=""></option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ </select>
+ </div>
+ </div>
+ </div>
<!-- 缁存姢澶囨敞寮规 -->
<div class="layui-inline" id="divEditDemo" style="display: none; padding-top: 10px;">
<label class="layui-form-label">澶囨敞</label>
@@ -164,13 +198,23 @@
{{# function GetBtn3(d){
switch (d.Type) {
case "0":
- return "鏍囧噯閿�鍞嚭搴�";
+ return "鎴愬搧鍑哄簱";
case "1":
- return "闈炴爣鍑嗛攢鍞嚭搴�";
+ return "棰嗘枡鍑哄簱";
case "2":
- return "鏍囧噯璋冩嫧鍑哄簱";
+ return "鎶芥鍑哄簱";
case "3":
- return "闈炴爣鍑嗚皟鎷ㄥ嚭搴�";
+ return "鐗╂枡鍙栨牱鍑哄簱";
+ case "4":
+ return "涓嶅悎鏍煎搧鍑哄簱";
+ case "5":
+ return "涓棿鍝佸嚭搴�";
+ case "6":
+ return "浠ｅ偍鍑哄簱";
+ case "7":
+ return "鍏朵粬鍑哄簱";
+ case "8":
+ return "瀵勫瓨鍑哄簱";
default:
return "";
}
@@ -193,6 +237,8 @@
case "4":
return `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">鎵ц瀹屾瘯</button>`;
case "5":
+ return `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">璁㈠崟鍏抽棴</button>`;
+ case "6":
return `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">涓婁紶瀹屾瘯</button>`;
default:
return "";
@@ -231,6 +277,14 @@
}
}}
{{ GetBtn7(d) }}
+ </script>
+
+ <script type="text/html" id="templetCheckTime">
+ {{# function GetBtn8(d){
+ return formatDate(d.CheckTime);
+ }
+ }}
+ {{ GetBtn8(d) }}
</script>
<!-- #endregion -->
</div>
@@ -282,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">
@@ -309,6 +365,11 @@
html += `<a class="layui-btn layui-btn-normal layui-btn-xs guanClass" lay-event="finish">
<i class="layui-icon layui-icon-ok"></i>鍏冲崟
</a>`;
+ }
+ if( d.Status == '5'){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs checkClass" lay-event="check">
+ <i class="layui-icon layui-icon-ok"></i>澶嶆牳
+ </a>`;
}
html += `<a class="layui-btn layui-btn-normal layui-btn-xs shangClass" lay-event="xml">
<i class="layui-icon layui-icon-ok"></i>XML
@@ -428,6 +489,8 @@
{field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',templet: '#templetCreateTime'},
{field: 'UpdateUserName',title: '淇敼浜�',align: 'center'},
{field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',templet: '#templetUpdateTime'},
+ {field: 'CheckUserName',title: '澶嶆牳浜�',align: 'center',width: 110},
+ {field: 'CheckTime',title: '澶嶆牳鏃堕棿',align: 'center',templet: '#templetCheckTime'},
{field: 'caozuo',title: '鎿嶄綔',fixed: 'right',align: 'center',width: 200,toolbar: '#table-content-list', "disabled": true}
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -950,6 +1013,7 @@
$(".qufenClass").hide(); //鍙栨秷鍒嗛厤
$(".outClass").hide(); //鍑哄簱
$(".editDemoClass").hide();//澶囨敞
+ $(".checkClass").hide(); //澶嶆牳
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -1006,6 +1070,11 @@
$(".editDemoClass").show();
});
}
+ if (res.data[k].MenuName == "澶嶆牳鍑哄簱鍗�") {
+ $(function() {
+ $(".checkClass").show();
+ });
+ }
}
}
} else { //涓嶆垚鍔�
@@ -1039,6 +1108,7 @@
});
}
});
+ var isNeedUnpack='0'//鏄惁闇�瑕佹媶绠憋紝0锛氬惁 1锛氭槸
//鐩戝惉鏁版嵁鎿嶄綔
table.on('tool(LAY-app-content-list)', function(obj) {
var data = obj.data;
@@ -1072,7 +1142,7 @@
var param = {
Id: parseInt(Id),
};
- sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function(res) {
+ sendData(IP + "/UpApi/CloseExportNotice", param, 'post', function(res) {
console.log(res);
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
@@ -1156,13 +1226,41 @@
maxmin: true,
area: ['1200px', '90%'],
});
- }else if(obj.event === 'outKu'){
+ }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"){
+ isNeedUnpack='1'
+ $('.DivPickingArea2').show()//.attr("style", "display:block")
+ }else{
+ isNeedUnpack='0'
+ $('.DivPickingArea2').hide()//.attr("style", "display:none")
+ }
+ if($('#UnstackWay').val()=='1'){
+ $('.DivPickingArea2').show()//.attr("style", "display:block")
+ }
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ return;
+ });
+ }
+ });
layer.open({
type: 1,
title: '纭鍑哄簱鍙�',
content: $('#divPickingArea'),
maxmin: true,
- area: ['300px','265px'],
+ area: ['350px','285px'],
btn: ['纭畾', '鍙栨秷'],
yes: function(index, layero) {
var pa = $('#PickingArea').val();
@@ -1178,7 +1276,9 @@
}
var param = {
soNo: data.SONo,
+ unstackingMode:$('#UnstackWay').val(),
outMode: pa,
+ loadingAddre:$('#LoadingArea').val()
};
console.log(param);
sendData(IP + "/DownApi/IssueOutHouse", param, 'get', function(res) {
@@ -1282,6 +1382,29 @@
});
}
});
+ }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 });
+ }
+ });
+ });
}
});
@@ -1376,6 +1499,21 @@
downloadA.click();
document.body.removeChild(downloadA);
}
+ //鎷嗗灈鏂瑰紡鍒囨崲
+ form.on('select(UnstackWay)',function(data){
+ var value = data.value;
+ if(value==0){
+ $('.DivLoadingArea').show()//.attr("style", "display:block")
+ if(isNeedUnpack=='0'){
+ $('.DivPickingArea2').hide()//.attr("style", "display:none")
+ }else{
+ $('.DivPickingArea2').show()//.attr("style", "display:block")
+ }
+ }else{
+ $('.DivLoadingArea').hide()//.attr("style", "display:none")
+ $('.DivPickingArea2').show()//.attr("style", "display:block")
+ }
+ });
//#region 鑷畾涔夎〃澶�
//鑷畾涔夎〃澶�
--
Gitblit v1.8.0