From c2db1ba1de0a9b2916585ae823972bdc18a229e6 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 18 二月 2025 16:21:50 +0800
Subject: [PATCH] 储位
---
HTML/views/WareHouseSetting/StorageLegend.html | 10 ++++++----
Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs | 2 +-
Wms/Wms/Controllers/SysController.cs | 10 +++++-----
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 14 +++++++-------
4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 380f98c..25fad75 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -253,7 +253,7 @@
});
getRoadway(); //鑾峰彇浠撳簱宸烽亾
getRow(); //鑾峰彇宸烽亾涓帓
- funDepth(); //鑾峰彇鎺掔殑娣卞害
+ //funDepth(); //鑾峰彇鎺掔殑娣卞害
GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val()); //鑾峰彇鏁版嵁娓叉煋搴撲綅鍥�
GetSlotChart($("#WareHouseNo").val()); //鑾峰彇鍦嗗舰淇℃伅
GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()) //鑾峰彇鏌辩姸淇℃伅
@@ -376,10 +376,11 @@
}
getRow(); //鑾峰彇宸烽亾涓帓
GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()); //鑾峰彇鏌辩姸淇℃伅
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
})
//鎺掑彉鏇�
form.on('select(SelectRow)', function (data) {
- funDepth(); //鑾峰彇鎺掍腑娣卞害
+ //funDepth(); //鑾峰彇鎺掍腑娣卞害
});
//娣卞害鍙樻洿
form.on('select(SelectDepth)', function (data) {
@@ -389,7 +390,7 @@
function getRow()
{
$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
- synData(IP + "/Sys/ByRoadwayGetRow", { roadwayNo: $("#RoadwayNo").val() }, 'get', function (res) {
+ synData(IP + "/Sys/ByRoadwayGetRow", { warehouseNo:$("#WareHouseNo").val(), roadwayNo: $("#RoadwayNo").val() }, 'get', function (res) {
// console.log(res)
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
@@ -397,7 +398,7 @@
}
$("#Row option[value='" + res.data[0] + "']").attr("selected", "selected")
form.render('select');
- funDepth(); //鑾峰彇娣卞害
+ //funDepth(); //鑾峰彇娣卞害
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -521,6 +522,7 @@
var html = '';
var list = res.data;
//鎸夊眰娓叉煋
+ debugger
for (let i = res.maxlayer; i > 0; i--) {
html += '<tr style="height:10px;">';
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index c1e7965..2f45fce 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -82,7 +82,7 @@
Flag = m.Flag,
FlagName = GetFlag(m.Flag),
Make = m.Make,
- MakeName = m.Make == "0"? "璺戦亾": m.Make == "1" ? "鍌ㄤ綅":"",
+ MakeName = m.Make == "0" ? "璺戦亾" : m.Make == "1" ? "鍌ㄤ綅" : "",
Depth = m.Depth,
Row = m.Row,
Column = m.Column,
@@ -139,7 +139,7 @@
{
try
{
- var bl = LocatRst.EditStorageLocat(model.Id,model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
+ var bl = LocatRst.EditStorageLocat(model.Id, model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
return bl;
}
@@ -274,7 +274,7 @@
{
c1 = c.ToString();
}
-
+
q += await LocatRst.AddAsync(new SysStorageLocat()
{
LocatNo = r1 + l1 + c1,
@@ -289,7 +289,7 @@
Layer = c,
CreateUser = userId
});
-
+
}
}
}
@@ -338,7 +338,7 @@
// //鍏朵綑鏉′欢
// }
//}
-
+
q += await LocatRst.AddAsync(new SysStorageLocat()
{
// 鍖哄煙+鎺�+鍒�+灞�
@@ -908,9 +908,9 @@
/// </summary>
/// <param name="roadwayNo">宸烽亾</param>
/// <returns></returns>
- public List<string> ByRoadwayGetRow(string roadwayNo)
+ public List<string> ByRoadwayGetRow(string wareHouseNo, string roadwayNo)
{
- string str = $"select Row from SysStorageLocat where IsDel = '0' and WareHouseNo = 'W01' and RoadwayNo = '{roadwayNo}' group by Row order by Row";
+ string str = $"select Row from SysStorageLocat where IsDel = '0' and WareHouseNo = '{wareHouseNo}' and RoadwayNo = '{roadwayNo}' group by Row order by Row";
List<string> row = Db.Ado.SqlQuery<string>(str);
return row;
diff --git a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
index 1def813..832d69d 100644
--- a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
@@ -178,7 +178,7 @@
/// </summary>
/// <param name="roadwayNo">宸烽亾</param>
/// <returns></returns>
- List<string> ByRoadwayGetRow(string roadwayNo);
+ List<string> ByRoadwayGetRow(string wareHouseNo, string roadwayNo);
#region 骞冲簱
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index 5a4679c..ce203ba 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -1100,8 +1100,8 @@
{
bolls = await _locatSvc.AddPkStorageLocat(model, 1);
}
-
-
+
+
if (bolls > 0)
{
await _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", model.RoadwayNo, "娣诲姞", "娣诲姞鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + model.RoadwayNo, 1);
@@ -1251,7 +1251,7 @@
var list = _locatSvc.GetStorageLocat();
foreach (var item in model.Id)
{
- storage = list.FirstOrDefault(m=>m.Id == item);
+ storage = list.FirstOrDefault(m => m.Id == item);
if (storage != null)
{
_operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", storage.LocatNo, "鎵归噺缂栬緫", "鎵归噺淇敼鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + storage.LocatNo, Convert.ToInt32(userId));
@@ -1703,9 +1703,9 @@
/// <param name="roadwayNo">宸烽亾鍙�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult ByRoadwayGetRow(string roadwayNo)
+ public IActionResult ByRoadwayGetRow(string wareHouseNo, string roadwayNo)
{
- List<string> row = _locatSvc.ByRoadwayGetRow(roadwayNo);
+ List<string> row = _locatSvc.ByRoadwayGetRow(wareHouseNo, roadwayNo);
return Ok(new
{
data = row,
--
Gitblit v1.8.0