From 994dced313b956180f1b95e68760290c5ed931ba Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 15 一月 2025 19:12:47 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index 42c0d58..bcf23c8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -534,7 +534,7 @@
                         PalletCode = palletCode,
                         StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
                         WarehouseId = inboundOrder.WarehouseId,
-                        PalletType = GetPalletType(warehouse, palletCode, materielInfo),
+                        PalletType = GetPalletType(warehouse, palletCode),
                         Details = new List<Dt_StockInfoDetail>()
                     };
                 }
@@ -678,7 +678,7 @@
                         PalletCode = palletCode,
                         StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt(),
                         WarehouseId = warehouse.WarehouseId,
-                        PalletType = GetPalletType(warehouse, palletCode, materielInfo),
+                        PalletType = GetPalletType(warehouse, palletCode),
                         Details = new List<Dt_StockInfoDetail>()
                     };
                 }
@@ -1029,7 +1029,7 @@
         //    }
         //}
 
-        public int GetPalletType(Dt_Warehouse warehouse, string palletCode, Dt_MaterielInfo materielInfo)
+        public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
         {
             if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
             {

--
Gitblit v1.9.3