From 156e0d593769d1c4438eb1c6d4547063f76331b3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 19 十一月 2025 15:52:31 +0800
Subject: [PATCH] 修改拣货拼托bug
---
HTML/views/ASNSetting/ArrivalNotice.html | 187 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 161 insertions(+), 26 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 19b0bf3..1194753 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -140,7 +140,7 @@
</div>
<div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ <button id="searchBtn" 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>
@@ -175,7 +175,7 @@
<script type="text/html" id="toolbarDemo1">
{{# function GetBtn1(d){
var html = '';
- if (d.Status == '0' && (d.Origin == '褰曞叆' || d.Origin == '閲囪喘鍗�')) {
+ if (d.Status == '0' && (d.Origin == '褰曞叆' || d.Origin == '瀵煎叆' || d.Origin == '閲囪喘鍗�' || d.Origin == 'SAP')) {
html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>缂栬緫</a>`;
}
@@ -291,6 +291,9 @@
<button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass" lay-event="add" >
<i class="layui-icon"></i>娣诲姞
</button>
+ <button style="margin-right: 5px;" id="daoru" class="layui-btn layui-btn-sm layuiadmin-btn-list DaoRuClass" lay-event="import" >
+ <i class="layui-icon"></i>瀵煎叆
+ </button>
</script>
<script type="text/html" id="toolbarDemoList">
@@ -302,7 +305,7 @@
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
}
- if((d.AsnType =="1" || d.AsnType == "4" || d.AsnType == "8") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){
+ if((d.AsnType =="1" || d.AsnType == "4") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel">
<i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
}
@@ -399,11 +402,14 @@
<script>
var uid = $.cookie('userId');
+ layui.extend({
+ excel: '../../layuiadmin/layui/layui_exts/excel' // {/}鐨勬剰鎬濆嵆浠ｈ〃閲囩敤鑷湁璺緞锛屽嵆涓嶈窡闅� base 璺緞
+ })
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'laypage', 'layer', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'laypage', 'layer', 'laydate', 'upload', 'excel'], function () {
var doing = true;
@@ -411,6 +417,8 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
+
+ var upload = layui.upload;
laydate = layui.laydate;
@@ -591,8 +599,127 @@
},
cols: colsJson2
});
+
+ //缁戝畾瀵煎叆
+ upload.render({
+ elem: '#daoru' //缁戝畾鍏冪礌
+ , url: '' //涓婁紶鎺ュ彛
+ , auto: false //鏄惁閫夊畬鏂囦欢鍚庤嚜鍔ㄤ笂浼犮�傚鏋滆瀹� false锛岄偅涔堥渶瑕佽缃� bindAction 鍙傛暟鏉ユ寚鍚戜竴涓叾瀹冩寜閽彁浜や笂浼�
+ , exts: 'slx|excel|xlsx' //鍏佽涓婁紶鐨勬枃浠跺悗缂�
+ , accept: 'file' //鎸囧畾鍏佽涓婁紶鏃舵牎楠岀殑鏂囦欢绫诲瀷
+ //, bindAction: '#daoru' //鎸囧悜涓�涓寜閽Е鍙戜笂浼�
+ , choose: function (obj) {// 閫夋嫨鏂囦欢鍥炶皟
+ console.log(obj);
+ var files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+ var fileArr = Object.values(files);// 娉ㄦ剰杩欓噷鐨勬暟鎹渶瑕佹槸鏁扮粍锛屾墍浠ラ渶瑕佽浆鎹竴涓�
+ console.log(fileArr)
+ // 鐢ㄥ畬灏辨竻鐞嗘帀锛岄伩鍏嶅娆￠�変腑鐩稿悓鏂囦欢鏃跺嚭鐜伴棶棰�
+ for (var index in files) {
+ console.log(index);
+ if (files.hasOwnProperty(index)) {
+ delete files[index];
+ }
+ }
+ console.log("abs");
+ uploadExcel(fileArr); // 濡傛灉鍙渶瑕佹渶鏂伴�夋嫨鐨勬枃浠讹紝鍙互杩欐牱鍐欙細 uploadExcel([files.pop()])
+ }
+ , done: function (res) {
+ console.log(res);
+ //涓婁紶瀹屾瘯鍥炶皟
+ }
+ , error: function (res) {
+ console.log(res);
+ //璇锋眰寮傚父鍥炶皟
+ }
+ });
});
//#endregion
+ }
+
+ // 瀵煎叆鍏ュ簱鍗曟嵁
+ function uploadExcel(files) {
+ var noticeList = [];
+ try {
+ var excel = layui.excel;
+ excel.importExcel(files, {
+ // 璇诲彇鏁版嵁鐨勫悓鏃舵⒊鐞嗘暟鎹�
+ fields: {
+ 'SkuNo': 'A', //鐗╂枡鍙�
+ 'SkuName': 'B', //鐗╂枡鍚嶇О
+ 'Qty': 'C', //鏁伴噺
+ 'LotNo': 'D', //鎵规
+ 'LotText': 'E', //鎵规鎻忚堪
+ 'SupplierLot': 'F', //渚涜揣鎵规
+ 'Lot1': 'G', //鐢熶骇鏃ユ湡
+ 'Lot2': 'H', //杩囨湡鏃ユ湡
+ 'CustomerNo': 'I', //渚涘簲鍟嗙紪鐮�
+ 'CustomerName': 'J', //渚涘簲鍟嗗悕绉�
+ }
+ },
+ function (data) {
+ console.log(data);
+ // var arr = new Array();
+ //excel绗竴琛屼笉璇诲彇銆佽缃负鏍囬
+ for (i = 1; i < data[0].Sheet1.length; i++) {
+ var noticeDetailList = [];
+ var Qty = 0;
+ if (data[0].Sheet1[i].Qty) {
+ Qty = parseFloat(data[0].Sheet1[i].Qty);
+ }
+ var noticeDetail={
+ SkuNo: data[0].Sheet1[i].SkuNo.toString(),
+ SkuName: data[0].Sheet1[i].SkuName.toString(),
+ Qty: Qty,
+ LotNo: data[0].Sheet1[i].LotNo.toString(),
+ LotText: data[0].Sheet1[i].LotText,
+ SupplierLot: data[0].Sheet1[i].SupplierLot.toString(),
+ Lot1: data[0].Sheet1[i].Lot1,
+ Lot2: data[0].Sheet1[i].Lot2,
+
+ };
+ noticeDetailList.push(noticeDetail);
+ var notice = {
+ Type:'1',
+ CustomerNo: data[0].Sheet1[i].CustomerNo.toString(),
+ CustomerName: data[0].Sheet1[i].CustomerName.toString(),
+ AsnDetail:noticeDetailList
+ };
+ noticeList.push(notice);
+ }
+ var param = {
+ "ListArrivalNotice": noticeList,
+ }
+ //console.log('param:'+param)
+ layer.load();//鎵撳紑loading
+ sendData(IP + "/BllAsn/ImportArrivalNotice", param, 'post', function (res) {
+ layer.closeAll(); //鍏抽棴loading
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ $('#searchBtn').click();
+ doing = true
+ });
+ } else { //涓嶆垚鍔�
+ if (res.msg == undefined) {
+ layer.msg("瀵煎叆鏁版嵁鏍煎紡鏈夎锛�", {
+ icon: 2,
+ time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { $('#searchBtn').click(); doing = true });
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { $('#searchBtn').click(); doing = true });
+ }
+ }
+ });
+ });
+ } catch (e) {
+ layer.alert(e.message);
+ }
+
}
function setRight() {
@@ -604,7 +731,7 @@
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
$(".checkClass").hide(); //澶嶆牳
- $(".addLabelClass").hide(); //鐢熸垚鏍囩
+ $(".addLabelClass").hide(); //鐢熸垚鏍囩
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
@@ -748,26 +875,34 @@
case "check":
// 浠ｇ爜鍖哄煙
layer.confirm('纭畾澶嶆牳姝ゅ崟鎹悧锛�', function (index) {
- // 浠ｇ爜鍖哄煙
- var param = {
- Id: data.Id,
- };
- sendData(IP + "/UpApi/FinishAsn", 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 (doing == true) {
+ doing = false;
+ // 浠ｇ爜鍖哄煙
+ var param = {
+ Id: data.Id,
+ };
+ sendData(IP + "/UpApi/FinishAsn", 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 });
+ }
+ });
+ } else {
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
});
break;
@@ -886,7 +1021,7 @@
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 B2025080501000035 tuopan T2500037
}, function () { doing = true });
}
});
--
Gitblit v1.8.0