Merge branch 'csc'

Demo

2024-03-20 f50cf678d6960dc6f39809aaedd45fdb95c13e4f

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -242,7 +242,19 @@
                        {
                            foreach (var demo in list)
                            {
                                var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
                                //if (!string.IsNullOrWhiteSpace(boxNo3))
                                //{
                                //    var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
                                //}
                                //else if (!string.IsNullOrWhiteSpace(boxNo))
                                //{
                                //    if (expr)
                                //    {
                                        
                                //    }
                                    
                                //}
                                var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 != null && m.BoxNo3 == demo.BoxNo);
                                if (com != null)
                                {
                                    demo.PickedQty = com.CompleteQty;