增加字段

schangxiang@126.com

2 天以前 3091217d4f4ccecde578ef1abddd810094bfc6bc

增加字段

 DEmon/iWareDataCore/BASE/Service/PlaceMaterialViewService.cs

@@ -43,12 +43,12 @@



        

        /// <summary>
        /// 获取各种状态的库位
        /// </summary>
        /// <returns></returns>
        public List<PlaceStatusNumEntity> GetPlaceStatusNum(out string msg) 
        public List<PlaceStatusNumEntity> GetPlaceStatusNum(out string msg)
        {
            msg = "";
            List<PlaceStatusNumEntity> psnlst = new List<PlaceStatusNumEntity>();
@@ -77,7 +77,7 @@
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        public List<PlaceMaterialViewEntity> GetPlacePreview(out string msg) 
        public List<PlaceMaterialViewEntity> GetPlacePreview(out string msg)
        {
            msg = "";
            List<PlaceMaterialViewEntity> psnlst = new List<PlaceMaterialViewEntity>();
@@ -119,7 +119,7 @@

                    return mcore.BASEPlaceMaterialViews.FirstOrDefault(x => x.materialcode == materialcode).placecode;
                }
             

            }
            catch (Exception ex)
            {
@@ -128,5 +128,40 @@
            }
        }


        /// <summary>
        /// 根据物料信息列表找取指定的库位物料信息 【Editby shaocx,2025-09-29】
        /// </summary>
        /// <param name="materialcode"></param>
        /// <returns></returns>
        public List<int> GetPlaceMaterialViewsByCodeList(List<string> materialcodeList, out string msg)
        {
            msg = "";
            try
            {
                using (DbModelCore mcore = new DbModelCore())
                {

                    var list = mcore.BASEPlaceMaterialViews.Where(x => materialcodeList.Contains(x.materialcode)).ToList();
                    foreach (var item in list)
                    {
                        if (!materialcodeList.Contains(item.materialcode))
                        {
                            msg = $"唯一编码{item.materialcode}没有库存";
                            return null;
                        }
                    }
                    return list.Select(x => x.id).ToList();
                }

            }
            catch (Exception ex)
            {
                msg = "异常:" + ex.ToString();
                LogTextHelper.WriteLog(Resources.LogDir, this.ToString(), "GetPlaceMaterialViewsByCodeList", ex.Message);
                return null;
            }
        }

    }
}

 DEmon/iWareDataCore/ORM/TASKMainTask.cs

@@ -51,5 +51,16 @@
        public int islots { get; set; }

        public int priority { get; set; }


        /// <summary>
        /// 表BASEInOutListDetail的ID  【Editby shaocx,2025-09-29】
        /// </summary>
        public int? InOutListDetailId { get; set; }

        /// <summary>
        /// 表BASEInOutList的ListNo   【Editby shaocx,2025-09-29】
        /// </summary>
        public string ListNo { get; set; }
    }
}

 DEmon/iWareDataCore/TASK/Entity/MainTaskEntity.cs

@@ -10,79 +10,90 @@

namespace iWareDataCore.TASK.Entity
{
   public class MainTaskEntity : ICommonEntity<TASKMainTask>
    public class MainTaskEntity : ICommonEntity<TASKMainTask>
    {
        /// <summary>
        /// 1主任务主键
        /// </summary>  
        public int Id { get; set; }
       /// <summary>
       /// 系统编号
       /// </summary>
        /// <summary>
        /// 系统编号
        /// </summary>
        public string SysCode { get; set; }
       /// <summary>
       /// 任务编号
       /// </summary>
        /// <summary>
        /// 任务编号
        /// </summary>
        public string TaskNo { get; set; }
       /// <summary>
       /// 发送时间
       /// </summary>
        /// <summary>
        /// 发送时间
        /// </summary>
        public DateTime SendTime { get; set; }
       /// <summary>
       /// 起始位置
       /// </summary>
        /// <summary>
        /// 起始位置
        /// </summary>
        public string SourcePlace { get; set; }
       /// <summary>
       /// 目标位置
       /// </summary>
        /// <summary>
        /// 目标位置
        /// </summary>
        public string ToPlace { get; set; }
       /// <summary>
       /// 批次号
       /// </summary>
        /// <summary>
        /// 批次号
        /// </summary>
        public string ProcessCardNumber { get; set; }
       /// <summary>
       /// 物料号
       /// </summary>
        /// <summary>
        /// 物料号
        /// </summary>
        public string MaterialCode { get; set; }
       /// <summary>
       /// 数量
       /// </summary>
        /// <summary>
        /// 数量
        /// </summary>
        public int Quantity { get; set; }
       /// <summary>
       /// 任务类型
       /// </summary>
        /// <summary>
        /// 任务类型
        /// </summary>
        public int TaskType { get; set; }
       /// <summary>
       ///状态
       /// </summary>
        /// <summary>
        ///状态
        /// </summary>
        public int Status { get; set; }
       /// <summary>
       /// 分解时间
       /// </summary>
        /// <summary>
        /// 分解时间
        /// </summary>
        public DateTime DecompositionTime { get; set; }
       /// <summary>
       /// 反馈状态
       /// </summary>
        /// <summary>
        /// 反馈状态
        /// </summary>
        public int WipStatus { get; set; }
       /// <summary>
       /// 分解次数
       /// </summary>
        /// <summary>
        /// 分解次数
        /// </summary>
        public int DecompositionTimes { get; set; }
       /// <summary>
       /// 工包
       /// </summary>
        /// <summary>
        /// 工包
        /// </summary>
        public string PackageNo { get; set; }
       /// <summary>
       /// 是否批次入库（0：否；1：是）
       /// </summary>
        /// <summary>
        /// 是否批次入库（0：否；1：是）
        /// </summary>
        public int IsLots { get; set; }
       /// <summary>
       /// 优先级
       /// </summary>
        /// <summary>
        /// 优先级
        /// </summary>
        public int Priority { get; set; }


        
        /// <summary>
        /// 表BASEInOutListDetail的ID  【Editby shaocx,2025-09-29】
        /// </summary>
        public int? InOutListDetailId { get; set; }

        /// <summary>
        /// 表BASEInOutList的ListNo   【Editby shaocx,2025-09-29】
        /// </summary>
        public string ListNo { get; set; }



        public List<MaterialViewEntity> Materials { get; set; }

        /// <summary>
@@ -105,8 +116,8 @@
        /// <returns></returns>
        public static Dictionary<string, string> GetColumnMap()
        {
            return new Dictionary<string, string>() 
            { 
            return new Dictionary<string, string>()
            {
                {"Id", "id"},
                {"SysCode", "syscode"},
                {"TaskNo", "taskno"},
@@ -123,6 +134,8 @@
                {"DecompositionTimes","decompositiontimes"},
                {"IsLots","islots"},
                {"Priority","priority"},
                  {"InOutListDetailId","InOutListDetailId"},
                    {"ListNo","ListNo"},
                {"PackageNo","packageno"}
            };
        }
@@ -146,7 +159,7 @@
        }
        public static Dictionary<string, string> GetOutColumnMap()
        {
            return new Dictionary<string, string>() 
            return new Dictionary<string, string>()
            { 
                //{"Id", "id"},
                {"SysCode", "syscode"},
@@ -164,6 +177,8 @@
                {"DecompositionTimes","decompositiontimes"},
                {"IsLots","islots"},
                {"Priority","priority"},
                  {"InOutListDetailId","InOutListDetailId"},
                    {"ListNo","ListNo"},
                {"PackageNo","packageno"}
            };
        }