From b850ff5ee8c1fa3938751ffb9d627fed90a5500e Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期二, 20 二月 2024 13:31:43 +0800
Subject: [PATCH] 修改库存信息、托盘信息后台代码以及前台页面
---
Wms/WMS.BLL/DataServer/StockDetailServer.cs | 21 +++++++++++----------
HTML/views/StatisticalReport/InventoryStatistics.html | 3 ++-
Wms/Wms/Controllers/StatisticalController.cs | 2 +-
HTML/views/StatisticalReport/BoxInfor.html | 8 +++++---
Wms/WMS.BLL/DataServer/StockServer.cs | 2 +-
Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs | 5 +++--
6 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 9041137..0e75ea6 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -371,8 +371,9 @@
//#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
{field: '',title: '搴忓彿',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
- {field: 'WareHouseNo', title: '鎵�灞炰粨搴�', align: 'center'},
- {field: 'AreaNo', title: '鎵�灞炲尯鍩�', align: 'center'},
+ {field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center'},
+ {field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center'},
+ {field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center'},
{field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'},
{field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center'},
{field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
@@ -433,7 +434,8 @@
BitBoxMark:BitBoxMark, //闆剁鏍囪
InspectStatus:InspectStatus //璐ㄩ噺鐘舵��
};
- sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
+ sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
+ console.log(res)
if (res.code == 0) { //鎴愬姛
var list = res.data;
$.extend(infoOptions, {
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 8dd1e35..9a1d1fd 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -495,8 +495,9 @@
var DetailColsArr = [[
{field: 'PalletNo',title: '鎵樼洏鍙�',align: 'center',width: 110,},
{field: 'LocatNo',title: '鍌ㄤ綅鍦板潃',align: 'center',width: 100,},
- {field: 'RoadwayName',title: '鎵�灞炲贩閬�',width: 90,align: 'center'},
{field: 'WareHouseName',title: '鎵�灞炰粨搴�',width: 90,align: 'center'},
+ {field: 'RoadwayName',title: '鎵�灞炲贩閬�',width: 90,align: 'center'},
+ {field: 'AreaName',title: '鎵�灞炲尯鍩�',width: 90,align: 'center'},
{field: 'SkuNo',title: '鐗╂枡缂栫爜',width: 100,align: 'center'},
{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'},
{field: 'Standard',title: '鐗╂枡瑙勬牸',width: 130,align: 'center'},
diff --git a/Wms/WMS.BLL/DataServer/StockDetailServer.cs b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
index d67ddd6..8d66d0b 100644
--- a/Wms/WMS.BLL/DataServer/StockDetailServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using Model.ModelDto.DataDto;
using SqlSugar;
using WMS.DAL;
using WMS.Entity.Context;
@@ -33,33 +34,33 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- public List<DataStockDetail> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)
+ public List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)
{
- string str = "select Id,LotNo,LotText,SupplierLot,SkuNo,SkuName,Qty,LockQty,FrozenQty,WareHouseNo,AreaNo,LocatNo,PalletNo,PalletNo2,PalletNo3,InspectMark,BitPalletMark from DataStockDetail where IsDel = @isdel";
+ string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo left join SysStorageArea area on detail.AreaNo = area.AreaNo where detail.IsDel = @isdel";
//鍒ゆ柇鐗╂枡鍙锋槸鍚︿负绌�
if (!string.IsNullOrEmpty(skuNo))
{
- str += " and SkuNo like @skuno";
+ str += " and detail.SkuNo like @skuno";
}
//鍒ゆ柇鐗╂枡鍚嶇О鏄惁涓虹┖
if (!string.IsNullOrEmpty(skuName))
{
- str += " and SkuName like @skuname";
+ str += " and detail.SkuName like @skuname";
}
//鍒ゆ柇鎵樼洏鍙锋槸鍚︿负绌�
if (!string.IsNullOrEmpty(palletNo))
{
- str += " and PalletNo like @palletno";
+ str += " and detail.PalletNo like @palletno";
}
//鍒ゆ柇鎵规鏄惁涓虹┖
if (!string.IsNullOrEmpty(lotNo))
{
- str += " and LotNo like @lotno";
+ str += " and detail.LotNo like @lotno";
}
//鍒ゆ柇闆舵墭鏍囪鏄惁涓虹┖
if (!string.IsNullOrEmpty(bitPalletMark))
{
- str += " and BitPalletMark = @bitpalletmark";
+ str += " and detail.BitPalletMark = @bitpalletmark";
}
int i = 0;
@@ -81,7 +82,7 @@
if (!string.IsNullOrEmpty(inspectMark))
{
boxstr += " and InspectMark = @inspectmark";
- str += " and InspectMark = @inspectmark";
+ str += " and detail.InspectMark = @inspectmark";
i = 1;
}
//鍒ゆ柇闆剁鏍囪鏄惁涓虹┖
@@ -94,7 +95,7 @@
if (!string.IsNullOrEmpty(inspectStatus))
{
boxstr += " and InspectStatus = @inspectstatus";
- str += " and InspectStatus = @inspectstatus";
+ str += " and detail.InspectStatus = @inspectstatus";
i = 1;
}
//灏嗙鐮佹暟鎹繘琛屾帓搴�
@@ -140,7 +141,7 @@
//鎺掑簭
str += " order by PalletNo,SkuNo,LotNo";
- List<DataStockDetail> boxInforList = Db.Ado.SqlQuery<DataStockDetail>(str, new
+ List<StockDetailDto> boxInforList = Db.Ado.SqlQuery<StockDetailDto>(str, new
{
isdel = "0", //鏄惁鍒犻櫎
skuno = "%" + skuNo + "%", //鐗╂枡鍙�
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 6dbea88..ac4587f 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -107,7 +107,7 @@
/// <returns></returns>
public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus)
{
- string str = "select detail.*,house.WareHouseName as WareHouseName,roadway.RoadwayName as RoadwayName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo Where detail.IsDel = @isdel";
+ string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo left join SysStorageArea area on detail.AreaNo = area.AreaNo Where detail.IsDel = @isdel";
//鍒ゆ柇鐗╂枡缂栫爜鏄惁涓虹┖
if (!string.IsNullOrEmpty(skuNo))
{
diff --git a/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs b/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
index 264101e..b41ffc5 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Model.ModelDto.DataDto;
+using System;
using System.Collections.Generic;
using System.Text;
using WMS.Entity.DataEntity;
@@ -22,7 +23,7 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- List<DataStockDetail> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus);
+ List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus);
/// <summary>
/// 瀵煎嚭鎵樼洏鏄庣粏
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 66dae9a..5a1516a 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -98,7 +98,7 @@
{
try
{
- List<DataStockDetail> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus);
+ List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
--
Gitblit v1.8.0