From 95a533c6939aefd7e9370c4671168b53462d106e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 21 二月 2024 16:03:50 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 8 ++++++++
Wms/WMS.BLL/Logic/AllotLocation.cs | 2 +-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 74f13d8..9922eb2 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -156,12 +156,20 @@
switch (model.Type)//0锛氬師鏂� 1锛氬寘鏉� 2锛氭垚鍝� 3锛氳�楁潗 4锛氬崐鎴愬搧
{
case "0"://鎴愬搧鍏ュ簱
+ skuType = "(2)";
+ break;
case "3"://閫�璐у叆搴�
+ skuType = "(2)";
+ break;
case "5"://鍏跺畠鍏ュ簱
+ skuType = "(0,1,3)";
+ break;
case "6"://浠ｅ偍鍏ュ簱
skuType = "(2)";
break;
case "1"://閲囪喘鍏ュ簱
+ skuType = "(0,1,3)";
+ break;
case "4"://杞﹂棿浣欐枡閫�鍥炲叆搴�
skuType = "(0,1,3)";
break;
diff --git a/Wms/WMS.BLL/Logic/AllotLocation.cs b/Wms/WMS.BLL/Logic/AllotLocation.cs
index eb574c4..960487f 100644
--- a/Wms/WMS.BLL/Logic/AllotLocation.cs
+++ b/Wms/WMS.BLL/Logic/AllotLocation.cs
@@ -258,7 +258,7 @@
sql += "order by ";
sql += topOrBom == 0 ? "Layer desc, " : "Layer, ";
sql += leftOrRight == 0 ? "[Column], " : "[Column] desc, ";
- sql += " Row desc Depth desc; ";
+ sql += " Row desc, Depth desc; ";
var locateList = db.Ado.SqlQuery<SysStorageLocat>(sql);
--
Gitblit v1.8.0