From d58fd0905004b5c4abf138c8fb95a597130af928 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 29 八月 2024 09:01:18 +0800
Subject: [PATCH] bug修复

---
 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 118e2bc..89427b5 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -106,6 +106,19 @@
 
                 if (modelList.Count > 0)
                 {
+                    if (!string.IsNullOrWhiteSpace(modelList[0].PackagNo))
+                    {
+                        // 鏌ヨ鏁存墭鏁伴噺 姝ゅUDF1鐢ㄦ潵瀛樺偍鏁存墭鏁伴噺銆�
+                        var packagModel = Db.Queryable<SysPackag>().Where(m => m.PackagNo == modelList[0].PackagNo && m.IsDel == "0").First();
+                        switch (packagModel.Level.ToString())
+                        {
+                            case "1": modelList[0].UDF1 = packagModel.L1Num.ToString(); break;
+                            case "2": modelList[0].UDF1 = packagModel.L2Num.ToString(); break;
+                            case "3": modelList[0].UDF1 = packagModel.L3Num.ToString(); break;
+                            case "4": modelList[0].UDF1 = packagModel.L4Num.ToString(); break;
+                            default: modelList[0].UDF1 = packagModel.L5Num.ToString(); break;
+                        }
+                    }
                     return modelList[0];
                 }
 
@@ -277,7 +290,8 @@
             try
             {
                 string sqlString = string.Empty;
-                sqlString = "select b.SkuNo,b.SkuName,a.LotNo,a.Qty,a.PalletNo,a.Id from BllPalletBind a left join BllArrivalNoticeDetail b on a.ASNDetailNo = b.Id where a.IsDel = '0' and b.IsDel = '0' ";
+                sqlString = "select b.SkuNo,b.SkuName,a.LotNo,a.Qty,a.PalletNo,a.Id from BllPalletBind a " +
+                    "left join BllArrivalNoticeDetail b on a.ASNDetailNo = b.Id where a.IsDel = '0' and b.IsDel = '0' ";
                 if (!string.IsNullOrEmpty(model.PalletNo))
                 {
                     sqlString += $"and PalletNo = '{model.PalletNo}' and a.Status = '0' ";

--
Gitblit v1.8.0