Merge branch 'master' into wxw

Administrator

2024-03-05 b506c4535c62c4c5fd7c5b5c0bd7bb8b03390dbd

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -177,7 +177,7 @@
                        skuType = "(4)";
                        break;
                    case "7"://寄存入库
                        skuType = "(0,1,2,3,4)";
                        skuType = "(3)";
                        break;
                    default: //其它
                        skuType = "(0,1,2,3,4)";