Merge branch 'master' of https://gitee.com/liudongl/jc24-wms

zhaowc

2025-01-20 f2bc08e28dda7022202f07217f6a3c150f818af7

 Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs

@@ -197,7 +197,7 @@
                                    {
                                        if (demo2.Origin != "WMS")
                                        {
                                            if (notice.Type != "1" || notice.Type != "4")
                                            if (notice.Type != "1" && notice.Type != "4")
                                            {
                                                demo2.ASNNo = null;
                                                demo2.ASNDetailNo = null;