From b1e84f41539a893949c29dbb23390a882c2a452f Mon Sep 17 00:00:00 2001 From: wxw <Administrator@DESKTOP-5BIMHQ3> Date: 星期四, 21 八月 2025 09:46:43 +0800 Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS --- Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs index e57b70b..a8f25c3 100644 --- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs +++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs @@ -610,8 +610,18 @@ { throw new Exception("鏈煡璇㈠埌鍗曟嵁淇℃伅"); } - - var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == asnList.PackagNo); + //鍖呰缂栫爜 + var packagNo = asnList.PackagNo; + if (string.IsNullOrEmpty(packagNo)) + { + var skuInfo = Db.Queryable<SysMaterials>().First(w => w.IsDel == "0" && w.SkuNo == asnList.SkuNo); + if (skuInfo == null) + { + throw new Exception("鏈煡璇㈠埌鐗╂枡淇℃伅"); + } + packagNo = skuInfo.PackagNo; + } + var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == packagNo); if (pack == null) { throw new Exception("鏈煡璇㈠埌褰撳墠鍗曟嵁涓墿鏂欑殑鍖呰淇℃伅"); -- Gitblit v1.8.0