Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

admin

昨天 88430dbe00e46a856b918cef9372a3132aac5712

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -1653,10 +1653,10 @@
                    boxNo, "出库", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
                Db.CommitTran();
            }
            catch (AppFriendlyException e)
            {
                Db.RollbackTran();
            }
            //catch (AppFriendlyException e)
            //{
            //    Db.RollbackTran();
            //}
            catch (Exception e)
            {
                Db.RollbackTran();