Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

dengjunjie

2024-12-24 18d1f45193e34e00fc1b6f65b8596ddb29c5267d

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs

@@ -24,21 +24,21 @@
        /// <summary>
        /// æµ‹è¯•æž¶ä»“货位分配 <br/>
        /// æ‰˜ç›˜ç±»åž‹ï¼š <br/>
        /// 1：最长 <br/>
        /// 2：长 <br/>
        /// 3：中等 <br/>
        /// 4：短 <br/>
        /// 3和4都是3深，且可以混放。 <br/>
        /// 1和2都是2深，且可以混放。 <br/>
        /// 1：短 <br/>
        /// 2：中等 <br/>
        /// 3：长 <br/>
        /// 4：特长 <br/>
        /// 1和2都是3深，且可以混放。 <br/>
        /// 3和4都是2深，且可以混放。 <br/>
        /// ç§»åº“时只能是同侧货位。
        /// </summary>
        /// <param name="roadwayNo">巷道号</param>
        /// <param name="palletType">
        /// æ‰˜ç›˜ç±»åž‹ <br/>
        /// 1：最长 <br/>
        /// 2：长 <br/>
        /// 3：中等 <br/>
        /// 4：短 
        /// 1：短 <br/>
        /// 2：中等 <br/>
        /// 3：长 <br/>
        /// 4：特长 
        /// </param>
        /// <returns></returns>
        public Dt_LocationInfo? AssignLocation_CSJ(string roadwayNo, PalletTypeEnum palletType, string beRelocationCode = "")
@@ -99,7 +99,6 @@
                        Dt_LocationInfo? locationInfo = GetUsableLocation_CSJ(locationInfos, undefinedTypeEmptyLocation, palletType);
                        if (locationInfo != null)
                        {
                            UpdateLocationStatus(locationInfo, palletType, LocationStatusEnum.Lock, 3);
                            locationCaches_CSJ.Add(new LocationCache { LocationCode = locationInfo.LocationCode, DateTime = DateTime.Now });
                            return locationInfo;
                        }
@@ -113,7 +112,6 @@
                        Dt_LocationInfo? locationInfo = GetUsableLocation_CSJ(locationInfos, definedTypeEmptyLocation, palletType);
                        if (locationInfo != null)
                        {
                            UpdateLocationStatus(locationInfo, palletType, LocationStatusEnum.Lock, 3);
                            locationCaches_CSJ.Add(new LocationCache { LocationCode = locationInfo.LocationCode, DateTime = DateTime.Now });
                            return locationInfo;
                        }