From 3c5515159041e97ad0d59603f1d309c98fca6a81 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期二, 20 二月 2024 13:32:41 +0800
Subject: [PATCH] Merge branch 'yyk'
---
Wms/WMS.BLL/DataServer/StockDetailServer.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
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 + "%", //鐗╂枡鍙�
--
Gitblit v1.8.0