From fccd9966ddc9d3e1e0f02cc117f634bf3136067e Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 27 八月 2024 09:01:05 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Pda/View/login.html | 2 +-
HTML/views/ASNSetting/PalletBind.html | 13 +------------
Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs | 6 ++++++
Pda/View/SoSetting/pingKuOut.html | 14 +++++++++++---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 6 ++++--
5 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 51f9d81..f7761ca 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -331,17 +331,6 @@
{{ GetBtn11(d) }}
</script>
- <script type="text/html" id="WareHouseButton">
- {{#
- switch (d.WareHouseNo) {
- case "W01": return '鍔涜绔嬩綋搴�';
- case "W02": return '鍔涜骞冲簱';
- default: return "";
- }
-
- }}
- </script>
-
<script type="text/html" id="RoadwayButton">
{{#
switch (d.RoadwayNo) {
@@ -466,7 +455,7 @@
{ field: 'PalletNo3', title: '鎵樼洏鍙稬V3', align: 'center' },
{ field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 90 },
{ field: 'RoadwayNo', title: '鎵�灞炲贩閬�', align: 'center', width: 90, templet: '#RoadwayButton' },
- { field: 'WareHouseNo', title: '鎵�灞炰粨搴�', align: 'center', width: 90, templet: '#WareHouseButton' },
+ { field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center', width: 90},
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 110 },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
{ field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 120 },
diff --git a/Pda/View/SoSetting/pingKuOut.html b/Pda/View/SoSetting/pingKuOut.html
index e8c5d73..3f0cecb 100644
--- a/Pda/View/SoSetting/pingKuOut.html
+++ b/Pda/View/SoSetting/pingKuOut.html
@@ -277,12 +277,10 @@
//妫�鏌ユ墭鐩樼姸鎬�
function checkPalletState() {
-
var param = {
"PalletNo": $("#PalletNo").val()
}
synData(IP + "/PdaSo/IsEnableOkPalletNo", param, 'post', function (res) {
- console.log("AAA");
console.log(res);
if (res.code == 0) { //鎴愬姛
@@ -304,11 +302,21 @@
//褰撴墭鐩樻潯鐮佽緭鍏ユ澶卞幓鐒︾偣鏃�,妫�鏌ヤ竴涓嬫墭鐩樼姸鎬�
$("#PalletNo").blur(function () {
- checkPalletState()
+ if ($("#PalletNo").val().length == 8) {
+ checkPalletState()
+ }
+
})
$("#PalletNo").keydown(function (e) {
if (e.keyCode === 13) {
+ if ($("#PalletNo").val().length != 8) {
+ layer.msg('璇疯緭鍏ユ纭殑鎵樼洏鏉＄爜', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
checkPalletState();
}
});
diff --git a/Pda/View/login.html b/Pda/View/login.html
index 8c75686..2693d23 100644
--- a/Pda/View/login.html
+++ b/Pda/View/login.html
@@ -205,7 +205,7 @@
location.href="/View/index.html";
});
}else{//涓嶆垚鍔�
- layer.msg(res.ErrorMsg, {
+ layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
diff --git a/Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs b/Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs
index c5f709c..1dacdff 100644
--- a/Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs
+++ b/Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs
@@ -39,6 +39,12 @@
/// Nullable:True
/// </summary>
public string WareHouseNo { get; set; }
+ /// <summary>
+ /// Desc:鎵�灞炰粨搴撳悕绉�
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string WareHouseName { get; set; }
/// <summary>
/// Desc:鐗╂枡缂栫爜
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index ecefa7d..7eaf41a 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -636,9 +636,10 @@
.LeftJoin<BllArrivalNoticeDetail>((a, b) => a.ASNDetailNo == b.Id)
.LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
.LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)
- //.LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
+ .LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
+ .LeftJoin<SysStorageArea>((a, b, c, d, e,f) => e.AreaNo == f.AreaNo)
//.LeftJoin<BllBoxInfo>((a, b, c, d, e, f) => a.Id == e.BindNo)
- .Select((a, b, c, d) => new PalletBindDto()
+ .Select((a, b, c, d,e,f) => new PalletBindDto()
{
Id = a.Id,
ASNNo = a.ASNNo,
@@ -650,6 +651,7 @@
LocatNo = a.LocatNo,
RoadwayNo = a.RoadwayNo,
WareHouseNo = a.WareHouseNo,
+ WareHouseName = f.AreaName,
Qty = a.Qty,
FullQty = a.FullQty,
SamplingQty = a.SamplingQty,
--
Gitblit v1.8.0