From 3ad0ef8e8bdfd94d63d06aedbbc0fe02c1ae476b Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期日, 04 二月 2024 10:55:33 +0800
Subject: [PATCH] 修改储位巷道，修改后台获取巷道信息
---
HTML/views/WareHouseSetting/StorageLegend.html | 6 +++---
HTML/views/WareHouseSetting/Roadway.html | 2 +-
Wms/Model/ModelDto/SysDto/RoadwayDto.cs | 8 ++++++++
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 2 +-
HTML/views/WareHouseSetting/Area.html | 2 +-
HTML/views/WareHouseSetting/Locate.html | 6 +++---
6 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index 98ff937..a177cb2 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/HTML/views/WareHouseSetting/Area.html
@@ -112,7 +112,7 @@
sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + '>' +
+ $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 43ad11c..8daa3d2 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -446,7 +446,7 @@
sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' +
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
form.render('select');
@@ -470,7 +470,7 @@
$("#RoadwayNo").append('<option value =""></option>');
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' +
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].RoadwayName + '</option>');
}
form.render('select');
@@ -490,7 +490,7 @@
$("#AreaNo").append('<option value =""></option>');
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' +
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].AreaName + '</option>');
}
form.render('select');
diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index c7ac06c..afa6f04 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/HTML/views/WareHouseSetting/Roadway.html
@@ -115,7 +115,7 @@
for (var i = 0; i < res.data.length; i++) {
if (res.data[i].WareHouseNo == 'W01')
{
- $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' +
+ $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index c58250d..9b6c659 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -235,7 +235,7 @@
continue;
}
- $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' +
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
$("#WareHouseNo option[value='" + res.data[0].WareHouseNo + "']").attr("selected", "selected")
@@ -398,11 +398,11 @@
function getRoadway() {
$("#RoadwayNo").empty();
synData(IP + "/Sys/GetRoadwayList", { WareHouseNo: $("#WareHouseNo").val() }, 'get', function (res) {
- //console.log(res)
+ // console.log(res)
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' +
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].RoadwayName + '</option>');
}
$("#RoadwayNo option[value='" + res.data[0].RoadwayNo + "']").attr("selected", "selected")
diff --git a/Wms/Model/ModelDto/SysDto/RoadwayDto.cs b/Wms/Model/ModelDto/SysDto/RoadwayDto.cs
index b424a6f..8e1da8f 100644
--- a/Wms/Model/ModelDto/SysDto/RoadwayDto.cs
+++ b/Wms/Model/ModelDto/SysDto/RoadwayDto.cs
@@ -19,6 +19,14 @@
/// Nullable:False
/// </summary>
public string RoadwayName { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炰粨搴撳彿
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ public string WareHouseNo { get; set; }
+
/// <summary>
/// 鎵�灞炰粨搴撳悕绉�
/// Default:
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index 46abd4e..302db35 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -631,7 +631,7 @@
{
try
{
- string str = "select RoadwayNo,RoadwayName from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
+ string str = "select RoadwayNo,RoadwayName,WareHouseNo from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
List<RoadwayDto> roadway = Db.Ado.SqlQuery<RoadwayDto>(str, new
{
--
Gitblit v1.8.0