字段优化，板材货位限制

wangxinhui

2025-11-15 c4885ceaf477654dc0d2c02c7235c6ca683e08d4

字段优化，板材货位限制

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs

@@ -43,6 +43,12 @@
        OutAllocate = 150,

        /// <summary>
        /// é”€å”®å‡ºåº“
        /// </summary>
        [Description("销售出库")]
        OutSale = 170,

        /// <summary>
        /// MES出库
        /// </summary>
        [Description("MES出库")]

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/UpdateExpirationlabelJob.cs

@@ -25,7 +25,6 @@

                WebResponseContent? responseContent = JsonConvert.DeserializeObject<WebResponseContent>(responseStr);
                

                Thread.Sleep(2000);

                string address2 = AppSettings.Get("WMSApiAddress");

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

@@ -72,8 +72,8 @@
                List<Dt_LocationInfo> undefinedTypeEmptyLocations = locationInfos.Where(x => (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.LocationType == LocationTypeEnum.Undefined.ObjToInt() && !lockLocationCodes.Contains(x.LocationCode)).OrderByDescending(x => x.Depth).ThenBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).ToList();

                List<Dt_LocationInfo> definedTypeEmptyLocations = locationInfos.Where(x => (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.LocationType == palletType.ObjToInt() && !lockLocationCodes.Contains(x.LocationCode)).OrderByDescending(x => x.Depth).ThenBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).ToList();

                if(heightType == 1)
                List<Dt_LocationInfo> _LocationInfos = definedTypeEmptyLocations;
                if (heightType == 1)
                {
                    undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x=>x.Layer <= 4).ToList();
                    definedTypeEmptyLocations = definedTypeEmptyLocations.Where(x => x.Layer <= 4).ToList();
@@ -93,7 +93,10 @@
                    undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => false).ToList();
                    definedTypeEmptyLocations = definedTypeEmptyLocations.Where(x => false).ToList();
                }

                if (heightType==1 && !definedTypeEmptyLocations.Any())
                {
                    definedTypeEmptyLocations = _LocationInfos.Where(x => x.Layer == 5).ToList();
                }
                if (palletTypeInfo.LocaitonCount == 2)
                {
                    if (roadwayNo != "SC01_BC")

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

@@ -329,7 +329,7 @@
                    }
                }

                if (palletTypeInfos.FirstOrDefault(x => x.LocaitonCount == 2) != null)
                if (palletTypeInfo.LocaitonCount == 2)
                {
                    Dt_LocationInfo? nearLocation;
                    if (palletTypeInfo.IsOdd)

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs

@@ -19,11 +19,13 @@
        /// </summary>
        [Description("盘点出库")]
        OutInventory = 110,

        /// <summary>
        /// åˆ†æ‹£å‡ºåº“
        /// </summary>
        [Description("分拣出库")]
        OutPick = 120,

        /// <summary>
        /// è´¨æ£€å‡ºåº“
        /// </summary>
@@ -49,6 +51,12 @@
        OutMaintenance = 160,

        /// <summary>
        /// é”€å”®å‡ºåº“
        /// </summary>
        [Description("销售出库")]
        OutSale = 170,

        /// <summary>
        /// MES出库
        /// </summary>
        [Description("MES出库")]

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielCodeInfo.cs

@@ -82,7 +82,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = false,Length =500,ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs

@@ -44,7 +44,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = false, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs

@@ -72,7 +72,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs

@@ -47,7 +47,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_MesPPBackInboundOrderDetail.cs

@@ -48,7 +48,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrderDetail.cs

@@ -42,7 +42,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_ReceiveOrderDetail.cs

@@ -107,7 +107,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_ReturnOrderDetail.cs

@@ -67,7 +67,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_TakeProStockOrderDetail.cs

@@ -47,7 +47,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_TakeStockOrderDetail.cs

@@ -47,7 +47,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs

@@ -41,7 +41,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Stock/Dt_StockInfoDetail.cs

@@ -42,7 +42,7 @@
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs

@@ -917,6 +917,7 @@
                        (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
                        (int)OutOrderTypeEnum.Allocate=> TaskTypeEnum.OutAllocate,
                        (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
                        (int)OutOrderTypeEnum.SaleOut => TaskTypeEnum.OutSale,
                        _ =>new TaskTypeEnum()
                    };
                    tasks = GetTasks(result.Item1, typeEnum);