From cfdbd0eadeb5dbe4ff8872bb67f43ae8f323a799 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 13 十月 2025 09:35:13 +0800
Subject: [PATCH] 优化入库单导入功能
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 7c9a7ee..ccbd5b2 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -122,7 +122,7 @@
{{ GetBtn(d) }}
</script>
-
+
<!-- #endregion -->
</div>
@@ -181,7 +181,7 @@
{ field: 'Id', title: '鍏ュ簱鍗曟槑缁咺D', width: 120, align: 'center', fixed: 'left', hide: true, "disabled": true },
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', minWidth: 100, align: 'center', fixed: 'left', "disabled": true },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', minWidth: 180, align: 'center', fixed: 'left', "disabled": true },
- { field: 'LotNo', title: '鎵规鍙�', align: 'center', edit: 'text',event: 'setlot', width: 130, fixed: 'left', "disabled": true },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center', edit: 'text', event: 'setlot', width: 130, fixed: 'left', "disabled": true },
{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 130, edit: 'text', event: 'setSign', fixed: 'left', "disabled": true },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 80, edit: 'number', event: 'dataNumber', fixed: 'left', "disabled": true },
{ field: 'UnitName', title: '璁￠噺鍗曚綅', align: 'center', width: 70 },
@@ -220,7 +220,7 @@
colsJson = TotalColsArr
}
console.log(colsJson);
-
+
infoOptions = {
elem: '#LAY-app-content-list',
height: 'full-110',
@@ -542,9 +542,9 @@
for (var i in data) {
var isHave = false;
for (var j in arr) {
- if (arr[j].SkuNo == data[i].SkuNo)
- // 娉ㄩ噴 liudl 鑻ュ瓨鍦ㄥ悓涓�鐗╂枡涓嶅悓鎵规鐗╂枡 鏀惧紑姝ゆ敞閲婏紝鍚庣宸查獙璇佹槸鍚﹂噸澶�
- //&& arr[j].LotNo == data[i].LotNo
+ if (arr[j].SkuNo == data[i].SkuNo)
+ // 娉ㄩ噴 liudl 鑻ュ瓨鍦ㄥ悓涓�鐗╂枡涓嶅悓鎵规鐗╂枡 鏀惧紑姝ゆ敞閲婏紝鍚庣宸查獙璇佹槸鍚﹂噸澶�
+ //&& arr[j].LotNo == data[i].LotNo
{
isHave = true;
break;
@@ -580,7 +580,7 @@
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
parent.location.reload();
parent.layer.close(layer.index);
@@ -647,7 +647,7 @@
switch ($("#Type").val()) {
//1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
-
+
case "2":
case "5":
case "6":
@@ -668,13 +668,25 @@
}
- if (!reg.test(arr[i].Qty)) {
- layer.msg("鍏ュ簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
+ var qtyValue = arr[i].Qty;
+ // 灏濊瘯灏嗗�艰浆鎹负鏁板瓧
+ var num = Number(qtyValue);
+
+ // 楠岃瘉瑙勫垯锛氬繀椤绘槸鏈夋晥鏁板瓧銆佸ぇ浜�0銆佸皬鏁颁綅鏁颁笉瓒呰繃4浣�
+ if (
+ isNaN(num) || // 涓嶆槸鏈夋晥鏁板瓧 T2500009 鍦扮爜 B010109
+ num <= 0 || // 灏忎簬绛変簬0
+ // 妫�鏌ュ皬鏁颁綅鏁帮紙鍏堣浆涓哄瓧绗︿覆澶勭悊锛�
+ (qtyValue.toString().indexOf('.') !== -1 &&
+ qtyValue.toString().split('.')[1].length > 4)
+ ) {
+ layer.msg("鍏ュ簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暟", {
icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ time: 2000
});
return -1;
}
+
var item = {
Id: arr[i].Id,
@@ -683,7 +695,7 @@
Standard: arr[i].Standard,
LotNo: arr[i].LotNo,
LotText: arr[i].LotText,
- Qty: parseInt(arr[i].Qty),
+ Qty: Number(qtyValue),////decimal
PackagNo: arr[i].PackagNo,
Price: arr[i].Price,
IsBale: arr[i].IsBale,
--
Gitblit v1.8.0