Merge branch 'csc'

Demo

2024-03-07 ca13a7c8cb6cc1ef00cda9b085b1a7a14ce51a5b

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -364,7 +364,7 @@
                {
                    throw new Exception("托盘码不能为空");
                }
                if (!string.IsNullOrEmpty(boxNo3) && (!string.IsNullOrEmpty(pickQty1) || int.Parse(pickQty1) > 0))
                if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)
                {
                    throw new Exception("追溯条码和拣货数量不能同时输入");
                }