From 3090db54ecfebf7ee1089bf85916b19e93f0db45 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 11 一月 2025 10:49:11 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
index 7ff0ca5..2055a6c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
@@ -81,7 +81,6 @@
             ISugarQueryable<StockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).Select((b, a)
                 => new StockViewDTO
                 {
-                    WarehouseId=a.WarehouseId,
                     LocationCode = b.LocationCode,
                     Column = a.Column,
                     CreateDate = b.CreateDate,
@@ -89,7 +88,6 @@
                     Depth = a.Depth,
                     EnalbeStatus = a.EnableStatus,
                     Layer = a.Layer,
-                    WarehouseId = b.WarehouseId,
                     LocationName = a.LocationName,
                     LocationStatus = a.LocationStatus,
                     LocationType = a.LocationType,

--
Gitblit v1.9.3